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

Use getUpstreamXxxConst as much as possible (6788,5602)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-31 12:19:00 +02:00
parent c4d487b6cf
commit 77cda804e5
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ArduinoJson/Array/ElementProxy.hpp
View File

@@ -61,7 +61,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
} }
FORCE_INLINE bool isNull() const { FORCE_INLINE bool isNull() const {
return getUpstreamElement().isNull(); return getUpstreamElementConst().isNull();
} }
template <typename T> template <typename T>
@@ -87,14 +87,23 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
template <typename T> template <typename T>
FORCE_INLINE operator T() const { FORCE_INLINE operator T() const {
return getUpstreamElement(); return as<T>();
} }
template <typename T> template <typename T>
FORCE_INLINE bool is() const { FORCE_INLINE
typename enable_if<ConverterNeedsWriteableRef<T>::value, bool>::type
is() const {
return getUpstreamElement().template is<T>(); return getUpstreamElement().template is<T>();
} }
template <typename T>
FORCE_INLINE
typename enable_if<!ConverterNeedsWriteableRef<T>::value, bool>::type
is() const {
return getUpstreamElementConst().template is<T>();
}
template <typename T> template <typename T>
FORCE_INLINE typename VariantTo<T>::type to() const { FORCE_INLINE typename VariantTo<T>::type to() const {
return getOrAddUpstreamElement().template to<T>(); return getOrAddUpstreamElement().template to<T>();
@@ -127,11 +136,11 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
} }
FORCE_INLINE size_t size() const { FORCE_INLINE size_t size() const {
return getUpstreamElement().size(); return getUpstreamElementConst().size();
} }
FORCE_INLINE size_t memoryUsage() const { FORCE_INLINE size_t memoryUsage() const {
return getUpstreamElement().memoryUsage(); return getUpstreamElementConst().memoryUsage();
} }
template <typename TNestedKey> template <typename TNestedKey>
@@ -213,7 +222,7 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
} }
friend void convertToJson(const this_type& src, VariantRef dst) { friend void convertToJson(const this_type& src, VariantRef dst) {
dst.set(src.getUpstreamElement()); dst.set(src.getUpstreamElement()); // TODO: getUpstreamElementConst ?
} }
TArray _array; TArray _array;

31
src/ArduinoJson/Object/MemberProxy.hpp
View File

@@ -36,7 +36,7 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
: _object(src._object), _key(src._key) {} : _object(src._object), _key(src._key) {}
FORCE_INLINE operator VariantConstRef() const { FORCE_INLINE operator VariantConstRef() const {
return getUpstreamMember(); return getUpstreamMemberConst();
} }
FORCE_INLINE this_type &operator=(const this_type &src) { FORCE_INLINE this_type &operator=(const this_type &src) {
@@ -65,7 +65,7 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
} }
FORCE_INLINE bool isNull() const { FORCE_INLINE bool isNull() const {
return getUpstreamMember().isNull(); return getUpstreamMemberConst().isNull();
} }
template <typename T> template <typename T>
@@ -91,20 +91,29 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
template <typename T> template <typename T>
FORCE_INLINE operator T() const { FORCE_INLINE operator T() const {
return getUpstreamMember(); return as<T>();
} }
template <typename TValue> template <typename T>
FORCE_INLINE bool is() const { FORCE_INLINE
return getUpstreamMember().template is<TValue>(); typename enable_if<ConverterNeedsWriteableRef<T>::value, bool>::type
is() const {
return getUpstreamMember().template is<T>();
}
template <typename T>
FORCE_INLINE
typename enable_if<!ConverterNeedsWriteableRef<T>::value, bool>::type
is() const {
return getUpstreamMemberConst().template is<T>();
} }
FORCE_INLINE size_t size() const { FORCE_INLINE size_t size() const {
return getUpstreamMember().size(); return getUpstreamMemberConst().size();
} }
FORCE_INLINE size_t memoryUsage() const { FORCE_INLINE size_t memoryUsage() const {
return getUpstreamMember().memoryUsage(); return getUpstreamMemberConst().memoryUsage();
} }
FORCE_INLINE void remove(size_t index) const { FORCE_INLINE void remove(size_t index) const {
@@ -189,14 +198,14 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
// getMemberConst(const __FlashStringHelper*) const // getMemberConst(const __FlashStringHelper*) const
template <typename TChar> template <typename TChar>
FORCE_INLINE VariantConstRef getMemberConst(TChar *key) const { FORCE_INLINE VariantConstRef getMemberConst(TChar *key) const {
return getUpstreamMember().getMemberConst(key); return getUpstreamMemberConst().getMemberConst(key);
} }
// getMemberConst(const std::string&) const // getMemberConst(const std::string&) const
// getMemberConst(const String&) const // getMemberConst(const String&) const
template <typename TString> template <typename TString>
FORCE_INLINE VariantConstRef getMemberConst(const TString &key) const { FORCE_INLINE VariantConstRef getMemberConst(const TString &key) const {
return getUpstreamMember().getMemberConst(key); return getUpstreamMemberConst().getMemberConst(key);
} }
// getOrAddMember(char*) const // getOrAddMember(char*) const
@@ -228,7 +237,7 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
} }
friend void convertToJson(const this_type &src, VariantRef dst) { friend void convertToJson(const this_type &src, VariantRef dst) {
dst.set(src.getUpstreamMember()); dst.set(src.getUpstreamMember()); // TODO: getUpstreamMemberConst ?
} }
TObject _object; TObject _object;