Extract VariantProxy from ElementProxy and MemberProxy

src/ArduinoJson/Array/ElementProxy.hpp

@@ -4,150 +4,16 @@
 
 #pragma once
 
-#include <ArduinoJson/Configuration.hpp>
-#include <ArduinoJson/Variant/VariantOperators.hpp>
-#include <ArduinoJson/Variant/VariantShortcuts.hpp>
-#include <ArduinoJson/Variant/VariantTo.hpp>
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4522)
-#endif
+#include <ArduinoJson/Variant/VariantProxy.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
 template <typename TUpstream>
-class ElementProxy  //
-    : public VariantOperators<ElementProxy<TUpstream> >,
-      public VariantShortcuts<ElementProxy<TUpstream> >,
-      public VariantTag {
-  friend class VariantAttorney;
-
+class ElementDataSource {
  public:
-  FORCE_INLINE ElementProxy(TUpstream upstream, size_t index)
+  ElementDataSource(TUpstream upstream, size_t index)
       : _upstream(upstream), _index(index) {}
 
-  FORCE_INLINE ElementProxy(const ElementProxy& src)
-      : _upstream(src._upstream), _index(src._index) {}
-
-  FORCE_INLINE ElementProxy& operator=(const ElementProxy& src) {
-    getOrAddUpstreamVariant().set(src);
-    return *this;
-  }
-
-  template <typename T>
-  FORCE_INLINE ElementProxy& operator=(const T& src) {
-    getOrAddUpstreamVariant().set(src);
-    return *this;
-  }
-
-  template <typename T>
-  FORCE_INLINE ElementProxy& operator=(T* src) {
-    getOrAddUpstreamVariant().set(src);
-    return *this;
-  }
-
-  FORCE_INLINE void clear() const {
-    getUpstreamVariant().clear();
-  }
-
-  FORCE_INLINE bool isNull() const {
-    return getUpstreamVariantConst().isNull();
-  }
-
-  template <typename T>
-  FORCE_INLINE typename enable_if<!is_same<T, char*>::value &&
-                                      !ConverterNeedsWriteableRef<T>::value,
-                                  T>::type
-  as() const {
-    return getUpstreamVariantConst().template as<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE typename enable_if<ConverterNeedsWriteableRef<T>::value, T>::type
-  as() const {
-    return getUpstreamVariant().template as<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE typename enable_if<is_same<T, char*>::value, const char*>::type
-  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
-      as() const {
-    return as<const char*>();
-  }
-
-  template <typename T>
-  FORCE_INLINE operator T() const {
-    return as<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE typename VariantTo<T>::type to() {
-    return getOrAddUpstreamVariant().template to<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE
-      typename enable_if<ConverterNeedsWriteableRef<T>::value, bool>::type
-      is() const {
-    return getUpstreamVariant().template is<T>();
-  }
-
-  template <typename T>
-  FORCE_INLINE
-      typename enable_if<!ConverterNeedsWriteableRef<T>::value, bool>::type
-      is() const {
-    return getUpstreamVariantConst().template is<T>();
-  }
-
-  FORCE_INLINE void shallowCopy(VariantConstRef value) {
-    getOrAddUpstreamVariant().shallowCopy(value);
-  }
-
-  template <typename T>
-  FORCE_INLINE bool set(const T& value) {
-    return getOrAddUpstreamVariant().set(value);
-  }
-
-  template <typename T>
-  FORCE_INLINE bool set(T* value) {
-    return getOrAddUpstreamVariant().set(value);
-  }
-
-  FORCE_INLINE size_t size() const {
-    return getUpstreamVariantConst().size();
-  }
-
-  FORCE_INLINE size_t memoryUsage() const {
-    return getUpstreamVariantConst().memoryUsage();
-  }
-
-  FORCE_INLINE VariantRef add() const {
-    return getOrAddUpstreamVariant().add();
-  }
-
-  using ArrayShortcuts<ElementProxy<TUpstream> >::add;
-
-  FORCE_INLINE void remove(size_t index) const {
-    getUpstreamVariant().remove(index);
-  }
-  // remove(char*) const
-  // remove(const char*) const
-  // remove(const __FlashStringHelper*) const
-  template <typename TChar>
-  FORCE_INLINE typename enable_if<IsString<TChar*>::value>::type remove(
-      TChar* key) const {
-    getUpstreamVariant().remove(key);
-  }
-  // remove(const std::string&) const
-  // remove(const String&) const
-  template <typename TString>
-  FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
-      const TString& key) const {
-    getUpstreamVariant().remove(key);
-  }
-
- protected:
   FORCE_INLINE MemoryPool* getPool() const {
     return VariantAttorney::getPool(_upstream);
   }
@@ -162,28 +28,13 @@ class ElementProxy  //
   }
 
  private:
-  FORCE_INLINE VariantRef getUpstreamVariant() const {
-    return VariantRef(getPool(), getData());
-  }
-
-  FORCE_INLINE VariantConstRef getUpstreamVariantConst() const {
-    return VariantConstRef(getData());
-  }
-
-  FORCE_INLINE VariantRef getOrAddUpstreamVariant() const {
-    return VariantRef(getPool(), getOrCreateData());
-  }
-
-  friend void convertToJson(const ElementProxy& src, VariantRef dst) {
-    dst.set(src.getUpstreamVariantConst());
-  }
+#if defined _MSC_VER && _MSC_VER <= 1800  // Visual Studio 2013 or below
+  // Prevent "assignment operator could not be generated"
+  ElementDataSource& operator=(const ElementDataSource&);
+#endif
 
   TUpstream _upstream;
-  const size_t _index;
+  size_t _index;
 };
 
 }  // namespace ARDUINOJSON_NAMESPACE
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif