Merge ArrayImpl, CollectionImpl, and ObjectImpl into VariantImpl

Author: bblanchon

src/ArduinoJson/Array/ArrayData.hpp

@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayData.hpp>
 #include <ArduinoJson/Variant/VariantCompare.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
+#include <ArduinoJson/Variant/VariantImpl.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-inline ArrayImpl::iterator ArrayImpl::at(size_t index) const {
-  if (isNull())
+inline VariantImpl::iterator VariantImpl::at(size_t index) const {
+  if (!isArray())
     return iterator();
 
   auto it = createIterator();
@@ -22,17 +21,17 @@ inline ArrayImpl::iterator ArrayImpl::at(size_t index) const {
   return it;
 }
 
-inline VariantData* ArrayImpl::addElement() {
-  if (isNull())
+inline VariantData* VariantImpl::addElement() {
+  if (!isArray())
     return nullptr;
   auto slot = allocVariant();
   if (!slot)
     return nullptr;
-  CollectionImpl::appendOne(slot);
+  VariantImpl::appendOne(slot);
   return slot.ptr();
 }
 
-inline VariantData* ArrayImpl::getOrAddElement(size_t index) {
+inline VariantData* VariantImpl::getOrAddElement(size_t index) {
   auto it = createIterator();
   while (!it.done() && index > 0) {
     it.next(resources_);
@@ -50,17 +49,17 @@ inline VariantData* ArrayImpl::getOrAddElement(size_t index) {
   return element;
 }
 
-inline VariantData* ArrayImpl::getElement(size_t index) const {
+inline VariantData* VariantImpl::getElement(size_t index) const {
   return at(index).data();
 }
 
-inline void ArrayImpl::removeElement(size_t index) {
-  remove(at(index));
+inline void VariantImpl::removeElement(size_t index) {
+  removeElement(at(index));
 }
 
 template <typename T>
-inline bool ArrayImpl::addValue(const T& value) {
-  if (isNull())
+inline bool VariantImpl::addValue(const T& value) {
+  if (!isArray())
     return false;
   auto slot = allocVariant();
   if (!slot)
@@ -70,7 +69,7 @@ inline bool ArrayImpl::addValue(const T& value) {
     freeVariant(slot);
     return false;
   }
-  CollectionImpl::appendOne(slot);
+  appendOne(slot);
   return true;
 }
 

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -59,8 +59,12 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
   }
 
   VariantData* getOrCreateData() const {
-    return VariantAttorney::getOrCreateVariantImpl(upstream_).getOrAddElement(
-        index_);
+    auto data = VariantAttorney::getOrCreateData(upstream_);
+    auto resources = VariantAttorney::getResourceManager(upstream_);
+    if (!data)
+      return nullptr;
+    data->getOrCreateArray();
+    return VariantImpl(data, resources).getOrAddElement(index_);
   }
 
   TUpstream upstream_;

src/ArduinoJson/Array/ElementProxy.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.
@@ -122,7 +122,8 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   // Removes all the elements of the array.
   // https://arduinojson.org/v7/api/jsonarray/clear/
   void clear() const {
-    impl_.clear();
+    if (impl_.isArray())
+      impl_.empty();
   }
 
   // Gets or sets the element at the specified index.
@@ -207,7 +208,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
     return impl_.getData();
   }
 
-  mutable detail::ArrayImpl impl_;
+  mutable detail::VariantImpl impl_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE

src/ArduinoJson/Array/JsonArray.hpp

@@ -41,7 +41,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
       : impl_(data, resources) {}
 
   // INTERNAL USE ONLY
-  JsonArrayConst(const detail::ArrayImpl& impl) : impl_(impl) {}
+  JsonArrayConst(const detail::VariantImpl& impl) : impl_(impl) {}
 
   // Returns the element at the specified index.
   // https://arduinojson.org/v7/api/jsonarrayconst/subscript/
@@ -102,7 +102,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
     return impl_.getData();
   }
 
-  detail::ArrayImpl impl_;
+  detail::VariantImpl impl_;
 };
 
 // Compares the content of two arrays.

src/ArduinoJson/Array/JsonArrayConst.hpp

@@ -30,7 +30,7 @@ class JsonArrayIterator {
 
  public:
   JsonArrayIterator() {}
-  explicit JsonArrayIterator(detail::ArrayImpl::iterator iterator,
+  explicit JsonArrayIterator(detail::VariantImpl::iterator iterator,
                              detail::ResourceManager* resources)
       : iterator_(iterator), resources_(resources) {}
 
@@ -55,7 +55,7 @@ class JsonArrayIterator {
   }
 
  private:
-  detail::ArrayImpl::iterator iterator_;
+  detail::VariantImpl::iterator iterator_;
   detail::ResourceManager* resources_;
 };
 
@@ -64,7 +64,7 @@ class JsonArrayConstIterator {
 
  public:
   JsonArrayConstIterator() {}
-  explicit JsonArrayConstIterator(detail::ArrayImpl::iterator iterator,
+  explicit JsonArrayConstIterator(detail::VariantImpl::iterator iterator,
                                   detail::ResourceManager* resources)
       : iterator_(iterator), resources_(resources) {}
 
@@ -89,7 +89,7 @@ class JsonArrayConstIterator {
   }
 
  private:
-  mutable detail::ArrayImpl::iterator iterator_;
+  mutable detail::VariantImpl::iterator iterator_;
   mutable detail::ResourceManager* resources_;
 };
 

src/ArduinoJson/Array/JsonArrayIterator.hpp

@@ -15,7 +15,7 @@ struct VariantData;
 class ResourceManager;
 
 class CollectionIterator {
-  friend class CollectionImpl;
+  friend class VariantImpl;
 
  public:
   CollectionIterator() : slot_(nullptr), currentId_(NULL_SLOT) {}
@@ -64,76 +64,4 @@ class CollectionIterator {
   SlotId currentId_, nextId_;
 };
 
-class CollectionImpl {
- protected:
-  VariantData* data_;
-  ResourceManager* resources_;
-
- public:
-  using iterator = CollectionIterator;
-
-  CollectionImpl() : data_(nullptr), resources_(nullptr) {}
-
-  CollectionImpl(VariantData* data, ResourceManager* resources)
-      : data_(data), resources_(resources) {}
-
-  explicit operator bool() const {
-    return data_ && data_->isCollection();
-  }
-
-  bool isNull() const {
-    return !operator bool();
-  }
-
-  VariantData* getData() const {
-    return data_;
-  }
-
-  ResourceManager* getResourceManager() const {
-    return resources_;
-  }
-
-  iterator createIterator() const;
-
-  size_t size() const;
-  size_t nesting() const;
-
-  void clear();
-
-  SlotId head() const {
-    return getCollectionData()->head;
-  }
-
- protected:
-  void appendOne(Slot<VariantData> slot);
-  void appendPair(Slot<VariantData> key, Slot<VariantData> value);
-
-  void removeOne(iterator it);
-  void removePair(iterator it);
-
-  VariantData* getVariant(SlotId id) const {
-    ARDUINOJSON_ASSERT(resources_ != nullptr);
-    return resources_->getVariant(id);
-  }
-
-  void freeVariant(Slot<VariantData> slot) {
-    ARDUINOJSON_ASSERT(resources_ != nullptr);
-    resources_->freeVariant(slot);
-  }
-
-  Slot<VariantData> allocVariant() {
-    ARDUINOJSON_ASSERT(resources_ != nullptr);
-    return resources_->allocVariant();
-  }
-
- private:
-  Slot<VariantData> getPreviousSlot(VariantData*) const;
-
-  CollectionData* getCollectionData() const {
-    ARDUINOJSON_ASSERT(data_ != nullptr);
-    ARDUINOJSON_ASSERT(data_->isCollection());
-    return &data_->content.asCollection;
-  }
-};
-
 ARDUINOJSON_END_PRIVATE_NAMESPACE

src/ArduinoJson/Collection/CollectionData.hpp

@@ -25,14 +25,14 @@ inline void CollectionIterator::next(const ResourceManager* resources) {
     nextId_ = slot_->next;
 }
 
-inline CollectionImpl::iterator CollectionImpl::createIterator() const {
+inline VariantImpl::iterator VariantImpl::createIterator() const {
   if (!data_ || !data_->isCollection())
     return iterator();
   auto coll = getCollectionData();
   return iterator(getVariant(coll->head), coll->head);
 }
 
-inline void CollectionImpl::appendOne(Slot<VariantData> slot) {
+inline void VariantImpl::appendOne(Slot<VariantData> slot) {
   auto coll = getCollectionData();
 
   if (coll->tail != NULL_SLOT) {
@@ -45,8 +45,8 @@ inline void CollectionImpl::appendOne(Slot<VariantData> slot) {
   }
 }
 
-inline void CollectionImpl::appendPair(Slot<VariantData> key,
-                                       Slot<VariantData> value) {
+inline void VariantImpl::appendPair(Slot<VariantData> key,
+                                    Slot<VariantData> value) {
   auto coll = getCollectionData();
 
   key->next = value.id();
@@ -60,26 +60,7 @@ inline void CollectionImpl::appendPair(Slot<VariantData> key,
     coll->tail = value.id();
   }
 }
-
-inline void CollectionImpl::clear() {
-  if (!data_ || !data_->isCollection())
-    return;
-
-  auto coll = getCollectionData();
-
-  auto next = coll->head;
-  while (next != NULL_SLOT) {
-    auto currId = next;
-    auto slot = getVariant(next);
-    next = slot->next;
-    freeVariant({slot, currId});
-  }
-
-  coll->head = NULL_SLOT;
-  coll->tail = NULL_SLOT;
-}
-
-inline Slot<VariantData> CollectionImpl::getPreviousSlot(
+inline Slot<VariantData> VariantImpl::getPreviousSlot(
     VariantData* target) const {
   auto coll = getCollectionData();
   auto prev = Slot<VariantData>();
@@ -94,7 +75,7 @@ inline Slot<VariantData> CollectionImpl::getPreviousSlot(
   return prev;
 }
 
-inline void CollectionImpl::removeOne(iterator it) {
+inline void VariantImpl::removeOne(iterator it) {
   if (it.done())
     return;
   auto coll = getCollectionData();
@@ -110,7 +91,7 @@ inline void CollectionImpl::removeOne(iterator it) {
   freeVariant({it.slot_, it.currentId_});
 }
 
-inline void CollectionImpl::removePair(ObjectImpl::iterator it) {
+inline void VariantImpl::removePair(VariantImpl::iterator it) {
   if (it.done())
     return;
 
@@ -127,7 +108,7 @@ inline void CollectionImpl::removePair(ObjectImpl::iterator it) {
   removeOne(it);
 }
 
-inline size_t CollectionImpl::nesting() const {
+inline size_t VariantImpl::nesting() const {
   if (!data_ || !data_->isCollection())
     return 0;
   size_t maxChildNesting = 0;
@@ -140,11 +121,4 @@ inline size_t CollectionImpl::nesting() const {
   return maxChildNesting + 1;
 }
 
-inline size_t CollectionImpl::size() const {
-  size_t count = 0;
-  for (auto it = createIterator(); !it.done(); it.next(resources_))
-    count++;
-  return count;
-}
-
 ARDUINOJSON_END_PRIVATE_NAMESPACE