ResourceManager: decouple from VariantImpl

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -70,7 +70,7 @@ inline bool VariantImpl::addValue(const T& value, VariantData* data,
     return false;
   JsonVariant variant(slot.ptr(), resources);
   if (!variant.set(value)) {
-    resources->freeVariant(slot);
+    freeVariant(slot, resources);
     return false;
   }
   appendOne(slot, data, resources);

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -74,7 +74,7 @@ inline void VariantImpl::empty(VariantData* data, ResourceManager* resources) {
     auto currId = next;
     auto slot = resources->getVariant(next);
     next = slot->next;
-    resources->freeVariant({slot, currId});
+    freeVariant({slot, currId}, resources);
   }
 
   coll->head = NULL_SLOT;
@@ -112,7 +112,7 @@ inline void VariantImpl::removeOne(iterator it) {
     coll->head = next;
   if (next == NULL_SLOT)
     coll->tail = prev.id();
-  resources_->freeVariant({it.slot_, it.currentId_});
+  freeVariant({it.slot_, it.currentId_}, resources_);
 }
 
 inline void VariantImpl::removePair(iterator it) {
@@ -126,7 +126,7 @@ inline void VariantImpl::removePair(iterator it) {
 
   // remove value slot
   keySlot->next = valueSlot->next;
-  resources_->freeVariant({valueSlot, valueId});
+  freeVariant({valueSlot, valueId}, resources_);
 
   // remove key slot
   removeOne(it);

src/ArduinoJson/Memory/ResourceManager.hpp

@@ -14,7 +14,6 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-struct VariantData;
 class VariantWithId;
 
 class ResourceManager {

src/ArduinoJson/Memory/ResourceManagerImpl.hpp

@@ -6,7 +6,6 @@
 
 #include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Polyfills/alias_cast.hpp>
-#include <ArduinoJson/Variant/VariantImpl.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
@@ -21,7 +20,7 @@ inline Slot<VariantData> ResourceManager::allocVariant() {
 }
 
 inline void ResourceManager::freeVariant(Slot<VariantData> slot) {
-  VariantImpl::clear(slot.ptr(), this);
+  ARDUINOJSON_ASSERT(slot->type == VariantType::Null);  // must be cleared first
   variantPools_.freeSlot(slot);
 }
 

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -635,6 +635,11 @@ class VariantImpl {
   void removeOne(iterator it);
   void removePair(iterator it);
 
+  static void freeVariant(Slot<VariantData> slot, ResourceManager* resources) {
+    clear(slot.ptr(), resources);
+    resources->freeVariant(slot);
+  }
+
   Slot<VariantData> getPreviousSlot(VariantData*) const;
 };