Extracting a common base class for JsonArray and JsonObject...

include/ArduinoJson/Internals/List.hpp

@@ -34,6 +34,8 @@ class List {
 
  protected:
   node_type *createNode();
+  void addNode(node_type *node);
+  void removeNode(node_type *nodeToRemove);
 
   JsonBuffer *_buffer;
   node_type *_firstNode;

include/ArduinoJson/Internals/Node.hpp

@@ -15,8 +15,8 @@ template <typename T>
 struct Node {
   Node() : next(NULL) {}
 
-  T content;
   Node<T>* next;
+  T content;
 };
 }
 }

include/ArduinoJson/JsonArray.hpp

@@ -50,8 +50,6 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
   // constructor is private: instance must be created via a JsonBuffer
   JsonArray(JsonBuffer *buffer) : List(buffer) {}
 
-  inline void addNode(node_type *node);
-
   static JsonArray _invalid;
 };
 }

include/ArduinoJson/JsonObject.hpp

@@ -55,8 +55,6 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
   JsonObject(JsonBuffer *buffer) : List(buffer) {}
 
   JsonVariant &add(key_type key) { return (*this)[key]; }
-  void addNode(node_type *nodeToAdd);
-  void removeNode(node_type *nodeToRemove);
 
   node_type *getNodeAt(key_type key) const;
   node_type *getOrCreateNodeAt(key_type key);

src/Internals/List.cpp

@@ -21,11 +21,33 @@ int List<T>::size() const {
 }
 
 template <typename T>
-Node<T> *List<T>::createNode() {
+typename List<T>::node_type *List<T>::createNode() {
   if (!_buffer) return NULL;
   void *ptr = _buffer->alloc(sizeof(node_type));
   return ptr ? new (ptr) node_type() : NULL;
 }
 
+template <typename T>
+void List<T>::addNode(node_type *nodeToAdd) {
+  if (_firstNode) {
+    node_type *lastNode = _firstNode;
+    while (lastNode->next) lastNode = lastNode->next;
+    lastNode->next = nodeToAdd;
+  } else {
+    _firstNode = nodeToAdd;
+  }
+}
+
+template <typename T>
+void List<T>::removeNode(node_type *nodeToRemove) {
+  if (!nodeToRemove) return;
+  if (nodeToRemove == _firstNode) {
+    _firstNode = nodeToRemove->next;
+  } else {
+    for (node_type *node = _firstNode; node; node = node->next)
+      if (node->next == nodeToRemove) node->next = nodeToRemove->next;
+  }
+}
+
 template class List<JsonPair>;
 template class List<JsonVariant>;

src/JsonArray.cpp

@@ -30,16 +30,6 @@ JsonVariant &JsonArray::add() {
   return node->content;
 }
 
-void JsonArray::addNode(node_type *newNode) {
-  if (_firstNode) {
-    node_type *lastNode = _firstNode;
-    while (lastNode->next) lastNode = lastNode->next;
-    lastNode->next = newNode;
-  } else {
-    _firstNode = newNode;
-  }
-}
-
 JsonArray &JsonArray::createNestedArray() {
   if (!_buffer) return JsonArray::invalid();
   JsonArray &array = _buffer->createArray();

src/JsonObject.cpp

@@ -69,26 +69,6 @@ JsonObject::node_type *JsonObject::getOrCreateNodeAt(const char *key) {
   return newNode;
 }
 
-void JsonObject::addNode(node_type *nodeToAdd) {
-  if (!_firstNode) {
-    _firstNode = nodeToAdd;
-  } else {
-    node_type *lastNode = _firstNode;
-    while (lastNode->next) lastNode = lastNode->next;
-    lastNode->next = nodeToAdd;
-  }
-}
-
-void JsonObject::removeNode(node_type *nodeToRemove) {
-  if (!nodeToRemove) return;
-  if (nodeToRemove == _firstNode) {
-    _firstNode = nodeToRemove->next;
-  } else {
-    for (node_type *node = _firstNode; node; node = node->next)
-      if (node->next == nodeToRemove) node->next = nodeToRemove->next;
-  }
-}
-
 template <typename T>
 void JsonObject::writeTo(T &writer) const {
   node_type *node = _firstNode;