forked from bblanchon/ArduinoJson
Rename VALUE_IS_OWNED_RAW
to VALUE_IS_RAW_STRING
This commit is contained in:
@ -97,8 +97,8 @@ TEST_CASE("JsonDocument::shrinkToFit()") {
|
|||||||
<< AllocatorLog::Reallocate(4096, 0));
|
<< AllocatorLog::Reallocate(4096, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
SECTION("owned raw") {
|
SECTION("raw string") {
|
||||||
doc.set(serialized(std::string("[{},12]")));
|
doc.set(serialized("[{},12]"));
|
||||||
|
|
||||||
doc.shrinkToFit();
|
doc.shrinkToFit();
|
||||||
|
|
||||||
|
@ -37,8 +37,8 @@ TEST_CASE("JsonVariant::memoryUsage()") {
|
|||||||
REQUIRE(var.memoryUsage() == doc.memoryUsage());
|
REQUIRE(var.memoryUsage() == doc.memoryUsage());
|
||||||
}
|
}
|
||||||
|
|
||||||
SECTION("returns size of owned raw") {
|
SECTION("returns size of raw string") {
|
||||||
var.set(serialized(std::string("hello")));
|
var.set(serialized("hello"));
|
||||||
REQUIRE(var.memoryUsage() == sizeofString(5));
|
REQUIRE(var.memoryUsage() == sizeofString(5));
|
||||||
REQUIRE(var.memoryUsage() == doc.memoryUsage());
|
REQUIRE(var.memoryUsage() == doc.memoryUsage());
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ convertToJson(const T& src, JsonVariant dst) {
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
|
struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
|
||||||
static void toJson(SerializedValue<T> src, JsonVariant dst) {
|
static void toJson(SerializedValue<T> src, JsonVariant dst) {
|
||||||
variantSetOwnedRaw(getData(dst), src, getPool(dst));
|
variantSetRawString(getData(dst), src, getPool(dst));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ enum {
|
|||||||
|
|
||||||
OWNED_VALUE_BIT = 0x01,
|
OWNED_VALUE_BIT = 0x01,
|
||||||
VALUE_IS_NULL = 0,
|
VALUE_IS_NULL = 0,
|
||||||
VALUE_IS_OWNED_RAW = 0x03,
|
VALUE_IS_RAW_STRING = 0x03,
|
||||||
VALUE_IS_LINKED_STRING = 0x04,
|
VALUE_IS_LINKED_STRING = 0x04,
|
||||||
VALUE_IS_OWNED_STRING = 0x05,
|
VALUE_IS_OWNED_STRING = 0x05,
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ class VariantData {
|
|||||||
return visitor.visitString(content_.asString.data,
|
return visitor.visitString(content_.asString.data,
|
||||||
content_.asString.size);
|
content_.asString.size);
|
||||||
|
|
||||||
case VALUE_IS_OWNED_RAW:
|
case VALUE_IS_RAW_STRING:
|
||||||
return visitor.visitRawJson(content_.asString.data,
|
return visitor.visitRawJson(content_.asString.data,
|
||||||
content_.asString.size);
|
content_.asString.size);
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ class VariantData {
|
|||||||
T asFloat() const;
|
T asFloat() const;
|
||||||
|
|
||||||
JsonString asString() const;
|
JsonString asString() const;
|
||||||
JsonString asRaw() const;
|
JsonString asRawString() const;
|
||||||
|
|
||||||
bool asBoolean() const;
|
bool asBoolean() const;
|
||||||
|
|
||||||
@ -157,8 +157,8 @@ class VariantData {
|
|||||||
content_.asFloat = value;
|
content_.asFloat = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setOwnedRaw(const char* data, size_t n) {
|
void setRawString(const char* data, size_t n) {
|
||||||
setType(VALUE_IS_OWNED_RAW);
|
setType(VALUE_IS_RAW_STRING);
|
||||||
content_.asString.data = data;
|
content_.asString.data = data;
|
||||||
content_.asString.size = n;
|
content_.asString.size = n;
|
||||||
}
|
}
|
||||||
@ -204,7 +204,7 @@ class VariantData {
|
|||||||
size_t memoryUsage() const {
|
size_t memoryUsage() const {
|
||||||
switch (type()) {
|
switch (type()) {
|
||||||
case VALUE_IS_OWNED_STRING:
|
case VALUE_IS_OWNED_STRING:
|
||||||
case VALUE_IS_OWNED_RAW:
|
case VALUE_IS_RAW_STRING:
|
||||||
return sizeofString(content_.asString.size);
|
return sizeofString(content_.asString.size);
|
||||||
case VALUE_IS_OBJECT:
|
case VALUE_IS_OBJECT:
|
||||||
case VALUE_IS_ARRAY:
|
case VALUE_IS_ARRAY:
|
||||||
|
@ -65,12 +65,12 @@ inline bool variantCopyFrom(VariantData* dst, const VariantData* src,
|
|||||||
dst->setString(dup);
|
dst->setString(dup);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case VALUE_IS_OWNED_RAW: {
|
case VALUE_IS_RAW_STRING: {
|
||||||
auto str = adaptString(src->asRaw());
|
auto str = adaptString(src->asRawString());
|
||||||
auto dup = storeString(pool, str, StringStoragePolicy::Copy());
|
auto dup = storeString(pool, str, StringStoragePolicy::Copy());
|
||||||
if (!dup)
|
if (!dup)
|
||||||
return false;
|
return false;
|
||||||
dst->setOwnedRaw(dup.c_str(), str.size());
|
dst->setRawString(dup.c_str(), str.size());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -123,14 +123,14 @@ inline void variantSetString(VariantData* var, TAdaptedString value,
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
inline void variantSetOwnedRaw(VariantData* var, SerializedValue<T> value,
|
inline void variantSetRawString(VariantData* var, SerializedValue<T> value,
|
||||||
MemoryPool* pool) {
|
MemoryPool* pool) {
|
||||||
if (!var)
|
if (!var)
|
||||||
return;
|
return;
|
||||||
variantRelease(var, pool);
|
variantRelease(var, pool);
|
||||||
const char* dup = pool->saveString(adaptString(value.data(), value.size()));
|
const char* dup = pool->saveString(adaptString(value.data(), value.size()));
|
||||||
if (dup)
|
if (dup)
|
||||||
var->setOwnedRaw(dup, value.size());
|
var->setRawString(dup, value.size());
|
||||||
else
|
else
|
||||||
var->setNull();
|
var->setNull();
|
||||||
}
|
}
|
||||||
|
@ -83,9 +83,9 @@ inline JsonString VariantData::asString() const {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline JsonString VariantData::asRaw() const {
|
inline JsonString VariantData::asRawString() const {
|
||||||
switch (type()) {
|
switch (type()) {
|
||||||
case VALUE_IS_OWNED_RAW:
|
case VALUE_IS_RAW_STRING:
|
||||||
return JsonString(content_.asString.data, content_.asString.size,
|
return JsonString(content_.asString.data, content_.asString.size,
|
||||||
JsonString::Copied);
|
JsonString::Copied);
|
||||||
default:
|
default:
|
||||||
|
Reference in New Issue
Block a user