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

Reduced sze by 26 bytes by inlining getOrCreateNodeAt()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-08 21:29:17 +01:00
parent 05db56760f
commit 36ee4876c6
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/ArduinoJson/JsonObject.hpp
View File

@ -99,10 +99,6 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
// Returns the list node that matches the specified key. // Returns the list node that matches the specified key.
node_type *getNodeAt(key_type key) const; node_type *getNodeAt(key_type key) const;
// Returns the list node that matches the specified key, creating it if
// needed.
node_type *getOrCreateNodeAt(key_type key);
// The instance returned by JsonObject::invalid() // The instance returned by JsonObject::invalid()
static JsonObject _invalid; static JsonObject _invalid;
}; };

24
src/JsonObject.cpp
View File

@ -29,8 +29,16 @@ const JsonVariant &JsonObject::at(const char *key) const {
} }
JsonVariant &JsonObject::operator[](const char *key) { JsonVariant &JsonObject::operator[](const char *key) {
node_type *node = getOrCreateNodeAt(key); node_type *existingNode = getNodeAt(key);
return node ? node->content.value : JsonVariant::invalid(); if (existingNode) return existingNode->content.value;
node_type *newNode = createNode();
if (!newNode) return JsonVariant::invalid();
newNode->content.key = key;
addNode(newNode);
return newNode->content.value;
} }
void JsonObject::remove(char const *key) { removeNode(getNodeAt(key)); } void JsonObject::remove(char const *key) { removeNode(getNodeAt(key)); }
@ -56,18 +64,6 @@ JsonObject::node_type *JsonObject::getNodeAt(const char *key) const {
return NULL; return NULL;
} }
JsonObject::node_type *JsonObject::getOrCreateNodeAt(const char *key) {
node_type *existingNode = getNodeAt(key);
if (existingNode) return existingNode;
node_type *newNode = createNode();
if (!newNode) return NULL;
newNode->content.key = key;
addNode(newNode);
return newNode;
}
void JsonObject::writeTo(JsonWriter &writer) const { void JsonObject::writeTo(JsonWriter &writer) const {
node_type *node = _firstNode; node_type *node = _firstNode;