bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-21 14:32:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added JsonArray::createNestedObject()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-07 15:27:24 +02:00
parent 09b6f71853
commit f7fa9e9467
5 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
srcs/JsonArray.cpp
View File

@ -1,5 +1,6 @@
#include "JsonArray.h"
#include "JsonObject.h"
#include "JsonValue.h"
JsonValue JsonArray::operator[](int index) const
@ -49,7 +50,7 @@ void JsonArray::add(long value)
addChild(node);
}
void JsonArray::add(JsonContainer& innerContainer)
void JsonArray::add(JsonContainer innerContainer)
{
JsonNode* node = createNode(JSON_PROXY);
if (!node) return;
@ -60,13 +61,23 @@ void JsonArray::add(JsonContainer& innerContainer)
JsonArray JsonArray::createNestedArray()
{
JsonNode* node = createNode(JSON_ARRAY);
if (node)
{
node->content.asContainer.buffer = _node->content.asContainer.buffer;
addChild(node);
}
JsonNode* node = createNestedContainer(JSON_ARRAY);
return JsonArray(node);
}
JsonObject JsonArray::createNestedObject()
{
JsonNode* node = createNestedContainer(JSON_OBJECT);
return JsonObject(node);
}
JsonNode* JsonArray::createNestedContainer(JsonNodeType type)
{
JsonNode* node = createNode(type);
if (!node) return 0;
node->content.asContainer.buffer = _node->content.asContainer.buffer;
addChild(node);
return node;
}

8
srcs/JsonArray.h
View File

@ -21,8 +21,12 @@ public:
void add(double value, int decimals=2);
void add(int value) { add((long) value); }
void add(long value);
void add(JsonContainer& innerContainer);
void add(JsonContainer nestedArray);
JsonArray createNestedArray();
JsonObject createNestedObject();
private:
JsonNode* createNestedContainer(JsonNodeType type);
};

4
srcs/JsonContainer.h
View File

@ -5,9 +5,9 @@
#include "Internals/JsonNode.h"
#include "Internals/IndentedPrint.h"
struct JsonNode;
class JsonValue;
class JsonArray;
class JsonObject;
class JsonValue;
class JsonContainer : public Printable
{

4
srcs/JsonObject.h
View File

@ -2,10 +2,6 @@
#include "JsonContainer.h"
class JsonArray;
class JsonValue;
struct JsonNode;
class JsonObject : public JsonContainer
{
public: