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

!! add size comments (6858,5626)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-24 10:39:06 +01:00
parent f5cf7a8a20
commit 1ee9616f6f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -68,7 +68,7 @@ class VariantData {
case VALUE_IS_BOOLEAN: case VALUE_IS_BOOLEAN:
return visitor.visitBoolean(_content.asBoolean != 0); return visitor.visitBoolean(_content.asBoolean != 0);
case VALUE_IS_POINTER: case VALUE_IS_POINTER: // P+0 G+46
ARDUINOJSON_ASSERT(_content.asPointer != 0); ARDUINOJSON_ASSERT(_content.asPointer != 0);
return _content.asPointer->accept(visitor); return _content.asPointer->accept(visitor);
@@ -92,7 +92,7 @@ class VariantData {
} }
const CollectionData *asArray() const { const CollectionData *asArray() const {
if (isPointer()) if (isPointer()) // P+14 G+0
return _content.asPointer->asArray(); return _content.asPointer->asArray();
return const_cast<VariantData *>(this)->asArray(); return const_cast<VariantData *>(this)->asArray();
} }
@@ -102,7 +102,7 @@ class VariantData {
} }
const CollectionData *asObject() const { const CollectionData *asObject() const {
if (isPointer()) if (isPointer()) // P+20 G+0
return _content.asPointer->asObject(); return _content.asPointer->asObject();
return const_cast<VariantData *>(this)->asObject(); return const_cast<VariantData *>(this)->asObject();
} }
@@ -110,7 +110,7 @@ class VariantData {
bool copyFrom(const VariantData &src, MemoryPool *pool); bool copyFrom(const VariantData &src, MemoryPool *pool);
bool isArray() const { bool isArray() const {
if (isPointer()) if (isPointer()) // P+0 G+0
return _content.asPointer->isArray(); return _content.asPointer->isArray();
else else
return isArrayStrict(); return isArrayStrict();
@@ -134,7 +134,7 @@ class VariantData {
template <typename T> template <typename T>
bool isInteger() const { bool isInteger() const {
if (isPointer()) if (isPointer()) // P+0 G+0
return _content.asPointer->isInteger<T>(); return _content.asPointer->isInteger<T>();
switch (type()) { switch (type()) {
case VALUE_IS_UNSIGNED_INTEGER: case VALUE_IS_UNSIGNED_INTEGER:
@@ -157,7 +157,7 @@ class VariantData {
} }
bool isObject() const { bool isObject() const {
if (isPointer()) if (isPointer()) // P+0 G+0
return _content.asPointer->isObject(); return _content.asPointer->isObject();
return isObjectStrict(); return isObjectStrict();
} }
@@ -167,7 +167,7 @@ class VariantData {
} }
bool isNull() const { bool isNull() const {
if (isPointer()) if (isPointer()) // P+0 G+20
return _content.asPointer->isNull(); return _content.asPointer->isNull();
return type() == VALUE_IS_NULL; return type() == VALUE_IS_NULL;
} }
@@ -281,13 +281,13 @@ class VariantData {
} }
size_t nesting() const { size_t nesting() const {
if (isPointer()) if (isPointer()) // P+0 G+0
return _content.asPointer->nesting(); return _content.asPointer->nesting();
return isCollection() ? _content.asCollection.nesting() : 0; return isCollection() ? _content.asCollection.nesting() : 0;
} }
size_t size() const { size_t size() const {
if (isPointer()) if (isPointer()) // P+0 G+0
return _content.asPointer->size(); return _content.asPointer->size();
return isCollection() ? _content.asCollection.size() : 0; return isCollection() ? _content.asCollection.size() : 0;
} }
@@ -300,7 +300,7 @@ class VariantData {
return _content.asCollection.addElement(pool); return _content.asCollection.addElement(pool);
} }
VariantData *getElement(size_t index) const { VariantData *getElement(size_t index) const { // P+4 G+0
const CollectionData *col = asArray(); const CollectionData *col = asArray();
return col ? col->getElement(index) : 0; return col ? col->getElement(index) : 0;
} }
@@ -314,7 +314,7 @@ class VariantData {
} }
template <typename TAdaptedString> template <typename TAdaptedString>
VariantData *getMember(TAdaptedString key) const { VariantData *getMember(TAdaptedString key) const { // P+4 G+0
const CollectionData *col = asObject(); const CollectionData *col = asObject();
return col ? col->getMember(key) : 0; return col ? col->getMember(key) : 0;
} }

8
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -29,7 +29,7 @@ inline T VariantData::asIntegral() const {
return parseNumber<T>(_content.asString.data); return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT: case VALUE_IS_FLOAT:
return convertNumber<T>(_content.asFloat); return convertNumber<T>(_content.asFloat);
case VALUE_IS_POINTER: case VALUE_IS_POINTER: // P+28 G+0
return _content.asPointer->asIntegral<T>(); return _content.asPointer->asIntegral<T>();
default: default:
return 0; return 0;
@@ -47,7 +47,7 @@ inline bool VariantData::asBoolean() const {
return _content.asFloat != 0; return _content.asFloat != 0;
case VALUE_IS_NULL: case VALUE_IS_NULL:
return false; return false;
case VALUE_IS_POINTER: case VALUE_IS_POINTER: // P+0 G+0
return _content.asPointer->asBoolean(); return _content.asPointer->asBoolean();
default: default:
return true; return true;
@@ -69,7 +69,7 @@ inline T VariantData::asFloat() const {
return parseNumber<T>(_content.asString.data); return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT: case VALUE_IS_FLOAT:
return static_cast<T>(_content.asFloat); return static_cast<T>(_content.asFloat);
case VALUE_IS_POINTER: case VALUE_IS_POINTER: // P+34 G+0
return _content.asPointer->asFloat<T>(); return _content.asPointer->asFloat<T>();
default: default:
return 0; return 0;
@@ -84,7 +84,7 @@ inline String VariantData::asString() const {
case VALUE_IS_OWNED_STRING: case VALUE_IS_OWNED_STRING:
return String(_content.asString.data, _content.asString.size, return String(_content.asString.data, _content.asString.size,
String::Copied); String::Copied);
case VALUE_IS_POINTER: case VALUE_IS_POINTER: // P+16 G+0
return _content.asPointer->asString(); return _content.asPointer->asString();
default: default:
return String(); return String();