bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-17 04:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring JsonNode...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-09 12:14:10 +02:00
parent f7fa9e9467
commit b0e12e8852
13 changed files with 250 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
srcs/JsonContainer.cpp
View File

@ -37,7 +37,9 @@ JsonNode* JsonContainer::createNode(JsonNodeType type)
{
if (!_node) return 0;
JsonBuffer* buffer = _node->content.asContainer.buffer;
JsonBuffer* buffer = _node->getContainerBuffer();
if (!buffer) return 0;
return buffer->createNode(type);
}
@ -48,31 +50,19 @@ bool JsonContainer::checkNodeType(JsonNodeType expectedType)
bool JsonContainer::operator==(const JsonContainer & other) const
{
return _node == other._node;
return _node->getContainerChild() == other._node->getContainerChild();
}
void JsonContainer::addChild(JsonNode* newChild)
void JsonContainer::addChild(JsonNode* childToAdd)
{
JsonNode* lastChild = _node->content.asContainer.child;
if (!lastChild)
{
_node->content.asContainer.child = newChild = newChild;
return;
}
while (lastChild->next)
lastChild = lastChild->next;
lastChild->next = newChild;
if (_node)
_node->addChildToContainer(childToAdd);
}
void JsonContainer::removeChildAfter(JsonNode* child, JsonNode* previous)
void JsonContainer::removeChild(JsonNode* childToRemove)
{
if (previous)
previous->next = child->next;
else
_node->content.asContainer.child = child->next;
if (_node)
_node->removeChildFromContainer(childToRemove);
}
size_t JsonContainer::size() const