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

Merge isObject() and isObjectStrict() (6796,5626)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-28 12:42:44 +02:00
parent a3d7158106
commit d7eef30e6c
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ArduinoJson/Object/ObjectRef.hpp
View File

@@ -251,7 +251,7 @@ struct Converter<ObjectConstRef> {
static bool checkJson(VariantConstRef src) { static bool checkJson(VariantConstRef src) {
const VariantData* data = getData(src); const VariantData* data = getData(src);
return data && data->isObject(); return data && data->resolve()->isObject();
} }
}; };
@@ -278,7 +278,7 @@ struct Converter<ObjectRef> {
static bool checkJson(VariantRef src) { static bool checkJson(VariantRef src) {
VariantData* data = getData(src); VariantData* data = getData(src);
return data && data->isObjectStrict(); return data && data->isObject();
} }
}; };
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE

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

@@ -102,7 +102,7 @@ class VariantData {
} }
CollectionData *asObject() { CollectionData *asObject() {
return isObjectStrict() ? &_content.asCollection : 0; return isObject() ? &_content.asCollection : 0;
} }
const CollectionData *asObject() const { const CollectionData *asObject() const {
@@ -159,12 +159,6 @@ class VariantData {
} }
bool isObject() const { bool isObject() const {
if (isPointer()) // P+0 G+0
return _content.asPointer->isObject();
return isObjectStrict();
}
bool isObjectStrict() const {
return (_flags & VALUE_IS_OBJECT) != 0; return (_flags & VALUE_IS_OBJECT) != 0;
} }
@@ -185,7 +179,7 @@ class VariantData {
template <typename TAdaptedString> template <typename TAdaptedString>
void remove(TAdaptedString key) { void remove(TAdaptedString key) {
if (isObjectStrict()) if (isObject())
_content.asCollection.removeMember(key); _content.asCollection.removeMember(key);
} }
@@ -326,7 +320,7 @@ class VariantData {
TStoragePolicy storage_policy) { TStoragePolicy storage_policy) {
if (isNull()) if (isNull())
toObject(); toObject();
if (!isObjectStrict()) if (!isObject())
return 0; return 0;
return _content.asCollection.getOrAddMember(key, pool, storage_policy); return _content.asCollection.getOrAddMember(key, pool, storage_policy);
} }