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

Cleaned parseObject()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-07 09:20:48 +01:00
parent a7b78fadb0
commit 5179aa0d4f
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Internals/JsonParser.cpp
View File

@ -138,30 +138,37 @@ void JsonParser::parseNullTo(JsonVariant &destination) {
} }
JsonObject &JsonParser::parseObject() { JsonObject &JsonParser::parseObject() {
if (!skip('{')) return JsonObject::invalid(); // missing opening brace
if (isEnd()) return JsonObject::invalid(); // premature ending
JsonObject &object = _buffer->createObject(); JsonObject &object = _buffer->createObject();
if (skip('}')) return object; // empty object if (!skip('{')) goto ERROR_MISSING_OPENING_BRACE;
if (skip('}')) goto SUCCESS_EMPTY_OBJECT;
// Read each key value pair
for (;;) { for (;;) {
// 1 - Parse key
const char *key = parseString(); const char *key = parseString();
if (!key) break; // key parsing failed if (!key) goto ERROR_INVALID_KEY;
if (!skip(':')) goto ERROR_MISSING_COLON;
if (!skip(':')) break; // colon is missing
// 2 - Parse value
JsonVariant &value = object.add(key); JsonVariant &value = object.add(key);
parseAnythingTo(value); parseAnythingTo(value);
if (!value.success()) break; // value parsing failed if (!value.success()) goto ERROR_INVALID_VALUE;
if (skip('}')) return object; // end of the object // 3 - More elements?
if (skip('}')) goto SUCCESS_NON_EMPTY_OBJECT;
if (!skip(',')) break; // comma is missing if (!skip(',')) goto ERROR_MISSING_COMMA;
} }
SUCCESS_EMPTY_OBJECT:
SUCCESS_NON_EMPTY_OBJECT:
return object;
ERROR_INVALID_KEY:
ERROR_INVALID_VALUE:
ERROR_MISSING_COLON:
ERROR_MISSING_COMMA:
ERROR_MISSING_OPENING_BRACE:
return JsonObject::invalid(); return JsonObject::invalid();
} }