From ef8ed28aec066975f2b9656035338713a9e9cef2 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 19 Dec 2022 12:05:08 +0100 Subject: [PATCH] Rename `VariantConstRef` to `JsonVariantConst` --- extras/tests/JsonVariant/converters.cpp | 4 +- extras/tests/Misc/TypeTraits.cpp | 2 +- src/ArduinoJson.hpp | 4 +- src/ArduinoJson/Array/JsonArray.hpp | 12 ++--- src/ArduinoJson/Array/JsonArrayConst.hpp | 14 +++--- src/ArduinoJson/Array/JsonArrayIterator.hpp | 10 ++-- src/ArduinoJson/Array/Utilities.hpp | 4 +- src/ArduinoJson/Deserialization/Filter.hpp | 6 +-- .../Deserialization/Readers/VariantReader.hpp | 2 +- .../Document/BasicJsonDocument.hpp | 6 +-- src/ArduinoJson/Document/JsonDocument.hpp | 25 +++++----- .../Document/StaticJsonDocument.hpp | 2 +- src/ArduinoJson/Json/JsonSerializer.hpp | 8 ++-- src/ArduinoJson/Json/PrettyJsonSerializer.hpp | 6 +-- src/ArduinoJson/MsgPack/MsgPackSerializer.hpp | 6 +-- src/ArduinoJson/Numbers/parseNumber.hpp | 2 +- src/ArduinoJson/Object/JsonObject.hpp | 12 ++--- src/ArduinoJson/Object/JsonObjectConst.hpp | 18 +++---- src/ArduinoJson/Object/JsonPair.hpp | 8 ++-- src/ArduinoJson/Serialization/measure.hpp | 2 +- src/ArduinoJson/Serialization/serialize.hpp | 10 ++-- src/ArduinoJson/Variant/ConverterImpl.hpp | 48 +++++++++---------- ...riantConstRef.hpp => JsonVariantConst.hpp} | 20 ++++---- src/ArduinoJson/Variant/VariantAttorney.hpp | 2 +- src/ArduinoJson/Variant/VariantCompare.hpp | 4 +- src/ArduinoJson/Variant/VariantImpl.hpp | 2 +- src/ArduinoJson/Variant/VariantOperators.hpp | 6 +-- src/ArduinoJson/Variant/VariantRef.hpp | 16 +++---- src/ArduinoJson/Variant/VariantRefBase.hpp | 8 ++-- 29 files changed, 134 insertions(+), 135 deletions(-) rename src/ArduinoJson/Variant/{VariantConstRef.hpp => JsonVariantConst.hpp} (85%) diff --git a/extras/tests/JsonVariant/converters.cpp b/extras/tests/JsonVariant/converters.cpp index 785289e1..93e73912 100644 --- a/extras/tests/JsonVariant/converters.cpp +++ b/extras/tests/JsonVariant/converters.cpp @@ -96,11 +96,11 @@ struct Converter { dst["imag"] = src.imag(); } - static Complex fromJson(VariantConstRef src) { + static Complex fromJson(JsonVariantConst src) { return Complex(src["real"], src["imag"]); } - static bool checkJson(VariantConstRef src) { + static bool checkJson(JsonVariantConst src) { return src["real"].is() && src["imag"].is(); } }; diff --git a/extras/tests/Misc/TypeTraits.cpp b/extras/tests/Misc/TypeTraits.cpp index a54a69a1..976286aa 100644 --- a/extras/tests/Misc/TypeTraits.cpp +++ b/extras/tests/Misc/TypeTraits.cpp @@ -182,7 +182,7 @@ TEST_CASE("Polyfills/type_traits") { false)); CHECK((is_convertible::value == false)); CHECK((is_convertible::value == true)); - CHECK((is_convertible::value == true)); + CHECK((is_convertible::value == true)); CHECK((is_convertible::value == true)); CHECK((is_convertible, JsonVariantConst>::value == true)); diff --git a/src/ArduinoJson.hpp b/src/ArduinoJson.hpp index f786694e..c6868581 100644 --- a/src/ArduinoJson.hpp +++ b/src/ArduinoJson.hpp @@ -23,7 +23,7 @@ #include "ArduinoJson/Array/JsonArray.hpp" #include "ArduinoJson/Object/JsonObject.hpp" -#include "ArduinoJson/Variant/VariantConstRef.hpp" +#include "ArduinoJson/Variant/JsonVariantConst.hpp" #include "ArduinoJson/Document/DynamicJsonDocument.hpp" #include "ArduinoJson/Document/StaticJsonDocument.hpp" @@ -57,7 +57,7 @@ using ARDUINOJSON_NAMESPACE::JsonPair; using ARDUINOJSON_NAMESPACE::JsonPairConst; using ARDUINOJSON_NAMESPACE::JsonString; using ARDUINOJSON_NAMESPACE::JsonUInt; -typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst; +using ARDUINOJSON_NAMESPACE::JsonVariantConst; typedef ARDUINOJSON_NAMESPACE::VariantRef JsonVariant; using ARDUINOJSON_NAMESPACE::BasicJsonDocument; using ARDUINOJSON_NAMESPACE::copyArray; diff --git a/src/ArduinoJson/Array/JsonArray.hpp b/src/ArduinoJson/Array/JsonArray.hpp index 9bf6a39c..aab19a26 100644 --- a/src/ArduinoJson/Array/JsonArray.hpp +++ b/src/ArduinoJson/Array/JsonArray.hpp @@ -98,8 +98,8 @@ class JsonArray : public VariantOperators { return add().to(); } - operator VariantConstRef() const { - return VariantConstRef(collectionToVariant(_data)); + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(_data)); } FORCE_INLINE bool isNull() const { @@ -141,7 +141,7 @@ class JsonArray : public VariantOperators { template <> struct Converter : private VariantAttorney { - static void toJson(VariantConstRef src, VariantRef dst) { + static void toJson(JsonVariantConst src, VariantRef dst) { variantCopyFrom(getData(dst), getData(src), getPool(dst)); } @@ -151,10 +151,10 @@ struct Converter : private VariantAttorney { return JsonArray(pool, data != 0 ? data->asArray() : 0); } - static InvalidConversion fromJson( - VariantConstRef); + static InvalidConversion fromJson( + JsonVariantConst); - static bool checkJson(VariantConstRef) { + static bool checkJson(JsonVariantConst) { return false; } diff --git a/src/ArduinoJson/Array/JsonArrayConst.hpp b/src/ArduinoJson/Array/JsonArrayConst.hpp index 24bd9ed5..8490542d 100644 --- a/src/ArduinoJson/Array/JsonArrayConst.hpp +++ b/src/ArduinoJson/Array/JsonArrayConst.hpp @@ -55,12 +55,12 @@ class JsonArrayConst : public VariantOperators { } } - FORCE_INLINE VariantConstRef operator[](size_t index) const { - return VariantConstRef(_data ? _data->getElement(index) : 0); + FORCE_INLINE JsonVariantConst operator[](size_t index) const { + return JsonVariantConst(_data ? _data->getElement(index) : 0); } - operator VariantConstRef() const { - return VariantConstRef(collectionToVariant(_data)); + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(_data)); } FORCE_INLINE bool isNull() const { @@ -93,16 +93,16 @@ class JsonArrayConst : public VariantOperators { template <> struct Converter : private VariantAttorney { - static void toJson(VariantConstRef src, VariantRef dst) { + static void toJson(JsonVariantConst src, VariantRef dst) { variantCopyFrom(getData(dst), getData(src), getPool(dst)); } - static JsonArrayConst fromJson(VariantConstRef src) { + static JsonArrayConst fromJson(JsonVariantConst src) { const VariantData* data = getData(src); return data ? data->asArray() : 0; } - static bool checkJson(VariantConstRef src) { + static bool checkJson(JsonVariantConst src) { const VariantData* data = getData(src); return data && data->isArray(); } diff --git a/src/ArduinoJson/Array/JsonArrayIterator.hpp b/src/ArduinoJson/Array/JsonArrayIterator.hpp index 4d0afe29..deb3b1a3 100644 --- a/src/ArduinoJson/Array/JsonArrayIterator.hpp +++ b/src/ArduinoJson/Array/JsonArrayIterator.hpp @@ -67,16 +67,16 @@ class VariantConstPtr { public: VariantConstPtr(const VariantData* data) : _variant(data) {} - VariantConstRef* operator->() { + JsonVariantConst* operator->() { return &_variant; } - VariantConstRef& operator*() { + JsonVariantConst& operator*() { return _variant; } private: - VariantConstRef _variant; + JsonVariantConst _variant; }; class JsonArrayConstIterator { @@ -86,8 +86,8 @@ class JsonArrayConstIterator { JsonArrayConstIterator() : _slot(0) {} explicit JsonArrayConstIterator(const VariantSlot* slot) : _slot(slot) {} - VariantConstRef operator*() const { - return VariantConstRef(_slot->data()); + JsonVariantConst operator*() const { + return JsonVariantConst(_slot->data()); } VariantConstPtr operator->() { return VariantConstPtr(_slot->data()); diff --git a/src/ArduinoJson/Array/Utilities.hpp b/src/ArduinoJson/Array/Utilities.hpp index 6984a45f..93237c52 100644 --- a/src/ArduinoJson/Array/Utilities.hpp +++ b/src/ArduinoJson/Array/Utilities.hpp @@ -57,7 +57,7 @@ inline bool copyArray(const T* src, size_t len, JsonDocument& dst) { // Trivial case form to stop the recursion template inline typename enable_if::value, size_t>::type copyArray( - VariantConstRef src, T& dst) { + JsonVariantConst src, T& dst) { dst = src.as(); return 1; } @@ -80,7 +80,7 @@ inline size_t copyArray(JsonArrayConst src, T* dst, size_t len) { // Special case for char[] which must be treated as a string template -inline size_t copyArray(VariantConstRef src, char (&dst)[N]) { +inline size_t copyArray(JsonVariantConst src, char (&dst)[N]) { JsonString s = src; size_t len = N - 1; if (len > s.size()) diff --git a/src/ArduinoJson/Deserialization/Filter.hpp b/src/ArduinoJson/Deserialization/Filter.hpp index 5ca90019..501acf3e 100644 --- a/src/ArduinoJson/Deserialization/Filter.hpp +++ b/src/ArduinoJson/Deserialization/Filter.hpp @@ -10,7 +10,7 @@ namespace ARDUINOJSON_NAMESPACE { class Filter { public: - explicit Filter(VariantConstRef v) : _variant(v) {} + explicit Filter(JsonVariantConst v) : _variant(v) {} bool allow() const { return _variant; @@ -32,12 +32,12 @@ class Filter { Filter operator[](const TKey& key) const { if (_variant == true) // "true" means "allow recursively" return *this; - VariantConstRef member = _variant[key]; + JsonVariantConst member = _variant[key]; return Filter(member.isNull() ? _variant["*"] : member); } private: - VariantConstRef _variant; + JsonVariantConst _variant; }; struct AllowAllFilter { diff --git a/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp index de94045c..17918cd0 100644 --- a/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp +++ b/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include namespace ARDUINOJSON_NAMESPACE { diff --git a/src/ArduinoJson/Document/BasicJsonDocument.hpp b/src/ArduinoJson/Document/BasicJsonDocument.hpp index b3e220cc..bc3e9b04 100644 --- a/src/ArduinoJson/Document/BasicJsonDocument.hpp +++ b/src/ArduinoJson/Document/BasicJsonDocument.hpp @@ -65,9 +65,9 @@ class BasicJsonDocument : AllocatorOwner, public JsonDocument { BasicJsonDocument( const T& src, typename enable_if< - is_same::value || is_same::value || - is_same::value || is_same::value || - is_same::value || + is_same::value || + is_same::value || is_same::value || + is_same::value || is_same::value || is_same::value>::type* = 0) : JsonDocument(allocPool(src.memoryUsage())) { set(src); diff --git a/src/ArduinoJson/Document/JsonDocument.hpp b/src/ArduinoJson/Document/JsonDocument.hpp index 66f3a14e..236667e4 100644 --- a/src/ArduinoJson/Document/JsonDocument.hpp +++ b/src/ArduinoJson/Document/JsonDocument.hpp @@ -9,10 +9,9 @@ #include #include #include -#include +#include #include - namespace ARDUINOJSON_NAMESPACE { class JsonDocument : public VariantOperators { @@ -69,7 +68,7 @@ class JsonDocument : public VariantOperators { } bool set(const JsonDocument& src) { - return to().set(src.as()); + return to().set(src.as()); } template @@ -160,9 +159,9 @@ class JsonDocument : public VariantOperators { // operator[](const String&) const template FORCE_INLINE - typename enable_if::value, VariantConstRef>::type + typename enable_if::value, JsonVariantConst>::type operator[](const TString& key) const { - return VariantConstRef(_data.getMember(adaptString(key))); + return JsonVariantConst(_data.getMember(adaptString(key))); } // operator[](char*) const @@ -170,17 +169,17 @@ class JsonDocument : public VariantOperators { // operator[](const __FlashStringHelper*) const template FORCE_INLINE - typename enable_if::value, VariantConstRef>::type + typename enable_if::value, JsonVariantConst>::type operator[](TChar* key) const { - return VariantConstRef(_data.getMember(adaptString(key))); + return JsonVariantConst(_data.getMember(adaptString(key))); } FORCE_INLINE ElementProxy operator[](size_t index) { return ElementProxy(*this, index); } - FORCE_INLINE VariantConstRef operator[](size_t index) const { - return VariantConstRef(_data.getElement(index)); + FORCE_INLINE JsonVariantConst operator[](size_t index) const { + return JsonVariantConst(_data.getElement(index)); } FORCE_INLINE VariantRef add() { @@ -223,7 +222,7 @@ class JsonDocument : public VariantOperators { return getVariant(); } - FORCE_INLINE operator VariantConstRef() const { + FORCE_INLINE operator JsonVariantConst() const { return getVariant(); } @@ -250,8 +249,8 @@ class JsonDocument : public VariantOperators { return VariantRef(&_pool, &_data); } - VariantConstRef getVariant() const { - return VariantConstRef(&_data); + JsonVariantConst getVariant() const { + return JsonVariantConst(&_data); } MemoryPool _pool; @@ -280,7 +279,7 @@ class JsonDocument : public VariantOperators { }; inline void convertToJson(const JsonDocument& src, VariantRef dst) { - dst.set(src.as()); + dst.set(src.as()); } } // namespace ARDUINOJSON_NAMESPACE diff --git a/src/ArduinoJson/Document/StaticJsonDocument.hpp b/src/ArduinoJson/Document/StaticJsonDocument.hpp index 338424af..1c369e14 100644 --- a/src/ArduinoJson/Document/StaticJsonDocument.hpp +++ b/src/ArduinoJson/Document/StaticJsonDocument.hpp @@ -24,7 +24,7 @@ class StaticJsonDocument : public JsonDocument { template StaticJsonDocument( const T& src, - typename enable_if::value>::type* = 0) + typename enable_if::value>::type* = 0) : JsonDocument(_buffer, _capacity) { set(src); } diff --git a/src/ArduinoJson/Json/JsonSerializer.hpp b/src/ArduinoJson/Json/JsonSerializer.hpp index 2b484d64..4387fdb0 100644 --- a/src/ArduinoJson/Json/JsonSerializer.hpp +++ b/src/ArduinoJson/Json/JsonSerializer.hpp @@ -116,22 +116,22 @@ class JsonSerializer : public Visitor { }; template -size_t serializeJson(VariantConstRef source, TDestination& destination) { +size_t serializeJson(JsonVariantConst source, TDestination& destination) { return serialize(source, destination); } -inline size_t serializeJson(VariantConstRef source, void* buffer, +inline size_t serializeJson(JsonVariantConst source, void* buffer, size_t bufferSize) { return serialize(source, buffer, bufferSize); } -inline size_t measureJson(VariantConstRef source) { +inline size_t measureJson(JsonVariantConst source) { return measure(source); } #if ARDUINOJSON_ENABLE_STD_STREAM template -inline typename enable_if::value, +inline typename enable_if::value, std::ostream&>::type operator<<(std::ostream& os, const T& source) { serializeJson(source, os); diff --git a/src/ArduinoJson/Json/PrettyJsonSerializer.hpp b/src/ArduinoJson/Json/PrettyJsonSerializer.hpp index 3741615a..f11c1116 100644 --- a/src/ArduinoJson/Json/PrettyJsonSerializer.hpp +++ b/src/ArduinoJson/Json/PrettyJsonSerializer.hpp @@ -71,16 +71,16 @@ class PrettyJsonSerializer : public JsonSerializer { }; template -size_t serializeJsonPretty(VariantConstRef source, TDestination& destination) { +size_t serializeJsonPretty(JsonVariantConst source, TDestination& destination) { return serialize(source, destination); } -inline size_t serializeJsonPretty(VariantConstRef source, void* buffer, +inline size_t serializeJsonPretty(JsonVariantConst source, void* buffer, size_t bufferSize) { return serialize(source, buffer, bufferSize); } -inline size_t measureJsonPretty(VariantConstRef source) { +inline size_t measureJsonPretty(JsonVariantConst source) { return measure(source); } diff --git a/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp index 39b80aef..f59c38fb 100644 --- a/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp +++ b/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp @@ -198,16 +198,16 @@ class MsgPackSerializer : public Visitor { }; template -inline size_t serializeMsgPack(VariantConstRef source, TDestination& output) { +inline size_t serializeMsgPack(JsonVariantConst source, TDestination& output) { return serialize(source, output); } -inline size_t serializeMsgPack(VariantConstRef source, void* output, +inline size_t serializeMsgPack(JsonVariantConst source, void* output, size_t size) { return serialize(source, output, size); } -inline size_t measureMsgPack(VariantConstRef source) { +inline size_t measureMsgPack(JsonVariantConst source) { return measure(source); } diff --git a/src/ArduinoJson/Numbers/parseNumber.hpp b/src/ArduinoJson/Numbers/parseNumber.hpp index 76ccf1d8..05fca733 100644 --- a/src/ArduinoJson/Numbers/parseNumber.hpp +++ b/src/ArduinoJson/Numbers/parseNumber.hpp @@ -148,6 +148,6 @@ inline T parseNumber(const char* s) { VariantData value; value.init(); // VariantData is a POD, so it has no constructor parseNumber(s, value); - return Converter::fromJson(VariantConstRef(&value)); + return Converter::fromJson(JsonVariantConst(&value)); } } // namespace ARDUINOJSON_NAMESPACE diff --git a/src/ArduinoJson/Object/JsonObject.hpp b/src/ArduinoJson/Object/JsonObject.hpp index 58e6c5dc..9ff74bf3 100644 --- a/src/ArduinoJson/Object/JsonObject.hpp +++ b/src/ArduinoJson/Object/JsonObject.hpp @@ -30,8 +30,8 @@ class JsonObject : public VariantOperators { return JsonObjectConst(_data); } - operator VariantConstRef() const { - return VariantConstRef(collectionToVariant(_data)); + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(_data)); } FORCE_INLINE bool isNull() const { @@ -176,7 +176,7 @@ class JsonObject : public VariantOperators { template <> struct Converter : private VariantAttorney { - static void toJson(VariantConstRef src, VariantRef dst) { + static void toJson(JsonVariantConst src, VariantRef dst) { variantCopyFrom(getData(dst), getData(src), getPool(dst)); } @@ -186,10 +186,10 @@ struct Converter : private VariantAttorney { return JsonObject(pool, data != 0 ? data->asObject() : 0); } - static InvalidConversion fromJson( - VariantConstRef); + static InvalidConversion fromJson( + JsonVariantConst); - static bool checkJson(VariantConstRef) { + static bool checkJson(JsonVariantConst) { return false; } diff --git a/src/ArduinoJson/Object/JsonObjectConst.hpp b/src/ArduinoJson/Object/JsonObjectConst.hpp index b4c70fd5..d83ff785 100644 --- a/src/ArduinoJson/Object/JsonObjectConst.hpp +++ b/src/ArduinoJson/Object/JsonObjectConst.hpp @@ -19,8 +19,8 @@ class JsonObjectConst : public VariantOperators { JsonObjectConst() : _data(0) {} JsonObjectConst(const CollectionData* data) : _data(data) {} - operator VariantConstRef() const { - return VariantConstRef(collectionToVariant(_data)); + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(_data)); } FORCE_INLINE bool isNull() const { @@ -72,9 +72,9 @@ class JsonObjectConst : public VariantOperators { // operator[](const String&) const template FORCE_INLINE - typename enable_if::value, VariantConstRef>::type + typename enable_if::value, JsonVariantConst>::type operator[](const TString& key) const { - return VariantConstRef(getMember(adaptString(key))); + return JsonVariantConst(getMember(adaptString(key))); } // operator[](char*) const @@ -82,9 +82,9 @@ class JsonObjectConst : public VariantOperators { // operator[](const __FlashStringHelper*) const template FORCE_INLINE - typename enable_if::value, VariantConstRef>::type + typename enable_if::value, JsonVariantConst>::type operator[](TChar* key) const { - return VariantConstRef(getMember(adaptString(key))); + return JsonVariantConst(getMember(adaptString(key))); } FORCE_INLINE bool operator==(JsonObjectConst rhs) const { @@ -120,16 +120,16 @@ class JsonObjectConst : public VariantOperators { template <> struct Converter : private VariantAttorney { - static void toJson(VariantConstRef src, VariantRef dst) { + static void toJson(JsonVariantConst src, VariantRef dst) { variantCopyFrom(getData(dst), getData(src), getPool(dst)); } - static JsonObjectConst fromJson(VariantConstRef src) { + static JsonObjectConst fromJson(JsonVariantConst src) { const VariantData* data = getData(src); return data != 0 ? data->asObject() : 0; } - static bool checkJson(VariantConstRef src) { + static bool checkJson(JsonVariantConst src) { const VariantData* data = getData(src); return data && data->isObject(); } diff --git a/src/ArduinoJson/Object/JsonPair.hpp b/src/ArduinoJson/Object/JsonPair.hpp index 0e840ee3..50cfba5f 100644 --- a/src/ArduinoJson/Object/JsonPair.hpp +++ b/src/ArduinoJson/Object/JsonPair.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include namespace ARDUINOJSON_NAMESPACE { @@ -39,7 +39,7 @@ class JsonPairConst { if (slot) { _key = JsonString(slot->key(), slot->ownsKey() ? JsonString::Copied : JsonString::Linked); - _value = VariantConstRef(slot->data()); + _value = JsonVariantConst(slot->data()); } } @@ -47,12 +47,12 @@ class JsonPairConst { return _key; } - VariantConstRef value() const { + JsonVariantConst value() const { return _value; } private: JsonString _key; - VariantConstRef _value; + JsonVariantConst _value; }; } // namespace ARDUINOJSON_NAMESPACE diff --git a/src/ArduinoJson/Serialization/measure.hpp b/src/ArduinoJson/Serialization/measure.hpp index d4d12ab4..b8172c57 100644 --- a/src/ArduinoJson/Serialization/measure.hpp +++ b/src/ArduinoJson/Serialization/measure.hpp @@ -10,7 +10,7 @@ namespace ARDUINOJSON_NAMESPACE { template