Extract asArray() NO CHANGE

Author: bblanchon

src/ArduinoJson/Array/JsonArray.hpp

@@ -24,7 +24,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
 
   // INTERNAL USE ONLY
   JsonArray(detail::VariantData* data, detail::ResourceManager* resources)
-      : impl_(detail::VariantImpl(data, resources).asArray()) {}
+      : impl_(detail::VariantImpl::asArray(data, resources)) {}
 
   // INTERNAL USE ONLY
   JsonArray(const detail::ArrayImpl& impl) : impl_(impl) {}

src/ArduinoJson/Array/JsonArrayConst.hpp

@@ -38,7 +38,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
 
   // INTERNAL USE ONLY
   JsonArrayConst(detail::VariantData* data, detail::ResourceManager* resources)
-      : impl_(detail::VariantImpl(data, resources).asArray()) {}
+      : impl_(detail::VariantImpl::asArray(data, resources)) {}
 
   // INTERNAL USE ONLY
   JsonArrayConst(const detail::ArrayImpl& impl) : impl_(impl) {}

src/ArduinoJson/Variant/VariantData.hpp

@@ -153,7 +153,13 @@ class VariantImpl {
   }
 
   ArrayImpl asArray() {
-    return ArrayImpl(isArray() ? &data_->content.asCollection : nullptr,
+    return asArray(data_, resources_);
+  }
+
+  static ArrayImpl asArray(VariantData* data_, ResourceManager* resources_) {
+    return ArrayImpl(data_ && data_->type == VariantType::Array
+                         ? &data_->content.asCollection
+                         : nullptr,
                      resources_);
   }
 

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -30,7 +30,7 @@ typename TVisitor::result_type VariantImpl::accept(
 #endif
 
     case VariantType::Array:
-      return visit.visit(ArrayImpl(&data_->content.asCollection, resources_));
+      return visit.visit(asArray(data_, resources_));
 
     case VariantType::Object:
       return visit.visit(ObjectImpl(&data_->content.asCollection, resources_));