Epic refactoring in progress...

This commit is contained in:
Benoit Blanchon
2014-10-27 13:34:54 +01:00
parent e0980292ef
commit 8988cb4761
19 changed files with 343 additions and 341 deletions

View File

@ -6,92 +6,12 @@
#include "ArduinoJson/JsonBuffer.hpp"
#include <new>
#include "ArduinoJson/Internals/JsonValueInternal.hpp"
#include "ArduinoJson/Internals/JsonParser.hpp"
#include "ArduinoJson/Internals/JsonNode.hpp"
using namespace ArduinoJson;
using namespace ArduinoJson::Internals;
JsonValue JsonBuffer::createValue() { return JsonValueInternal(createNode()); }
JsonNode *JsonBuffer::createNode() {
void *node = allocateNode();
if (!node) return 0;
return new (node) JsonNode();
}
JsonArray JsonBuffer::parseArray(char *json) {
JsonParser parser(this, json);
return JsonArray(parser.parseAnything());
}
JsonObject JsonBuffer::parseObject(char *json) {
JsonParser parser(this, json);
return JsonObject(parser.parseAnything());
}
JsonValue JsonBuffer::parseValue(char *json) {
JsonParser parser(this, json);
return JsonValueInternal(parser.parseAnything());
}
JsonNode *JsonBuffer::createArrayNode() {
JsonNode *node = createNode();
if (node) node->setAsArray(this);
return node;
}
JsonNode *JsonBuffer::createBoolNode(bool value) {
JsonNode *node = createNode();
if (node) node->setAsBoolean(value);
return node;
}
JsonNode *JsonBuffer::createDoubleNode(double value, int decimals) {
JsonNode *node = createNode();
if (node) node->setAsDouble(value, decimals);
return node;
}
JsonNode *JsonBuffer::createLongNode(long value) {
JsonNode *node = createNode();
if (node) node->setAsLong(value);
return node;
}
JsonNode *JsonBuffer::createObjectNode() {
JsonNode *node = createNode();
if (node) node->setAsObject(this);
return node;
}
Internals::JsonNode *JsonBuffer::createObjectKeyValueNode(const char *key,
JsonNode *value) {
JsonNode *node = createNode();
if (node) node->setAsObjectKeyValue(key, value);
return node;
}
JsonNode *JsonBuffer::createStringNode(const char *value) {
JsonNode *node = createNode();
if (node) node->setAsString(value);
return node;
// TODO: what happens if alloc returns NULL
void* operator new(size_t size, ArduinoJson::JsonBuffer* buffer) {
return _buffer->alloc(size);
}