From 86772d33bc67965d63a61fbfa9f6f36ea9bab07b Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 2 May 2023 10:03:37 +0200 Subject: [PATCH] Rename `VALUE_IS_OWNED_RAW` to `VALUE_IS_RAW_STRING` --- extras/tests/JsonDocument/shrinkToFit.cpp | 4 ++-- extras/tests/JsonVariant/memoryUsage.cpp | 4 ++-- src/ArduinoJson/Variant/ConverterImpl.hpp | 2 +- src/ArduinoJson/Variant/VariantContent.hpp | 2 +- src/ArduinoJson/Variant/VariantData.hpp | 10 +++++----- src/ArduinoJson/Variant/VariantFunctions.hpp | 12 ++++++------ src/ArduinoJson/Variant/VariantImpl.hpp | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extras/tests/JsonDocument/shrinkToFit.cpp b/extras/tests/JsonDocument/shrinkToFit.cpp index 1117c9c4..39d26eeb 100644 --- a/extras/tests/JsonDocument/shrinkToFit.cpp +++ b/extras/tests/JsonDocument/shrinkToFit.cpp @@ -97,8 +97,8 @@ TEST_CASE("JsonDocument::shrinkToFit()") { << AllocatorLog::Reallocate(4096, 0)); } - SECTION("owned raw") { - doc.set(serialized(std::string("[{},12]"))); + SECTION("raw string") { + doc.set(serialized("[{},12]")); doc.shrinkToFit(); diff --git a/extras/tests/JsonVariant/memoryUsage.cpp b/extras/tests/JsonVariant/memoryUsage.cpp index 7026329d..7d6529e4 100644 --- a/extras/tests/JsonVariant/memoryUsage.cpp +++ b/extras/tests/JsonVariant/memoryUsage.cpp @@ -37,8 +37,8 @@ TEST_CASE("JsonVariant::memoryUsage()") { REQUIRE(var.memoryUsage() == doc.memoryUsage()); } - SECTION("returns size of owned raw") { - var.set(serialized(std::string("hello"))); + SECTION("returns size of raw string") { + var.set(serialized("hello")); REQUIRE(var.memoryUsage() == sizeofString(5)); REQUIRE(var.memoryUsage() == doc.memoryUsage()); } diff --git a/src/ArduinoJson/Variant/ConverterImpl.hpp b/src/ArduinoJson/Variant/ConverterImpl.hpp index fad2fd95..334a4cf1 100644 --- a/src/ArduinoJson/Variant/ConverterImpl.hpp +++ b/src/ArduinoJson/Variant/ConverterImpl.hpp @@ -161,7 +161,7 @@ convertToJson(const T& src, JsonVariant dst) { template struct Converter> : private detail::VariantAttorney { static void toJson(SerializedValue src, JsonVariant dst) { - variantSetOwnedRaw(getData(dst), src, getPool(dst)); + variantSetRawString(getData(dst), src, getPool(dst)); } }; diff --git a/src/ArduinoJson/Variant/VariantContent.hpp b/src/ArduinoJson/Variant/VariantContent.hpp index c802a0ee..65d5a6ef 100644 --- a/src/ArduinoJson/Variant/VariantContent.hpp +++ b/src/ArduinoJson/Variant/VariantContent.hpp @@ -17,7 +17,7 @@ enum { OWNED_VALUE_BIT = 0x01, VALUE_IS_NULL = 0, - VALUE_IS_OWNED_RAW = 0x03, + VALUE_IS_RAW_STRING = 0x03, VALUE_IS_LINKED_STRING = 0x04, VALUE_IS_OWNED_STRING = 0x05, diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp index c2af860b..b439be50 100644 --- a/src/ArduinoJson/Variant/VariantData.hpp +++ b/src/ArduinoJson/Variant/VariantData.hpp @@ -45,7 +45,7 @@ class VariantData { return visitor.visitString(content_.asString.data, content_.asString.size); - case VALUE_IS_OWNED_RAW: + case VALUE_IS_RAW_STRING: return visitor.visitRawJson(content_.asString.data, content_.asString.size); @@ -70,7 +70,7 @@ class VariantData { T asFloat() const; JsonString asString() const; - JsonString asRaw() const; + JsonString asRawString() const; bool asBoolean() const; @@ -157,8 +157,8 @@ class VariantData { content_.asFloat = value; } - void setOwnedRaw(const char* data, size_t n) { - setType(VALUE_IS_OWNED_RAW); + void setRawString(const char* data, size_t n) { + setType(VALUE_IS_RAW_STRING); content_.asString.data = data; content_.asString.size = n; } @@ -204,7 +204,7 @@ class VariantData { size_t memoryUsage() const { switch (type()) { case VALUE_IS_OWNED_STRING: - case VALUE_IS_OWNED_RAW: + case VALUE_IS_RAW_STRING: return sizeofString(content_.asString.size); case VALUE_IS_OBJECT: case VALUE_IS_ARRAY: diff --git a/src/ArduinoJson/Variant/VariantFunctions.hpp b/src/ArduinoJson/Variant/VariantFunctions.hpp index 5c4a0cdc..d3850780 100644 --- a/src/ArduinoJson/Variant/VariantFunctions.hpp +++ b/src/ArduinoJson/Variant/VariantFunctions.hpp @@ -65,12 +65,12 @@ inline bool variantCopyFrom(VariantData* dst, const VariantData* src, dst->setString(dup); return true; } - case VALUE_IS_OWNED_RAW: { - auto str = adaptString(src->asRaw()); + case VALUE_IS_RAW_STRING: { + auto str = adaptString(src->asRawString()); auto dup = storeString(pool, str, StringStoragePolicy::Copy()); if (!dup) return false; - dst->setOwnedRaw(dup.c_str(), str.size()); + dst->setRawString(dup.c_str(), str.size()); return true; } default: @@ -123,14 +123,14 @@ inline void variantSetString(VariantData* var, TAdaptedString value, } template -inline void variantSetOwnedRaw(VariantData* var, SerializedValue value, - MemoryPool* pool) { +inline void variantSetRawString(VariantData* var, SerializedValue value, + MemoryPool* pool) { if (!var) return; variantRelease(var, pool); const char* dup = pool->saveString(adaptString(value.data(), value.size())); if (dup) - var->setOwnedRaw(dup, value.size()); + var->setRawString(dup, value.size()); else var->setNull(); } diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp index 9bdc71ad..8a1c0de0 100644 --- a/src/ArduinoJson/Variant/VariantImpl.hpp +++ b/src/ArduinoJson/Variant/VariantImpl.hpp @@ -83,9 +83,9 @@ inline JsonString VariantData::asString() const { } } -inline JsonString VariantData::asRaw() const { +inline JsonString VariantData::asRawString() const { switch (type()) { - case VALUE_IS_OWNED_RAW: + case VALUE_IS_RAW_STRING: return JsonString(content_.asString.data, content_.asString.size, JsonString::Copied); default: