Split array and object

Backtrack to add set<T>()

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -76,6 +76,43 @@ inline void VariantImpl::removeElement(size_t index) {
   removeElement(at(index));
 }
 
+template <typename T>
+inline bool VariantImpl::addValue(const T& value) {
+  if (!isArray())
+    return false;
+  auto slot = allocVariant();
+  if (!slot)
+    return false;
+  JsonVariant variant(slot.ptr(), resources_);
+  if (!variant.set(value)) {
+    freeVariant(slot);
+    return false;
+  }
+  appendOne(slot);
+  return true;
+}
+
+inline bool VariantImpl::copyArray(const VariantImpl& src) {
+  ARDUINOJSON_ASSERT(isNull());
+
+  if (!data_)
+    return false;
+
+  data_->toArray();
+
+  for (auto it = src.createIterator(); !it.done(); it.move()) {
+    auto slot = allocVariant();
+    auto element = VariantImpl(slot.ptr(), resources_);
+    if (!element.copyVariant(*it)) {
+      freeVariant(slot);
+      return false;
+    }
+    appendOne(slot);
+  }
+
+  return true;
+}
+
 // Returns the size (in bytes) of an array with n elements.
 constexpr size_t sizeofArray(size_t n) {
   return n * sizeof(VariantData);

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -108,25 +108,4 @@ inline size_t VariantImpl::size() const {
   return count;
 }
 
-inline bool VariantImpl::copyCollection(const VariantImpl& src) {
-  ARDUINOJSON_ASSERT(src.type() & VariantTypeBits::CollectionMask);
-  ARDUINOJSON_ASSERT(isNull());
-
-  if (!data_)
-    return false;
-
-  data_->toCollection(src.type());
-
-  for (auto it = src.createIterator(); !it.done(); it.move()) {
-    auto slot = allocVariant();
-    auto impl = VariantImpl(slot.ptr(), resources_);
-    if (!impl.copyVariant(*it)) {
-      freeVariant(slot);
-      return false;
-    }
-    appendOne(slot);
-  }
-  return true;
-}
-
 ARDUINOJSON_END_PRIVATE_NAMESPACE