Merge ObjectImpl into VariantImpl

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -57,7 +57,7 @@ inline VariantData* VariantImpl::getElement(size_t index) const {
 }
 
 inline void VariantImpl::removeElement(size_t index) {
-  remove(at(index));
+  removeElement(at(index));
 }
 
 template <typename T>

src/ArduinoJson/Array/JsonArray.hpp

@@ -101,7 +101,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   // Removes the element at the specified iterator.
   // https://arduinojson.org/v7/api/jsonarray/remove/
   void remove(iterator it) const {
-    impl_.remove(it.iterator_);
+    impl_.removeElement(it.iterator_);
   }
 
   // Removes the element at the specified index.

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -121,7 +121,7 @@ inline void CollectionImpl::removeOne(iterator it) {
   resources_->freeVariant({it.slot_, it.currentId_});
 }
 
-inline void CollectionImpl::removePair(ObjectImpl::iterator it) {
+inline void CollectionImpl::removePair(iterator it) {
   if (it.done())
     return;
 

src/ArduinoJson/Json/JsonDeserializer.hpp

@@ -278,9 +278,9 @@ class JsonDeserializer {
 
       if (memberFilter.allow()) {
         auto member =
-            ObjectImpl::getMember(adaptString(key), object, resources_);
+            VariantImpl::getMember(adaptString(key), object, resources_);
         if (!member) {
-          auto keyVariant = ObjectImpl::addPair(&member, object, resources_);
+          auto keyVariant = VariantImpl::addPair(&member, object, resources_);
           if (!keyVariant)
             return DeserializationError::NoMemory;
 

src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp

@@ -399,7 +399,7 @@ class MsgPackDeserializer {
       VariantData* member = 0;
 
       if (memberFilter.allow()) {
-        auto keyVariant = ObjectImpl::addPair(&member, variant, resources_);
+        auto keyVariant = VariantImpl::addPair(&member, variant, resources_);
         if (!keyVariant)
           return DeserializationError::NoMemory;
 

src/ArduinoJson/Object/JsonObject.hpp

@@ -23,7 +23,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   JsonObject() {}
 
   // INTERNAL USE ONLY
-  JsonObject(const detail::ObjectImpl& impl) : impl_(impl) {}
+  JsonObject(const detail::VariantImpl& impl) : impl_(impl) {}
 
   // INTERNAL USE ONLY
   JsonObject(detail::VariantData* data, detail::ResourceManager* resource)
@@ -44,13 +44,13 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Returns true if the reference is unbound.
   // https://arduinojson.org/v7/api/jsonobject/isnull/
   bool isNull() const {
-    return impl_.isNull();
+    return !impl_.isObject();
   }
 
   // Returns true if the reference is bound.
   // https://arduinojson.org/v7/api/jsonobject/isnull/
   operator bool() const {
-    return !isNull();
+    return impl_.isObject();
   }
 
   // Returns the depth (nesting level) of the object.
@@ -80,7 +80,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Removes all the members of the object.
   // https://arduinojson.org/v7/api/jsonobject/clear/
   void clear() const {
-    impl_.clear();
+    impl_.empty();
   }
 
   // Copies an object.
@@ -130,7 +130,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   // Removes the member at the specified iterator.
   // https://arduinojson.org/v7/api/jsonobject/remove/
   FORCE_INLINE void remove(iterator it) const {
-    impl_.remove(it.iterator_);
+    impl_.removeMember(it.iterator_);
   }
 
   // Removes the member with the specified key.
@@ -233,7 +233,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
     return impl_.getData();
   }
 
-  mutable detail::ObjectImpl impl_;
+  mutable detail::VariantImpl impl_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE

src/ArduinoJson/Object/JsonObjectConst.hpp

@@ -26,7 +26,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
       : impl_(data, resources) {}
 
   // INTERNAL USE ONLY
-  JsonObjectConst(const detail::ObjectImpl& impl) : impl_(impl) {}
+  JsonObjectConst(const detail::VariantImpl& impl) : impl_(impl) {}
 
   operator JsonVariantConst() const {
     return JsonVariantConst(impl_.getData(), impl_.getResourceManager());
@@ -136,7 +136,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
     return impl_.getData();
   }
 
-  detail::ObjectImpl impl_;
+  detail::VariantImpl impl_;
 };
 
 inline bool operator==(JsonObjectConst lhs, JsonObjectConst rhs) {

src/ArduinoJson/Object/JsonObjectIterator.hpp

@@ -14,7 +14,7 @@ class JsonObjectIterator {
  public:
   JsonObjectIterator() {}
 
-  explicit JsonObjectIterator(detail::ObjectImpl::iterator iterator,
+  explicit JsonObjectIterator(detail::VariantImpl::iterator iterator,
                               detail::ResourceManager* resources)
       : iterator_(iterator), resources_(resources) {}
 
@@ -40,7 +40,7 @@ class JsonObjectIterator {
   }
 
  private:
-  detail::ObjectImpl::iterator iterator_;
+  detail::VariantImpl::iterator iterator_;
   detail::ResourceManager* resources_;
 };
 
@@ -50,7 +50,7 @@ class JsonObjectConstIterator {
  public:
   JsonObjectConstIterator() {}
 
-  explicit JsonObjectConstIterator(detail::ObjectImpl::iterator iterator,
+  explicit JsonObjectConstIterator(detail::VariantImpl::iterator iterator,
                                    detail::ResourceManager* resources)
       : iterator_(iterator), resources_(resources) {}
 
@@ -76,7 +76,7 @@ class JsonObjectConstIterator {
   }
 
  private:
-  detail::ObjectImpl::iterator iterator_;
+  detail::VariantImpl::iterator iterator_;
   detail::ResourceManager* resources_;
 };
 

src/ArduinoJson/Object/JsonPair.hpp

@@ -15,7 +15,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 class JsonPair {
  public:
   // INTERNAL USE ONLY
-  JsonPair(detail::ObjectImpl::iterator iterator,
+  JsonPair(detail::VariantImpl::iterator iterator,
            detail::ResourceManager* resources) {
     if (!iterator.done()) {
       key_ = iterator->asString();
@@ -43,7 +43,7 @@ class JsonPair {
 // https://arduinojson.org/v7/api/jsonobjectconst/begin_end/
 class JsonPairConst {
  public:
-  JsonPairConst(detail::ObjectImpl::iterator iterator,
+  JsonPairConst(detail::VariantImpl::iterator iterator,
                 detail::ResourceManager* resources) {
     if (!iterator.done()) {
       key_ = iterator->asString();

src/ArduinoJson/Object/MemberProxy.hpp

@@ -60,8 +60,11 @@ class MemberProxy
   }
 
   VariantData* getOrCreateData() const {
-    return VariantAttorney::getOrCreateVariantImpl(upstream_).getOrAddMember(
-        key_);
+    auto data = VariantAttorney::getOrCreateData(upstream_);
+    auto resources = VariantAttorney::getResourceManager(upstream_);
+    if (data && data->type == VariantType::Null)
+      data->toObject();
+    return VariantImpl(data, resources).getOrAddMember(key_);
   }
 
  private: