Epic refactoring in progress...

src/Internals/JsonArrayImpl.cpp

@@ -4,49 +4,68 @@
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 
-#include "ArduinoJson/JsonArray.hpp"
-#include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonValue.hpp"
+#include "ArduinoJson/Internals/JsonArrayImpl.hpp"
+
+#include "ArduinoJson/JsonBuffer.hpp"
+#include "ArduinoJson/Internals/JsonObjectImpl.hpp"
+#include "ArduinoJson/Internals/JsonWriter.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;
 
-JsonValueImpl *JsonArray::operator[](int index) const {
-  for (const_iterator it = begin(); it != end(); ++it) {
-    if (!index) return *it;
-    index--;
-  }
+JsonValueImpl *JsonArrayImpl::operator[](int index) const {
+  JsonArrayNode *node = _firstChild;
+  while (node && index--) node = node->next;
 
   return NULL;
 }
 
-JsonValueImpl *JsonArray::add() {
+JsonValueImpl *JsonArrayImpl::add() {
   if (_buffer) return NULL;
 
-  JsonArrayNode *node = _buffer->create<JsonArrayNode>();
+  JsonArrayNode *node = new (_buffer) JsonArrayNode();
   if (!node) return NULL;
 
-  return &node.value;
+  return &node->value;
 }
 
-JsonArrayImpl *JsonArray::createNestedArray() {
-  JsonNode *node = createNode();
+JsonArrayImpl *JsonArrayImpl::createNestedArray() {
+  JsonValueImpl *value = add();
+  if (!value) return NULL;
 
-  if (node) {
-    node->setAsArray(_node->getContainerBuffer());
-    addChild(node);
+  JsonArrayImpl *array = new (_buffer) JsonArrayImpl(_buffer);
+  value->set(array);
+
+  return array;
+}
+
+JsonObjectImpl *JsonArrayImpl::createNestedObject() {
+  JsonValueImpl *value = add();
+  if (!value) return NULL;
+
+  JsonObjectImpl *array = new (_buffer) JsonObjectImpl(_buffer);
+  value->set(array);
+
+  return array;
+}
+
+void JsonArrayImpl::writeTo(JsonWriter &writer) const {
+  JsonArrayNode *child = _firstChild;
+
+  if (child) {
+    writer.beginArray();
+
+    for (;;) {
+      child->value.writeTo(writer);
+
+      child = child->next;
+      if (!child) break;
+
+      writer.writeComma();
+    }
+
+    writer.endArray();
+  } else {
+    writer.writeEmptyArray();
   }
-
-  return JsonArray(node);
-}
-
-JsonObject JsonArray::createNestedObject() {
-  JsonNode *node = createNode();
-
-  if (node) {
-    node->setAsObject(_node->getContainerBuffer());
-    addChild(node);
-  }
-
-  return JsonObject(node);
 }

src/Internals/JsonObjectImpl.cpp

@@ -0,0 +1,118 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include "ArduinoJson/JsonObject.hpp"
+
+#include <string.h>  // for strcmp
+
+#include "ArduinoJson/JsonBuffer.hpp"
+#include "ArduinoJson/Internals/JsonArrayImpl.hpp"
+#include "ArduinoJson/Internals/JsonValueImpl.hpp"
+#include "ArduinoJson/Internals/StringBuilder.hpp"
+
+using namespace ArduinoJson;
+using namespace ArduinoJson::Internals;
+
+void JsonObjectImpl::remove(char const *key) { removeNode(getNodeAt(key)); }
+
+JsonArrayImpl *JsonObjectImpl::createNestedArray(char const *key) {
+  JsonValueImpl *node = getOrCreateValueAt(key);
+  if (!node) return NULL;
+
+  JsonArrayImpl *array = new (_buffer) JsonArrayImpl(_buffer);
+  node->set(array);
+
+  return array;
+}
+
+JsonObject JsonObject::createNestedObject(char const *key) {
+  JsonNode *node = getOrCreateValueAt(key);
+
+  if (node) node->setAsObject(_node->getContainerBuffer());
+
+  return JsonObject(node);
+}
+
+JsonNode *JsonObject::getPairAt(const char *key) {
+  for (JsonNode *node = firstChild(); node; node = node->next) {
+    if (!strcmp(node->getAsObjectKey(), key)) return node;
+  }
+  return NULL;
+}
+
+JsonNode *JsonObject::getOrCreateValueAt(const char *key) {
+  JsonNode *existingNode = getPairAt(key);
+  if (existingNode) return existingNode->getAsObjectValue();
+
+  JsonNode *newValueNode = createNode();
+  if (!newValueNode) return 0;
+
+  JsonNode *newKeyNode = createNode();
+  if (!newKeyNode) return 0;
+
+  newKeyNode->setAsObjectKeyValue(key, newValueNode);
+
+  addChild(newKeyNode);
+
+  return newValueNode;
+}
+
+void JsonNode::addChild(JsonNode *childToAdd) {
+  if (type == JSON_PROXY) return content.asProxy.target->addChild(childToAdd);
+
+  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
+
+  JsonNode *lastChild = content.asContainer.child;
+
+  if (!lastChild) {
+    content.asContainer.child = childToAdd;
+    return;
+  }
+
+  while (lastChild->next) lastChild = lastChild->next;
+
+  lastChild->next = childToAdd;
+}
+
+void JsonNode::removeChild(JsonNode *childToRemove) {
+  if (type == JSON_PROXY)
+    return content.asProxy.target->removeChild(childToRemove);
+
+  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
+
+  if (content.asContainer.child == childToRemove) {
+    content.asContainer.child = childToRemove->next;
+    return;
+  }
+
+  for (JsonNode *child = content.asContainer.child; child;
+       child = child->next) {
+    if (child->next == childToRemove) child->next = childToRemove->next;
+  }
+}
+
+void JsonObjectImpl::writeObjectTo(JsonWriter &writer) {
+  JsonObjectNode *child = _firstChild;
+
+  if (child) {
+    writer.beginObject();
+
+    for (;;) {
+      writer.writeString(child->content.asKeyValue.key);
+      writer.writeColon();
+      child->value->writeTo(writer);
+
+      child = child->next;
+      if (!child) break;
+
+      writer.writeComma();
+    }
+
+    writer.endObject();
+  } else {
+    writer.writeEmptyObject();
+  }
+}

src/Internals/JsonParser.cpp

@@ -142,7 +142,8 @@ JsonObject JsonParser::parseObject() {
     const char *key = parseString();
     if (!key) return NULL;
 
-    skip(':')
+    if (!skip(':'))
+      return NULL;
 
         JsonValue value = object[key];
 

src/Internals/JsonSerializer.cpp

@@ -1,147 +0,0 @@
-// Copyright Benoit Blanchon 2014
-// MIT License
-//
-// Arduino JSON library
-// https://github.com/bblanchon/ArduinoJson
-
-#include "ArduinoJson/Internals/JsonNode.hpp"
-
-#include "ArduinoJson/Internals/JsonWriter.hpp"
-#include "ArduinoJson/JsonArray.hpp"
-#include "ArduinoJson/JsonObject.hpp"
-#include "ArduinoJson/JsonBuffer.hpp"
-
-using namespace ArduinoJson::Internals;
-
-void JsonNode::writeTo(JsonWriter &writer) {
-  switch (type) {
-    case JSON_PROXY:
-      content.asProxy.target->writeTo(writer);
-      break;
-
-    case JSON_ARRAY:
-      writeArrayTo(writer);
-      break;
-
-    case JSON_OBJECT:
-      writeObjectTo(writer);
-      break;
-
-    case JSON_STRING:
-      writer.writeString(content.asString);
-      break;
-
-    case JSON_LONG:
-      writer.writeInteger(content.asInteger);
-      break;
-
-    case JSON_BOOLEAN:
-      writer.writeBoolean(content.asBoolean);
-      break;
-
-    default:  // >= JSON_DOUBLE_0_DECIMALS
-      writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
-      break;
-  }
-}
-
-void JsonNode::addChild(JsonNode *childToAdd) {
-  if (type == JSON_PROXY) return content.asProxy.target->addChild(childToAdd);
-
-  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
-
-  JsonNode *lastChild = content.asContainer.child;
-
-  if (!lastChild) {
-    content.asContainer.child = childToAdd;
-    return;
-  }
-
-  while (lastChild->next) lastChild = lastChild->next;
-
-  lastChild->next = childToAdd;
-}
-
-void JsonNode::removeChild(JsonNode *childToRemove) {
-  if (type == JSON_PROXY)
-    return content.asProxy.target->removeChild(childToRemove);
-
-  if (type != JSON_ARRAY && type != JSON_OBJECT) return;
-
-  if (content.asContainer.child == childToRemove) {
-    content.asContainer.child = childToRemove->next;
-    return;
-  }
-
-  for (JsonNode *child = content.asContainer.child; child;
-       child = child->next) {
-    if (child->next == childToRemove) child->next = childToRemove->next;
-  }
-}
-
-void JsonNode::writeArrayTo(JsonWriter &writer) {
-  JsonNode *child = content.asContainer.child;
-
-  if (child) {
-    writer.beginArray();
-
-    for (;;) {
-      child->writeTo(writer);
-
-      child = child->next;
-      if (!child) break;
-
-      writer.writeComma();
-    }
-
-    writer.endArray();
-  } else {
-    writer.writeEmptyArray();
-  }
-}
-
-void JsonNode::writeObjectTo(JsonWriter &writer) {
-  JsonNode *child = content.asContainer.child;
-
-  if (child) {
-    writer.beginObject();
-
-    for (;;) {
-      writer.writeString(child->content.asKeyValue.key);
-      writer.writeColon();
-      child->content.asKeyValue.value->writeTo(writer);
-
-      child = child->next;
-      if (!child) break;
-
-      writer.writeComma();
-    }
-
-    writer.endObject();
-  } else {
-    writer.writeEmptyObject();
-  }
-}
-
-void JsonNode::setAsProxyOfSelf() {
-  JsonBuffer *buffer = content.asContainer.buffer;
-  if (!buffer) return;
-
-  JsonNode *newNode = buffer->createNode();
-  if (!newNode) return;
-
-  *newNode = *this;
-
-  setAsProxyOf(newNode);
-}
-
-void JsonNode::duplicate(JsonNode *other) {
-  if (!other) {
-    type = JSON_UNDEFINED;
-  } else if (other->type == JSON_ARRAY || other->type == JSON_OBJECT) {
-    other->setAsProxyOfSelf();
-    setAsProxyOf(other->content.asProxy.target);
-  } else {
-    *this = *other;
-  }
-}

src/Internals/JsonValueImpl.cpp

@@ -0,0 +1,35 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include "ArduinoJson/Internals/JsonValueImpl.hpp"
+
+void JsonValueImpl::writeTo(JsonWriter &writer) const {
+  switch (_type) {
+    case JSON_ARRAY:
+      _content.asArray->writeTo(writer);
+      break;
+
+    case JSON_OBJECT:
+      _content.asObject->writeTo(writer);
+      break;
+
+    case JSON_STRING:
+      writer.writeString(content.asString);
+      break;
+
+    case JSON_LONG:
+      writer.writeInteger(content.asInteger);
+      break;
+
+    case JSON_BOOLEAN:
+      writer.writeBoolean(content.asBoolean);
+      break;
+
+    default:  // >= JSON_DOUBLE_0_DECIMALS
+      writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
+      break;
+  }
+}

src/JsonBuffer.cpp

@@ -6,92 +6,12 @@
 
 #include "ArduinoJson/JsonBuffer.hpp"
 
-#include <new>
-
-#include "ArduinoJson/Internals/JsonValueInternal.hpp"
 #include "ArduinoJson/Internals/JsonParser.hpp"
-#include "ArduinoJson/Internals/JsonNode.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;
 
-JsonValue JsonBuffer::createValue() { return JsonValueInternal(createNode()); }
-
-JsonNode *JsonBuffer::createNode() {
-  void *node = allocateNode();
-  if (!node) return 0;
-
-  return new (node) JsonNode();
-}
-
-JsonArray JsonBuffer::parseArray(char *json) {
-  JsonParser parser(this, json);
-  return JsonArray(parser.parseAnything());
-}
-
-JsonObject JsonBuffer::parseObject(char *json) {
-  JsonParser parser(this, json);
-  return JsonObject(parser.parseAnything());
-}
-
-JsonValue JsonBuffer::parseValue(char *json) {
-  JsonParser parser(this, json);
-  return JsonValueInternal(parser.parseAnything());
-}
-
-JsonNode *JsonBuffer::createArrayNode() {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsArray(this);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createBoolNode(bool value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsBoolean(value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createDoubleNode(double value, int decimals) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsDouble(value, decimals);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createLongNode(long value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsLong(value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createObjectNode() {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsObject(this);
-
-  return node;
-}
-
-Internals::JsonNode *JsonBuffer::createObjectKeyValueNode(const char *key,
-                                                          JsonNode *value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsObjectKeyValue(key, value);
-
-  return node;
-}
-
-JsonNode *JsonBuffer::createStringNode(const char *value) {
-  JsonNode *node = createNode();
-
-  if (node) node->setAsString(value);
-
-  return node;
+// TODO: what happens if alloc returns NULL
+void* operator new(size_t size, ArduinoJson::JsonBuffer* buffer) {
+  return _buffer->alloc(size);
 }

src/JsonObject.cpp

@@ -6,62 +6,16 @@
 
 #include "ArduinoJson/JsonObject.hpp"
 
-#include <string.h>  // for strcmp
-
-#include "ArduinoJson/JsonBuffer.hpp"
-#include "ArduinoJson/JsonValue.hpp"
-#include "ArduinoJson/Internals/JsonNode.hpp"
-#include "ArduinoJson/Internals/StringBuilder.hpp"
-
 using namespace ArduinoJson;
-using namespace ArduinoJson::Internals;
 
 JsonValue JsonObject::operator[](char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-  return JsonValueInternal(node);
+  return JsonValue(_impl ? (*_impl)[key] : NULL);
 }
 
-void JsonObject::remove(char const *key) {
-  JsonNode *nodeToRemove = getPairAt(key);
-  if (nodeToRemove) removeChild(nodeToRemove);
+JsonArray JsonObject::createNestedArray(key_type key) {
+  return JsonArray(_impl ? _impl->createNestedArray(key) : NULL);
 }
 
-JsonArray JsonObject::createNestedArray(char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-
-  if (node) node->setAsArray(_node->getContainerBuffer());
-
-  return JsonArray(node);
-}
-
-JsonObject JsonObject::createNestedObject(char const *key) {
-  JsonNode *node = getOrCreateValueAt(key);
-
-  if (node) node->setAsObject(_node->getContainerBuffer());
-
-  return JsonObject(node);
-}
-
-JsonNode *JsonObject::getPairAt(const char *key) {
-  for (JsonNode *node = firstChild(); node; node = node->next) {
-    if (!strcmp(node->getAsObjectKey(), key)) return node;
-  }
-  return NULL;
-}
-
-JsonNode *JsonObject::getOrCreateValueAt(const char *key) {
-  JsonNode *existingNode = getPairAt(key);
-  if (existingNode) return existingNode->getAsObjectValue();
-
-  JsonNode *newValueNode = createNode();
-  if (!newValueNode) return 0;
-
-  JsonNode *newKeyNode = createNode();
-  if (!newKeyNode) return 0;
-
-  newKeyNode->setAsObjectKeyValue(key, newValueNode);
-
-  addChild(newKeyNode);
-
-  return newValueNode;
+JsonObject JsonObject::createNestedObject(key_type key) {
+  return JsonObject(_impl ? _impl->createNestedObject(key) : NULL);
 }

src/JsonValue.cpp

@@ -7,9 +7,22 @@
 #include "ArduinoJson/JsonValue.hpp"
 
 #include "ArduinoJson/JsonArray.hpp"
+#include "ArduinoJson/JsonObject.hpp"
 
 using namespace ArduinoJson;
 
 JsonValue::operator JsonArray() const {
   return _impl ? JsonArray(*_impl) : JsonArray();
 }
+
+JsonValue::operator JsonObject() const {
+  return _impl ? JsonObject(*_impl) : JsonObject();
+}
+
+void JsonValue::operator=(JsonArray array) {
+  if (_impl) _impl->set(array._impl);
+}
+
+void JsonValue::operator=(JsonObject object) {
+  if (_impl) _impl->set(object._impl);
+}