Changed the array subscript to automatically add missing elements

src/ArduinoJson/Array/ArrayFunctions.hpp

@@ -9,7 +9,7 @@
 namespace ARDUINOJSON_NAMESPACE {
 
 inline VariantData *arrayAdd(CollectionData *arr, MemoryPool *pool) {
-  return arr ? arr->add(pool) : 0;
+  return arr ? arr->addElement(pool) : 0;
 }
 
 template <typename Visitor>

src/ArduinoJson/Array/ArrayRef.hpp

@@ -87,7 +87,7 @@ class ArrayConstRef : public ArrayRefBase<const CollectionData>,
   }
 
   FORCE_INLINE VariantConstRef getElement(size_t index) const {
-    return VariantConstRef(_data ? _data->get(index) : 0);
+    return VariantConstRef(_data ? _data->getElement(index) : 0);
   }
 };
 
@@ -137,23 +137,28 @@ class ArrayRef : public ArrayRefBase<CollectionData>,
     return arrayEquals(_data, rhs._data);
   }
 
+  // Internal use
+  FORCE_INLINE VariantRef getOrAddElement(size_t index) const {
+    return VariantRef(_pool, _data ? _data->getOrAddElement(index, _pool) : 0);
+  }
+
   // Gets the value at the specified index.
   FORCE_INLINE VariantRef getElement(size_t index) const {
-    return VariantRef(_pool, _data ? _data->get(index) : 0);
+    return VariantRef(_pool, _data ? _data->getElement(index) : 0);
   }
 
   // Removes element at specified position.
   FORCE_INLINE void remove(iterator it) const {
     if (!_data)
       return;
-    _data->remove(it.internal());
+    _data->removeSlot(it.internal());
   }
 
   // Removes element at specified index.
   FORCE_INLINE void remove(size_t index) const {
     if (!_data)
       return;
-    _data->remove(index);
+    _data->removeElement(index);
   }
 
  private:

src/ArduinoJson/Array/ElementProxy.hpp

@@ -28,7 +28,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
       : _array(src._array), _index(src._index) {}
 
   FORCE_INLINE this_type& operator=(const this_type& src) {
-    getUpstreamElement().set(src.as<VariantConstRef>());
+    getOrAddUpstreamElement().set(src.as<VariantConstRef>());
     return *this;
   }
 
@@ -39,7 +39,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
   //          std::string, String, ArrayRef, ObjectRef
   template <typename T>
   FORCE_INLINE this_type& operator=(const T& src) {
-    getUpstreamElement().set(src);
+    getOrAddUpstreamElement().set(src);
     return *this;
   }
   //
@@ -47,7 +47,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
   // TValue = char*, const char*, const __FlashStringHelper*
   template <typename T>
   FORCE_INLINE this_type& operator=(T* src) {
-    getUpstreamElement().set(src);
+    getOrAddUpstreamElement().set(src);
     return *this;
   }
 
@@ -79,7 +79,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
 
   template <typename T>
   FORCE_INLINE typename VariantTo<T>::type to() const {
-    return getUpstreamElement().template to<T>();
+    return getOrAddUpstreamElement().template to<T>();
   }
 
   // Replaces the value
@@ -89,14 +89,14 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
   //          std::string, String, ArrayRef, ObjectRef
   template <typename TValue>
   FORCE_INLINE bool set(const TValue& value) const {
-    return getUpstreamElement().set(value);
+    return getOrAddUpstreamElement().set(value);
   }
   //
   // bool set(TValue)
   // TValue = char*, const char*, const __FlashStringHelper*
   template <typename TValue>
   FORCE_INLINE bool set(TValue* value) const {
-    return getUpstreamElement().set(value);
+    return getOrAddUpstreamElement().set(value);
   }
 
   template <typename Visitor>
@@ -120,20 +120,20 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
 
   template <typename TNestedKey>
   VariantRef getOrAddMember(TNestedKey* key) const {
-    return getUpstreamElement().getOrAddMember(key);
+    return getOrAddUpstreamElement().getOrAddMember(key);
   }
 
   template <typename TNestedKey>
   VariantRef getOrAddMember(const TNestedKey& key) const {
-    return getUpstreamElement().getOrAddMember(key);
+    return getOrAddUpstreamElement().getOrAddMember(key);
   }
 
   VariantRef addElement() const {
-    return getUpstreamElement().addElement();
+    return getOrAddUpstreamElement().addElement();
   }
 
   VariantRef getElement(size_t index) const {
-    return getUpstreamElement().getElement(index);
+    return getOrAddUpstreamElement().getElement(index);
   }
 
   FORCE_INLINE void remove(size_t index) const {
@@ -160,6 +160,10 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
     return _array.getElement(_index);
   }
 
+  FORCE_INLINE VariantRef getOrAddUpstreamElement() const {
+    return _array.getOrAddElement(_index);
+  }
+
   TArray _array;
   const size_t _index;
 };