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

Extracting a common base class for JsonArray and JsonObject...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-05 11:53:08 +01:00
parent 0fb4fa8f86
commit a9f4f611d4
7 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Internals/List.cpp
View File

@ -21,11 +21,33 @@ int List<T>::size() const {
}
template <typename T>
Node<T> *List<T>::createNode() {
typename List<T>::node_type *List<T>::createNode() {
if (!_buffer) return NULL;
void *ptr = _buffer->alloc(sizeof(node_type));
return ptr ? new (ptr) node_type() : NULL;
}
template <typename T>
void List<T>::addNode(node_type *nodeToAdd) {
if (_firstNode) {
node_type *lastNode = _firstNode;
while (lastNode->next) lastNode = lastNode->next;
lastNode->next = nodeToAdd;
} else {
_firstNode = nodeToAdd;
}
}
template <typename T>
void List<T>::removeNode(node_type *nodeToRemove) {
if (!nodeToRemove) return;
if (nodeToRemove == _firstNode) {
_firstNode = nodeToRemove->next;
} else {
for (node_type *node = _firstNode; node; node = node->next)
if (node->next == nodeToRemove) node->next = nodeToRemove->next;
}
}
template class List<JsonPair>;
template class List<JsonVariant>;

10
src/JsonArray.cpp
View File

@ -30,16 +30,6 @@ JsonVariant &JsonArray::add() {
return node->content;
}
void JsonArray::addNode(node_type *newNode) {
if (_firstNode) {
node_type *lastNode = _firstNode;
while (lastNode->next) lastNode = lastNode->next;
lastNode->next = newNode;
} else {
_firstNode = newNode;
}
}
JsonArray &JsonArray::createNestedArray() {
if (!_buffer) return JsonArray::invalid();
JsonArray &array = _buffer->createArray();

20
src/JsonObject.cpp
View File

@ -69,26 +69,6 @@ JsonObject::node_type *JsonObject::getOrCreateNodeAt(const char *key) {
return newNode;
}
void JsonObject::addNode(node_type *nodeToAdd) {
if (!_firstNode) {
_firstNode = nodeToAdd;
} else {
node_type *lastNode = _firstNode;
while (lastNode->next) lastNode = lastNode->next;
lastNode->next = nodeToAdd;
}
}
void JsonObject::removeNode(node_type *nodeToRemove) {
if (!nodeToRemove) return;
if (nodeToRemove == _firstNode) {
_firstNode = nodeToRemove->next;
} else {
for (node_type *node = _firstNode; node; node = node->next)
if (node->next == nodeToRemove) node->next = nodeToRemove->next;
}
}
template <typename T>
void JsonObject::writeTo(T &writer) const {
node_type *node = _firstNode;