VariantImpl: add copyVariant() and copyCollection() (WIP)

Author: bblanchon

src/ArduinoJson.hpp

@@ -48,7 +48,6 @@
 #include "ArduinoJson/Object/MemberProxy.hpp"
 #include "ArduinoJson/Object/ObjectImpl.hpp"
 #include "ArduinoJson/Variant/ConverterImpl.hpp"
-#include "ArduinoJson/Variant/JsonVariantCopier.hpp"
 #include "ArduinoJson/Variant/VariantCompare.hpp"
 #include "ArduinoJson/Variant/VariantRefBaseImpl.hpp"
 

src/ArduinoJson/Array/JsonArray.hpp

@@ -89,16 +89,10 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   // Copies an array.
   // https://arduinojson.org/v7/api/jsonarray/set/
   bool set(JsonArrayConst src) const {
-    if (isNull())
-      return false;
-
-    clear();
-    for (auto element : src) {
-      if (!add(element))
-        return false;
-    }
-
-    return true;
+    impl_.clear();
+    if (src.isNull())
+      return true;
+    return impl_.copyCollection(detail::VariantAttorney::getImpl(src));
   }
 
   // Removes the element at the specified iterator.

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -108,4 +108,25 @@ 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

src/ArduinoJson/Object/JsonObject.hpp

@@ -83,16 +83,10 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Copies an object.
   // https://arduinojson.org/v7/api/jsonobject/set/
   bool set(JsonObjectConst src) {
-    if (isNull() || src.isNull())
-      return false;
-
-    clear();
-    for (auto kvp : src) {
-      if (!operator[](kvp.key()).set(kvp.value()))
-        return false;
-    }
-
-    return true;
+    impl_.clear();
+    if (src.isNull())
+      return true;
+    return impl_.copyCollection(detail::VariantAttorney::getImpl(src));
   }
 
   // Gets or sets the member with specified key.

src/ArduinoJson/Variant/JsonVariant.hpp

@@ -37,14 +37,12 @@ class JsonVariant : public detail::VariantRefBase<JsonVariant>,
   mutable detail::VariantImpl impl_;
 };
 
-namespace detail {
-bool copyVariant(JsonVariant dst, JsonVariantConst src);
-}
-
 template <>
 struct Converter<JsonVariant> : private detail::VariantAttorney {
   static bool toJson(JsonVariantConst src, JsonVariant dst) {
-    return copyVariant(dst, src);
+    auto impl = getImpl(dst);
+    impl.clear();
+    return impl.copyVariant(getImpl(src));
   }
 
   static JsonVariant fromJson(JsonVariant src) {
@@ -59,7 +57,9 @@ struct Converter<JsonVariant> : private detail::VariantAttorney {
 template <>
 struct Converter<JsonVariantConst> : private detail::VariantAttorney {
   static bool toJson(JsonVariantConst src, JsonVariant dst) {
-    return copyVariant(dst, src);
+    auto impl = getImpl(dst);
+    impl.clear();
+    return impl.copyVariant(getImpl(src));
   }
 
   static JsonVariantConst fromJson(JsonVariantConst src) {

src/ArduinoJson/Variant/JsonVariantCopier.hpp

@@ -85,17 +85,19 @@ struct VariantData {
   }
 
   VariantData* toArray() {
+    return toCollection(VariantType::Array);
+  }
+
+  VariantData* toCollection(VariantType collectionType) {
     ARDUINOJSON_ASSERT(type == VariantType::Null);
-    type = VariantType::Array;
+    ARDUINOJSON_ASSERT(collectionType & VariantTypeBits::CollectionMask);
+    type = collectionType;
     new (&content.asCollection) CollectionData();
     return this;
   }
 
   VariantData* toObject() {
-    ARDUINOJSON_ASSERT(type == VariantType::Null);
-    type = VariantType::Object;
-    new (&content.asCollection) CollectionData();
-    return this;
+    return toCollection(VariantType::Object);
   }
 
   VariantData* getOrCreateArray() {

src/ArduinoJson/Variant/VariantData.hpp

@@ -354,6 +354,38 @@ class VariantImpl {
 
   void removeMember(iterator it);
 
+  bool copyArray(const VariantImpl& src) {
+    if (!src.isArray())
+      return false;
+    return copyCollection(src);
+  }
+
+  bool copyVariant(const VariantImpl& src) {
+    switch (src.type()) {
+      case VariantType::Null:
+        return true;
+
+      case VariantType::Array:
+      case VariantType::Object:
+        return copyCollection(src);
+
+      case VariantType::RawString:
+        return setRawString(adaptString(src.asRawString()));
+
+      case VariantType::LinkedString:
+        return setLinkedString(src.asLinkedString());
+
+      case VariantType::OwnedString:
+        return setOwnedString(adaptString(src.asString()));
+
+      default:
+        *data_ = *src.data_;
+        return true;
+    }
+  }
+
+  bool copyCollection(const VariantImpl& src);
+
   bool setBoolean(bool value) {
     if (!data_)
       return false;