feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Huge refactoring in progress...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-30 14:03:33 +01:00
parent c3001e9ea9
commit 4c204840e9
25 changed files with 108 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/JsonArray.cpp
View File

@ -6,6 +6,8 @@
#include "ArduinoJson/JsonArray.hpp"
#include <new> // required for placement new
#include "ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/JsonWriter.hpp"
@ -13,20 +15,22 @@
using namespace ArduinoJson;
using namespace ArduinoJson::Internals;
JsonArray JsonArray::_invalid(NULL);
int JsonArray::size() const {
int nodeCount = 0;
for (JsonArrayNode *node = _firstNode; node; node = node->next) nodeCount++;
return nodeCount;
}
JsonValue &JsonArray::operator[](int index) const {
JsonValue &JsonArray::at(int index) const {
JsonArrayNode *node = _firstNode;
while (node && index--) node = node->next;
return node ? node->value : JsonValue::invalid();
}
JsonValue &JsonArray::add() {
JsonArrayNode *node = JsonArrayNode::createFrom(_buffer);
JsonArrayNode *node = createNode();
if (!node) return JsonValue::invalid();
addNode(node);
@ -34,6 +38,12 @@ JsonValue &JsonArray::add() {
return node->value;
}
JsonArrayNode *JsonArray::createNode() {
if (_buffer) return NULL;
void *ptr = _buffer->alloc(sizeof(JsonArrayNode));
return ptr ? new (ptr) JsonArrayNode() : NULL;
}
void JsonArray::addNode(JsonArrayNode *newNode) {
if (_firstNode) {
JsonArrayNode *lastNode = _firstNode;