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

nesting

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-11 18:39:05 +01:00
parent cf56a7de2a
commit 6a23b014dc
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extras/tests/JsonVariant/nesting.cpp
View File

@@ -28,4 +28,12 @@ TEST_CASE("JsonVariant::nesting()") {
var.to<JsonArray>(); var.to<JsonArray>();
REQUIRE(var.nesting() == 1); REQUIRE(var.nesting() == 1);
} }
SECTION("return depth of linked array") {
StaticJsonDocument<128> doc2;
doc2[0][0] = 42;
var.link(doc2);
CHECK(var.nesting() == 2);
}
} }

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

@@ -285,13 +285,15 @@ class VariantData {
} }
size_t nesting() const { size_t nesting() const {
if (isPointer())
return _content.asPointer->nesting();
return isCollection() ? _content.asCollection.nesting() : 0; return isCollection() ? _content.asCollection.nesting() : 0;
} }
size_t size() const { size_t size() const {
return isPointer() ? _content.asPointer->size() if (isPointer())
: isCollection() ? _content.asCollection.size() return _content.asPointer->size();
: 0; return isCollection() ? _content.asCollection.size() : 0;
} }
VariantData *addElement(MemoryPool *pool) { VariantData *addElement(MemoryPool *pool) {