Return JsonArray and JsonObject by value (closes #309)

src/ArduinoJson/Data/JsonVariantAs.hpp

@@ -19,24 +19,5 @@ struct JsonVariantAs<char*> {
   typedef const char* type;
 };
 
-template <>
-struct JsonVariantAs<JsonArray> {
-  typedef JsonArray& type;
-};
-
-template <>
-struct JsonVariantAs<const JsonArray> {
-  typedef const JsonArray& type;
-};
-
-template <>
-struct JsonVariantAs<JsonObject> {
-  typedef JsonObject& type;
-};
-
-template <>
-struct JsonVariantAs<const JsonObject> {
-  typedef const JsonObject& type;
-};
-}
-}
+}  // namespace Internals
+}  // namespace ArduinoJson

src/ArduinoJson/Data/JsonVariantContent.hpp

@@ -8,20 +8,19 @@
 #include "JsonInteger.hpp"
 
 namespace ArduinoJson {
-
-// Forward declarations
-class JsonArray;
-class JsonObject;
-
 namespace Internals {
+// Forward declarations
+struct JsonArrayData;
+struct JsonObjectData;
+
 // A union that defines the actual content of a JsonVariant.
 // The enum JsonVariantType determines which member is in use.
 union JsonVariantContent {
-  JsonFloat asFloat;     // used for double and float
-  JsonUInt asInteger;    // used for bool, char, short, int and longs
-  const char* asString;  // asString can be null
-  JsonArray* asArray;    // asArray cannot be null
-  JsonObject* asObject;  // asObject cannot be null
+  JsonFloat asFloat;         // used for double and float
+  JsonUInt asInteger;        // used for bool, char, short, int and longs
+  const char* asString;      // asString can be null
+  JsonArrayData* asArray;    // asArray cannot be null
+  JsonObjectData* asObject;  // asObject cannot be null
 };
-}
-}
+}  // namespace Internals
+}  // namespace ArduinoJson

src/ArduinoJson/Data/JsonVariantType.hpp

@@ -5,8 +5,6 @@
 #pragma once
 
 namespace ArduinoJson {
-class JsonArray;
-class JsonObject;
 
 namespace Internals {
 
@@ -19,9 +17,9 @@ enum JsonVariantType {
   JSON_BOOLEAN,           // JsonVariant stores a bool
   JSON_POSITIVE_INTEGER,  // JsonVariant stores an JsonUInt
   JSON_NEGATIVE_INTEGER,  // JsonVariant stores an JsonUInt that must be negated
-  JSON_ARRAY,             // JsonVariant stores a pointer to a JsonArray
-  JSON_OBJECT,            // JsonVariant stores a pointer to a JsonObject
+  JSON_ARRAY,             // JsonVariant stores a pointer to a JsonArrayData
+  JSON_OBJECT,            // JsonVariant stores a pointer to a JsonObjectData
   JSON_FLOAT              // JsonVariant stores a JsonFloat
 };
-}
-}
+}  // namespace Internals
+}  // namespace ArduinoJson

src/ArduinoJson/Data/List.hpp

@@ -13,7 +13,7 @@ namespace Internals {
 
 // A singly linked list of T.
 // The linked list is composed of ListNode<T>.
-// It is derived by JsonArray and JsonObject
+// It is derived by JsonArrayData and JsonObjectData
 template <typename T>
 class List {
  public:
@@ -22,23 +22,10 @@ class List {
   typedef ListIterator<T> iterator;
   typedef ListConstIterator<T> const_iterator;
 
-  // Creates an empty List<T> attached to a JsonBuffer.
-  // The JsonBuffer allows to allocate new nodes.
-  // When buffer is NULL, the List is not able to grow and success() returns
-  // false. This is used to identify bad memory allocations and parsing
-  // failures.
   explicit List(JsonBuffer *buf) : _buffer(buf), _firstNode(NULL) {}
 
-  // Returns true if the object is valid
-  // Would return false in the following situation:
-  // - the memory allocation failed (StaticJsonBuffer was too small)
-  // - the JSON parsing failed
-  bool success() const {
-    return _buffer != NULL;
-  }
-
   // Returns the numbers of elements in the list.
-  // For a JsonObject, it would return the number of key-value pairs
+  // For a JsonObjectData, it would return the number of key-value pairs
   size_t size() const {
     size_t nodeCount = 0;
     for (node_type *node = _firstNode; node; node = node->next) nodeCount++;
@@ -87,14 +74,13 @@ class List {
   JsonBuffer &buffer() const {
     return *_buffer;
   }
+  JsonBuffer *_buffer;  // TODO!!
 
  protected:
   void clear() {
     _firstNode = 0;
   }
 
-  JsonBuffer *_buffer;
-
  private:
   node_type *_firstNode;
 };

src/ArduinoJson/Data/ReferenceType.hpp

@@ -1,24 +0,0 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2018
-// MIT License
-
-#pragma once
-
-namespace ArduinoJson {
-namespace Internals {
-
-// A type that is meant to be used by reference only (JsonArray and JsonObject)
-class ReferenceType {
- public:
-  bool operator==(const ReferenceType& other) const {
-    // two JsonArray are equal if they are the same instance
-    // (we don't compare the content)
-    return this == &other;
-  }
-
-  bool operator!=(const ReferenceType& other) const {
-    return this != &other;
-  }
-};
-}
-}