Epic refactoring in progress

include/ArduinoJson/Internals/JsonArrayConstIterator.hpp

@@ -11,6 +11,7 @@
 namespace ArduinoJson {
 namespace Internals {
 
+// TODO: copy from JsonArrayIterator
 class JsonArrayConstIterator {
  public:
   explicit JsonArrayConstIterator(JsonArrayNode *node) : _node(node) {}

include/ArduinoJson/Internals/JsonArrayImpl.hpp

@@ -39,6 +39,8 @@ class JsonArrayImpl {
  private:
   JsonArrayImpl(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
 
+  inline void addNode(JsonArrayNode *node);
+
   JsonBuffer *_buffer;
   Internals::JsonArrayNode *_firstNode;
 };

include/ArduinoJson/Internals/JsonArrayIterator.hpp

@@ -29,8 +29,10 @@ class JsonArrayIterator {
   }
 
   JsonArrayIterator &operator++() {
-    _node = _node->next;
-    updateValue();
+    if (_node) {
+      _node = _node->next;
+      updateValue();
+    }
     return *this;
   }
 

include/ArduinoJson/Internals/JsonObjectIterator.hpp

@@ -25,7 +25,7 @@ class JsonObjectIterator {
   }
 
   JsonObjectIterator &operator++() {
-    _pair._node = _pair._node->next;
+    if (_pair._node) _pair._node = _pair._node->next;
     return *this;
   }
 

include/ArduinoJson/Internals/JsonObjectNode.hpp

@@ -24,7 +24,7 @@ class JsonObjectNode {
   JsonObjectNode* next;
 
  private:
-  JsonObjectNode(const char* k) : key(k) {}
+  JsonObjectNode(const char* k) : key(k), next(NULL) {}
 };
 }
 }

include/ArduinoJson/StaticJsonBuffer.hpp

@@ -17,9 +17,11 @@ class StaticJsonBuffer : public JsonBuffer {
 
   virtual ~StaticJsonBuffer() {}
 
-  int capacity() { return CAPACITY; }
+  int capacity() const { return CAPACITY; }
 
-  int size() { return _size; }
+  int size() const { return _size; }
+
+  void clear() { _size = 0; }
 
  protected:
   virtual void* alloc(size_t size) {