VariantImpl: add generic set()

Author: bblanchon

src/ArduinoJson/Array/ArrayImpl.hpp

@@ -71,8 +71,7 @@ inline bool VariantImpl::addValue(const T& value) {
   auto slot = allocVariant();
   if (!slot)
     return false;
-  JsonVariant variant(slot.ptr(), resources_);
-  if (!variant.set(value)) {
+  if (!VariantImpl(slot.ptr(), resources_).set(value)) {
     freeVariant(slot);
     return false;
   }

src/ArduinoJson/Document/JsonDocument.hpp

@@ -132,7 +132,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   // Copies the specified document.
   // https://arduinojson.org/v7/api/jsondocument/set/
   bool set(const JsonDocument& src) {
-    return to<JsonVariant>().set(src.as<JsonVariantConst>());
+    return getImpl().set(src.as<JsonVariantConst>());
   }
 
   // Replaces the root with the specified value.
@@ -141,15 +141,15 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
       typename T,
       detail::enable_if_t<!detail::is_base_of<JsonDocument, T>::value, int> = 0>
   bool set(const T& src) {
-    return to<JsonVariant>().set(src);
+    return getImpl().set(src);
   }
 
   // Replaces the root with the specified value.
   // https://arduinojson.org/v7/api/jsondocument/set/
   template <typename TChar,
             detail::enable_if_t<!detail::is_const<TChar>::value, int> = 0>
   bool set(TChar* src) {
-    return to<JsonVariant>().set(src);
+    return getImpl().set(src);
   }
 
   // Clears the document and converts it to the specified type.

src/ArduinoJson/Variant/ConverterImpl.hpp

@@ -367,4 +367,36 @@ struct Converter<JsonObject> : private detail::VariantAttorney {
   }
 };
 
+template <typename TConverter, typename T>
+bool detail::VariantImpl::setWithConverter(const T& value) {
+  return setWithConverter<TConverter>(
+      value,
+      is_same<
+          typename function_traits<decltype(&TConverter::toJson)>::return_type,
+          bool>{});
+}
+
+template <typename T>
+inline bool detail::VariantImpl::set(const T& value) {
+  using TypeForConverter = conditional_t<IsStringLiteral<T>::value, T,
+                                         remove_cv_t<remove_reference_t<T>>>;
+  return setWithConverter<Converter<TypeForConverter>>(value);
+}
+
+template <typename T, detail::enable_if_t<!detail::is_const<T>::value, int>>
+inline bool detail::VariantImpl::set(T* value) {
+  return setWithConverter<Converter<T*>>(value);
+}
+
+template <typename TConverter, typename T>
+inline bool detail::VariantImpl::setWithConverter(const T& value, false_type) {
+  TConverter::toJson(value, JsonVariant(*this));
+  return resources_ && !resources_->overflowed();
+}
+
+template <typename TConverter, typename T>
+inline bool detail::VariantImpl::setWithConverter(const T& value, true_type) {
+  return TConverter::toJson(value, JsonVariant(*this));
+}
+
 ARDUINOJSON_END_PUBLIC_NAMESPACE

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -504,6 +504,13 @@ class VariantImpl {
     return true;
   }
 
+  template <typename T>
+  bool set(const T& value);
+
+  template <typename T,
+            detail::enable_if_t<!detail::is_const<T>::value, int> = 0>
+  bool set(T* value);
+
   void empty() {
     auto coll = getCollectionData();
 
@@ -556,6 +563,15 @@ class VariantImpl {
   void removeOne(iterator it);
   void removePair(iterator it);
 
+  template <typename TConverter, typename T>
+  bool setWithConverter(const T& value);
+
+  template <typename TConverter, typename T>
+  bool setWithConverter(const T& value, false_type);
+
+  template <typename TConverter, typename T>
+  bool setWithConverter(const T& value, true_type);
+
   VariantData* getVariant(SlotId id) const {
     ARDUINOJSON_ASSERT(resources_ != nullptr);
     return resources_->getVariant(id);

src/ArduinoJson/Variant/VariantRefBase.hpp

@@ -77,17 +77,15 @@ class VariantRefBase : public VariantTag {
   // https://arduinojson.org/v7/api/jsonvariant/set/
   template <typename T>
   bool set(const T& value) const {
-    using TypeForConverter = conditional_t<IsStringLiteral<T>::value, T,
-                                           remove_cv_t<remove_reference_t<T>>>;
-    return doSet<Converter<TypeForConverter>>(value);
+    return getOrCreateImpl().set(value);
   }
 
   // Copies the specified value.
   // https://arduinojson.org/v7/api/jsonvariant/set/
   template <typename T,
             detail::enable_if_t<!detail::is_const<T>::value, int> = 0>
   bool set(T* value) const {
-    return doSet<Converter<T*>>(value);
+    return getOrCreateImpl().set(value);
   }
 
   // Returns the size of the array or object.
@@ -292,20 +290,6 @@ class VariantRefBase : public VariantTag {
       const {
     return getVariant();
   }
-
-  template <typename TConverter, typename T>
-  bool doSet(const T& value) const {
-    return doSet<TConverter>(
-        value, is_same<typename function_traits<
-                           decltype(&TConverter::toJson)>::return_type,
-                       bool>{});
-  }
-
-  template <typename TConverter, typename T>
-  bool doSet(const T& value, false_type) const;
-
-  template <typename TConverter, typename T>
-  bool doSet(const T& value, true_type) const;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE

src/ArduinoJson/Variant/VariantRefBaseImpl.hpp

@@ -125,22 +125,6 @@ VariantRefBase<TDerived>::operator[](const TString& key) const {
   return {derived(), adaptString(key)};
 }
 
-template <typename TDerived>
-template <typename TConverter, typename T>
-inline bool VariantRefBase<TDerived>::doSet(const T& value, false_type) const {
-  auto impl = getOrCreateImpl();
-  TConverter::toJson(value, JsonVariant(impl));
-  auto resources = impl.resources();
-  return resources && !resources->overflowed();
-}
-
-template <typename TDerived>
-template <typename TConverter, typename T>
-inline bool VariantRefBase<TDerived>::doSet(const T& value, true_type) const {
-  auto impl = getOrCreateImpl();
-  return TConverter::toJson(value, JsonVariant(impl));
-}
-
 template <typename TDerived>
 template <typename T, enable_if_t<is_same<T, JsonArray>::value, int>>
 inline JsonArray VariantRefBase<TDerived>::to() const {