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

Add getMemberConst() and getElementConst()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-31 11:59:00 +02:00
parent ac1d29fac0
commit 7b19a4b6e7
8 changed files with 181 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
// containsKey(const String&) const
template <typename TString>
FORCE_INLINE bool containsKey(const TString& key) const {
return !getMember(key).isUnbound();
return !getMemberConst(key).isUnbound();
}
// containsKey(char*) const
@@ -89,22 +89,22 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
// containsKey(const __FlashStringHelper*) const
template <typename TChar>
FORCE_INLINE bool containsKey(TChar* key) const {
return !getMember(key).isUnbound();
return !getMemberConst(key).isUnbound();
}
// getMember(const std::string&) const
// getMember(const String&) const
// getMemberConst(const std::string&) const
// getMemberConst(const String&) const
template <typename TString>
FORCE_INLINE VariantConstRef getMember(const TString& key) const {
return get_impl(adaptString(key));
FORCE_INLINE VariantConstRef getMemberConst(const TString& key) const {
return VariantConstRef(objectGetMember(_data, adaptString(key)));
}
// getMember(char*) const
// getMember(const char*) const
// getMember(const __FlashStringHelper*) const
// getMemberConst(char*) const
// getMemberConst(const char*) const
// getMemberConst(const __FlashStringHelper*) const
template <typename TChar>
FORCE_INLINE VariantConstRef getMember(TChar* key) const {
return get_impl(adaptString(key));
FORCE_INLINE VariantConstRef getMemberConst(TChar* key) const {
return VariantConstRef(objectGetMember(_data, adaptString(key)));
}
// operator[](const std::string&) const
@@ -113,7 +113,7 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
FORCE_INLINE
typename enable_if<IsString<TString>::value, VariantConstRef>::type
operator[](const TString& key) const {
return get_impl(adaptString(key));
return getMemberConst(key);
}
// operator[](char*) const
@@ -123,7 +123,7 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
FORCE_INLINE
typename enable_if<IsString<TChar*>::value, VariantConstRef>::type
operator[](TChar* key) const {
return get_impl(adaptString(key));
return getMemberConst(key);
}
FORCE_INLINE bool operator==(ObjectConstRef rhs) const {
@@ -143,10 +143,6 @@ class ObjectConstRef : public ObjectRefBase<const CollectionData>,
}
private:
template <typename TAdaptedString>
FORCE_INLINE VariantConstRef get_impl(TAdaptedString key) const {
return VariantConstRef(objectGetMember(_data, key));
}
};
class ObjectRef : public ObjectRefBase<CollectionData>,
@@ -207,6 +203,21 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
return VariantRef(_pool, objectGetMember(_data, adaptString(key)));
}
// getMemberConst(const std::string&) const
// getMemberConst(const String&) const
template <typename TString>
FORCE_INLINE VariantConstRef getMemberConst(const TString& key) const {
return VariantConstRef(objectGetMember(_data, adaptString(key)));
}
// getMemberConst(char*) const
// getMemberConst(const char*) const
// getMemberConst(const __FlashStringHelper*) const
template <typename TChar>
FORCE_INLINE VariantConstRef getMemberConst(TChar* key) const {
return VariantConstRef(objectGetMember(_data, adaptString(key)));
}
// getOrAddMember(const std::string&) const
// getOrAddMember(const String&) const
template <typename TString>