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

Replaced composition by inheritance

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-19 12:44:27 +02:00
parent 851d21e08c
commit b278d7711b
12 changed files with 92 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
JsonParser/JsonObject.h
View File

@ -14,24 +14,23 @@ namespace ArduinoJson
{
class JsonArray;
class JsonObject
class JsonObject : public JsonToken
{
public:
JsonObject(char* json, Internal::JsonToken token)
: json(json), token(token)
JsonObject()
{
}
JsonObject()
: token(Internal::JsonToken::null())
JsonObject(JsonToken token)
: JsonToken(token)
{
}
bool success()
{
return token.isObject();
return isObject();
}
JsonValue operator[](const char* key)
@ -46,12 +45,12 @@ namespace ArduinoJson
JsonObjectIterator begin()
{
return JsonObjectIterator(json, token.firstChild());
return firstChild();
}
JsonObjectIterator end()
{
return JsonObjectIterator(json, token.nextSibling());
return nextSibling();
}
DEPRECATED JsonArray getArray(const char* key);
@ -83,14 +82,11 @@ namespace ArduinoJson
static JsonObject null()
{
return JsonObject();
return JsonObject(JsonToken::null());
}
private:
char* json;
Internal::JsonToken token;
JsonValue getValue(const char* key);
};