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

Add JsonVariant::link() (resolves #1343)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-04-27 15:06:58 +02:00
parent 5577d18377
commit 3d6c328a4f
35 changed files with 649 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,17 +15,17 @@ template <typename TVisitor>
inline typename TVisitor::result_type variantAccept(const VariantData *var,
TVisitor &visitor) {
if (var != 0)
return var->accept(visitor);
return var->resolve()->accept(visitor);
else
return visitor.visitNull();
}
inline const CollectionData *variantAsArray(const VariantData *var) {
return var != 0 ? var->asArray() : 0;
return var != 0 ? var->resolve()->asArray() : 0;
}
inline const CollectionData *variantAsObject(const VariantData *var) {
return var != 0 ? var->asObject() : 0;
return var != 0 ? var->resolve()->asObject() : 0;
}
inline CollectionData *variantAsObject(VariantData *var) {
@@ -56,7 +56,7 @@ inline bool variantSetString(VariantData *var, TAdaptedString value,
}
inline size_t variantSize(const VariantData *var) {
return var != 0 ? var->size() : 0;
return var != 0 ? var->resolve()->size() : 0;
}
inline CollectionData *variantToArray(VariantData *var) {
@@ -102,14 +102,14 @@ NO_INLINE VariantData *variantGetOrAddMember(VariantData *var,
}
inline bool variantIsNull(const VariantData *var) {
return var == 0 || var->isNull();
return var == 0 || var->resolve()->isNull();
}
inline size_t variantNesting(const VariantData *var) {
if (!var)
return 0;
const CollectionData *collection = var->asCollection();
const CollectionData *collection = var->resolve()->asCollection();
if (!collection)
return 0;