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

Switched to Google coding style to match cpplint expectations

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-23 23:13:13 +02:00
parent 5c8283b3e4
commit b43da1e421
47 changed files with 262 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Internals/IndentedPrint.cpp
View File

@ -3,25 +3,21 @@
using namespace ArduinoJson::Internals;
void IndentedPrint::indent() {
if (level < MAX_LEVEL)
level++;
if (level < MAX_LEVEL) level++;
}
void IndentedPrint::unindent() {
if (level > 0)
level--;
if (level > 0) level--;
}
void IndentedPrint::setTabSize(uint8_t n) {
if (n < MAX_TAB_SIZE)
tabSize = n;
if (n < MAX_TAB_SIZE) tabSize = n;
}
size_t IndentedPrint::write(uint8_t c) {
size_t n = 0;
if (isNewLine)
n += writeTabs();
if (isNewLine) n += writeTabs();
n += sink->write(c);
@ -33,8 +29,7 @@ size_t IndentedPrint::write(uint8_t c) {
inline size_t IndentedPrint::writeTabs() {
size_t n = 0;
for (int i = 0; i < level * tabSize; i++)
n += sink->write(' ');
for (int i = 0; i < level * tabSize; i++) n += sink->write(' ');
return n;
}

69
src/Internals/JsonNode.cpp
View File

@ -9,42 +9,40 @@ using namespace ArduinoJson::Internals;
void JsonNode::writeTo(JsonWriter &writer) {
switch (type) {
case JSON_PROXY:
content.asProxy.target->writeTo(writer);
break;
case JSON_PROXY:
content.asProxy.target->writeTo(writer);
break;
case JSON_ARRAY:
writeArrayTo(writer);
break;
case JSON_ARRAY:
writeArrayTo(writer);
break;
case JSON_OBJECT:
writeObjectTo(writer);
break;
case JSON_OBJECT:
writeObjectTo(writer);
break;
case JSON_STRING:
writer.writeString(content.asString);
break;
case JSON_STRING:
writer.writeString(content.asString);
break;
case JSON_LONG:
writer.writeInteger(content.asInteger);
break;
case JSON_LONG:
writer.writeInteger(content.asInteger);
break;
case JSON_BOOLEAN:
writer.writeBoolean(content.asBoolean);
break;
case JSON_BOOLEAN:
writer.writeBoolean(content.asBoolean);
break;
default: // >= JSON_DOUBLE_0_DECIMALS
writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
break;
default: // >= JSON_DOUBLE_0_DECIMALS
writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
break;
}
}
void JsonNode::addChild(JsonNode *childToAdd) {
if (type == JSON_PROXY)
return content.asProxy.target->addChild(childToAdd);
if (type == JSON_PROXY) return content.asProxy.target->addChild(childToAdd);
if (type != JSON_ARRAY && type != JSON_OBJECT)
return;
if (type != JSON_ARRAY && type != JSON_OBJECT) return;
JsonNode *lastChild = content.asContainer.child;
@ -53,8 +51,7 @@ void JsonNode::addChild(JsonNode *childToAdd) {
return;
}
while (lastChild->next)
lastChild = lastChild->next;
while (lastChild->next) lastChild = lastChild->next;
lastChild->next = childToAdd;
}
@ -63,8 +60,7 @@ void JsonNode::removeChild(JsonNode *childToRemove) {
if (type == JSON_PROXY)
return content.asProxy.target->removeChild(childToRemove);
if (type != JSON_ARRAY && type != JSON_OBJECT)
return;
if (type != JSON_ARRAY && type != JSON_OBJECT) return;
if (content.asContainer.child == childToRemove) {
content.asContainer.child = childToRemove->next;
@ -73,8 +69,7 @@ void JsonNode::removeChild(JsonNode *childToRemove) {
for (JsonNode *child = content.asContainer.child; child;
child = child->next) {
if (child->next == childToRemove)
child->next = childToRemove->next;
if (child->next == childToRemove) child->next = childToRemove->next;
}
}
@ -88,8 +83,7 @@ void JsonNode::writeArrayTo(JsonWriter &writer) {
child->writeTo(writer);
child = child->next;
if (!child)
break;
if (!child) break;
writer.writeComma();
}
@ -112,8 +106,7 @@ void JsonNode::writeObjectTo(JsonWriter &writer) {
child->content.asKeyValue.value->writeTo(writer);
child = child->next;
if (!child)
break;
if (!child) break;
writer.writeComma();
}
@ -126,12 +119,10 @@ void JsonNode::writeObjectTo(JsonWriter &writer) {
void JsonNode::setAsProxyOfSelf() {
JsonBuffer *buffer = content.asContainer.buffer;
if (!buffer)
return;
if (!buffer) return;
JsonNode *newNode = buffer->createNode();
if (!newNode)
return;
if (!newNode) return;
*newNode = *this;

105
src/Internals/JsonParser.cpp
View File

@ -1,6 +1,6 @@
#include "ArduinoJson/Internals/JsonParser.hpp"
#include <stdlib.h> // for strtol, strtod
#include <stdlib.h> // for strtol, strtod
#include <ctype.h>
#include "ArduinoJson/JsonBuffer.hpp"
@ -9,14 +9,12 @@
using namespace ArduinoJson::Internals;
void JsonParser::skipSpaces() {
while (isspace(*_ptr))
_ptr++;
while (isspace(*_ptr)) _ptr++;
}
bool JsonParser::skip(char charToSkip) {
skipSpaces();
if (*_ptr != charToSkip)
return false;
if (*_ptr != charToSkip) return false;
_ptr++;
skipSpaces();
return true;
@ -26,39 +24,39 @@ JsonNode *JsonParser::parseAnything() {
skipSpaces();
switch (*_ptr) {
case '[':
return parseArray();
case '[':
return parseArray();
case 't':
case 'f':
return parseBoolean();
case 't':
case 'f':
return parseBoolean();
case '-':
case '.':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return parseNumber();
case '-':
case '.':
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return parseNumber();
case 'n':
return parseNull();
case 'n':
return parseNull();
case '{':
return parseObject();
case '{':
return parseObject();
case '\'':
case '\"':
return parseString();
case '\'':
case '\"':
return parseString();
default:
return NULL; // invalid JSON
default:
return NULL; // invalid JSON
}
}
@ -67,25 +65,20 @@ JsonNode *JsonParser::parseArray() {
skip('[');
if (isEnd())
return 0;
if (isEnd()) return 0;
if (skip(']'))
return node; // empty array
if (skip(']')) return node; // empty array
for (;;) {
JsonNode *child = parseAnything();
if (!child)
return 0; // child parsing failed
if (!child) return 0; // child parsing failed
node->addChild(child);
if (skip(']'))
return node; // end of the array
if (skip(']')) return node; // end of the array
if (!skip(','))
return 0; // comma is missing
if (!skip(',')) return 0; // comma is missing
}
}
@ -103,7 +96,7 @@ JsonNode *JsonParser::parseNumber() {
char *endOfLong;
long longValue = strtol(_ptr, &endOfLong, 10);
if (*endOfLong == '.') // stopped on a decimal separator
if (*endOfLong == '.') // stopped on a decimal separator
{
double value = strtod(_ptr, &_ptr);
int decimals = _ptr - endOfLong - 1;
@ -115,7 +108,7 @@ JsonNode *JsonParser::parseNumber() {
}
JsonNode *JsonParser::parseNull() {
_ptr += 4; // strlen("null")
_ptr += 4; // strlen("null")
return _buffer->createStringNode(0);
}
@ -125,41 +118,33 @@ JsonNode *JsonParser::parseObject() {
skip('{');
if (isEnd())
return 0; // premature ending
if (isEnd()) return 0; // premature ending
if (skip('}'))
return node; // empty object
if (skip('}')) return node; // empty object
for (;;) {
JsonNode *child = parseObjectKeyValue();
if (!child)
return 0; // child parsing failed
if (!child) return 0; // child parsing failed
node->addChild(child);
if (skip('}'))
return node; // end of the object
if (skip('}')) return node; // end of the object
if (!skip(','))
return 0; // comma is missing
if (!skip(',')) return 0; // comma is missing
}
}
JsonNode *JsonParser::parseObjectKeyValue() {
const char *key = QuotedString::extractFrom(_ptr, &_ptr);
if (!key)
return 0; // failed to extract key
if (!key) return 0; // failed to extract key
if (!skip(':'))
return 0; // colon is missing
if (!skip(':')) return 0; // colon is missing
JsonNode *value = parseAnything();
if (!value)
return 0; // value parsing failed
if (!value) return 0; // value parsing failed
return _buffer->createObjectKeyValueNode(key, value);
}

13
src/Internals/QuotedString.cpp
View File

@ -27,8 +27,7 @@ static inline size_t printCharTo(char c, Print *p) {
}
size_t QuotedString::printTo(const char *s, Print *p) {
if (!s)
return p->print("null");
if (!s) return p->print("null");
size_t n = p->write('\"');
@ -45,10 +44,8 @@ static char unescapeChar(char c) {
const char *p = "b\bf\fn\nr\rt\t";
for (;;) {
if (p[0] == 0)
return c;
if (p[0] == c)
return p[1];
if (p[0] == 0) return c;
if (p[0] == c) return p[1];
p += 2;
}
}
@ -63,9 +60,9 @@ char *QuotedString::extractFrom(char *input, char **endPtr) {
return 0;
}
char stopChar = firstChar; // closing quote is the same as opening quote
char stopChar = firstChar; // closing quote is the same as opening quote
char *startPtr = input + 1; // skip the quote
char *startPtr = input + 1; // skip the quote
char *readPtr = startPtr;
char *writePtr = startPtr;
char c;

3
src/Internals/StringBuilder.cpp
View File

@ -8,8 +8,7 @@
using namespace ArduinoJson::Internals;
size_t StringBuilder::write(uint8_t c) {
if (length >= capacity)
return 0;
if (length >= capacity) return 0;
buffer[length++] = c;
buffer[length] = 0;

21
src/JsonArray.cpp
View File

@ -7,8 +7,7 @@ using namespace ArduinoJson::Internals;
JsonValue JsonArray::operator[](int index) const {
for (JsonNodeIterator it = beginChildren(); it != endChildren(); ++it) {
if (!index)
return JsonValue(*it);
if (!index) return JsonValue(*it);
index--;
}
@ -17,8 +16,7 @@ JsonValue JsonArray::operator[](int index) const {
void JsonArray::add(bool value) {
JsonNode *node = createNode();
if (!node)
return;
if (!node) return;
node->setAsBoolean(value);
addChild(node);
@ -26,8 +24,7 @@ void JsonArray::add(bool value) {
void JsonArray::add(char const *value) {
JsonNode *node = createNode();
if (!node)
return;
if (!node) return;
node->setAsString(value);
addChild(node);
@ -35,8 +32,7 @@ void JsonArray::add(char const *value) {
void JsonArray::add(double value, int decimals) {
JsonNode *node = createNode();
if (!node)
return;
if (!node) return;
node->setAsDouble(value, decimals);
addChild(node);
@ -44,8 +40,7 @@ void JsonArray::add(double value, int decimals) {
void JsonArray::add(long value) {
JsonNode *node = createNode();
if (!node)
return;
if (!node) return;
node->setAsLong(value);
addChild(node);
@ -54,8 +49,7 @@ void JsonArray::add(long value) {
// TODO: we should have the same issue as in JsonValue
void JsonArray::add(JsonContainer nestedContainer) {
JsonNode *node = createNode();
if (!node)
return;
if (!node) return;
node->duplicate(nestedContainer._node);
addChild(node);
@ -84,8 +78,7 @@ JsonObject JsonArray::createNestedObject() {
}
JsonArrayIterator JsonArray::begin() {
if (!_node)
return end();
if (!_node) return end();
return JsonArrayIterator(_node->getContainerChild());
}

24
src/JsonBuffer.cpp
View File

@ -13,8 +13,7 @@ JsonValue JsonBuffer::createValue() { return JsonValue(createNode()); }
JsonNode *JsonBuffer::createNode() {
void *node = allocateNode();
if (!node)
return 0;
if (!node) return 0;
return new (node) JsonNode();
}
@ -37,8 +36,7 @@ JsonValue JsonBuffer::parseValue(char *json) {
JsonNode *JsonBuffer::createArrayNode() {
JsonNode *node = createNode();
if (node)
node->setAsArray(this);
if (node) node->setAsArray(this);
return node;
}
@ -46,8 +44,7 @@ JsonNode *JsonBuffer::createArrayNode() {
JsonNode *JsonBuffer::createBoolNode(bool value) {
JsonNode *node = createNode();
if (node)
node->setAsBoolean(value);
if (node) node->setAsBoolean(value);
return node;
}
@ -55,8 +52,7 @@ JsonNode *JsonBuffer::createBoolNode(bool value) {
JsonNode *JsonBuffer::createDoubleNode(double value, int decimals) {
JsonNode *node = createNode();
if (node)
node->setAsDouble(value, decimals);
if (node) node->setAsDouble(value, decimals);
return node;
}
@ -64,8 +60,7 @@ JsonNode *JsonBuffer::createDoubleNode(double value, int decimals) {
JsonNode *JsonBuffer::createLongNode(long value) {
JsonNode *node = createNode();
if (node)
node->setAsLong(value);
if (node) node->setAsLong(value);
return node;
}
@ -73,8 +68,7 @@ JsonNode *JsonBuffer::createLongNode(long value) {
JsonNode *JsonBuffer::createObjectNode() {
JsonNode *node = createNode();
if (node)
node->setAsObject(this);
if (node) node->setAsObject(this);
return node;
}
@ -83,8 +77,7 @@ Internals::JsonNode *JsonBuffer::createObjectKeyValueNode(const char *key,
JsonNode *value) {
JsonNode *node = createNode();
if (node)
node->setAsObjectKeyValue(key, value);
if (node) node->setAsObjectKeyValue(key, value);
return node;
}
@ -92,8 +85,7 @@ Internals::JsonNode *JsonBuffer::createObjectKeyValueNode(const char *key,
JsonNode *JsonBuffer::createStringNode(const char *value) {
JsonNode *node = createNode();
if (node)
node->setAsString(value);
if (node) node->setAsString(value);
return node;
}

18
src/JsonContainer.cpp
View File

@ -36,32 +36,26 @@ size_t JsonContainer::prettyPrintTo(Print &print) const {
}
JsonNode *JsonContainer::createNode() {
if (!_node)
return 0;
if (!_node) return 0;
JsonBuffer *buffer = _node->getContainerBuffer();
if (!buffer)
return 0;
if (!buffer) return 0;
return buffer->createNode();
}
bool JsonContainer::operator==(const JsonContainer &other) const {
if (_node == other._node)
return true;
if (!_node || !other._node)
return false;
if (_node == other._node) return true;
if (!_node || !other._node) return false;
return _node->getProxyTarget() == other._node->getProxyTarget();
}
void JsonContainer::addChild(JsonNode *childToAdd) {
if (_node)
_node->addChild(childToAdd);
if (_node) _node->addChild(childToAdd);
}
void JsonContainer::removeChild(JsonNode *childToRemove) {
if (_node)
_node->removeChild(childToRemove);
if (_node) _node->removeChild(childToRemove);
}
size_t JsonContainer::size() const {

17
src/JsonObject.cpp
View File

@ -1,6 +1,6 @@
#include "ArduinoJson/JsonObject.hpp"
#include <string.h> // for strcmp
#include <string.h> // for strcmp
#include "ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonValue.hpp"
@ -28,8 +28,7 @@ void JsonObject::remove(char const *key) {
JsonArray JsonObject::createNestedArray(char const *key) {
JsonNode *node = getOrCreateNodeAt(key);
if (node)
node->setAsArray(_node->getContainerBuffer());
if (node) node->setAsArray(_node->getContainerBuffer());
return JsonArray(node);
}
@ -37,8 +36,7 @@ JsonArray JsonObject::createNestedArray(char const *key) {
JsonObject JsonObject::createNestedObject(char const *key) {
JsonNode *node = getOrCreateNodeAt(key);
if (node)
node->setAsObject(_node->getContainerBuffer());
if (node) node->setAsObject(_node->getContainerBuffer());
return JsonObject(node);
}
@ -47,17 +45,14 @@ JsonNode *JsonObject::getOrCreateNodeAt(const char *key) {
for (JsonNodeIterator it = beginChildren(); it != endChildren(); ++it) {
const char *childKey = it->getAsObjectKey();
if (!strcmp(childKey, key))
return it->getAsObjectValue();
if (!strcmp(childKey, key)) return it->getAsObjectValue();
}
JsonNode *newValueNode = createNode();
if (!newValueNode)
return 0;
if (!newValueNode) return 0;
JsonNode *newKeyNode = createNode();
if (!newKeyNode)
return 0;
if (!newKeyNode) return 0;
newKeyNode->setAsObjectKeyValue(key, newValueNode);

12
src/JsonValue.cpp
View File

@ -7,23 +7,19 @@
using namespace ArduinoJson;
void JsonValue::operator=(bool value) {
if (_node)
_node->setAsBoolean(value);
if (_node) _node->setAsBoolean(value);
}
void JsonValue::operator=(char const *value) {
if (_node)
_node->setAsString(value);
if (_node) _node->setAsString(value);
}
void JsonValue::set(double value, int decimals) {
if (_node)
_node->setAsDouble(value, decimals);
if (_node) _node->setAsDouble(value, decimals);
}
void JsonValue::operator=(int value) {
if (_node)
_node->setAsLong(value);
if (_node) _node->setAsLong(value);
}
JsonValue::operator bool() const {