github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-02 08:48:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create or assign a JsonDocument from a JsonArray/JsonObject/JsonVariant

Browse Source
This commit is contained in:
Benoit Blanchon
2019-01-23 10:47:20 +01:00
parent 2a3b51ac3a
commit 4167b11434
10 changed files with 334 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ArduinoJson/Variant/VariantAs.hpp
View File

@@ -77,6 +77,14 @@ variantAs(const VariantData* _data) {
return _data != 0 ? _data->asString() : 0;
}
template <typename T>
inline typename enable_if<is_same<ArrayConstRef, T>::value, T>::type variantAs(
const VariantData* _data);
template <typename T>
inline typename enable_if<is_same<ObjectConstRef, T>::value, T>::type variantAs(
const VariantData* _data);
template <typename T>
inline typename enable_if<is_same<VariantConstRef, T>::value, T>::type
variantAs(const VariantData* _data);

13
src/ArduinoJson/Variant/VariantAsImpl.hpp
View File

@@ -5,10 +5,23 @@
#pragma once
#include "../Serialization/DynamicStringWriter.hpp"
#include "VariantFunctions.hpp"
#include "VariantRef.hpp"
namespace ARDUINOJSON_NAMESPACE {
template <typename T>
inline typename enable_if<is_same<ArrayConstRef, T>::value, T>::type variantAs(
const VariantData* _data) {
return ArrayConstRef(variantAsArray(_data));
}
template <typename T>
inline typename enable_if<is_same<ObjectConstRef, T>::value, T>::type variantAs(
const VariantData* _data) {
return ObjectConstRef(variantAsObject(_data));
}
template <typename T>
inline typename enable_if<is_same<VariantConstRef, T>::value, T>::type
variantAs(const VariantData* _data) {

10
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -67,10 +67,7 @@ class VariantData {
}
CollectionData *asArray() {
if (type() == VALUE_IS_ARRAY)
return &_content.asCollection;
else
return 0;
return type() == VALUE_IS_ARRAY ? &_content.asCollection : 0;
}
const CollectionData *asArray() const {
@@ -78,10 +75,7 @@ class VariantData {
}
CollectionData *asObject() {
if (type() == VALUE_IS_OBJECT)
return &_content.asCollection;
else
return 0;
return type() == VALUE_IS_OBJECT ? &_content.asCollection : 0;
}
const CollectionData *asObject() const {

4
src/ArduinoJson/Variant/VariantFunctions.hpp
View File

@@ -16,6 +16,10 @@ inline void variantAccept(const VariantData *var, Visitor &visitor) {
visitor.visitNull();
}
inline const CollectionData *variantAsArray(const VariantData *var) {
return var != 0 ? var->asArray() : 0;
}
inline const CollectionData *variantAsObject(const VariantData *var) {
return var != 0 ? var->asObject() : 0;
}