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

29
JsonParser/JsonToken.h
View File

@ -9,29 +9,37 @@
namespace ArduinoJson
{
namespace Internal
namespace Parser
{
class JsonToken
{
public:
JsonToken(jsmntok_t* token)
:token(token)
JsonToken()
: token(0)
{
}
char* getText(char* json)
JsonToken(char* json, jsmntok_t* token)
: json(json), token(token)
{
}
char* getText()
{
json[token->end] = 0;
return json + token->start;
}
// TODO: should be protected
JsonToken firstChild() const
{
return token + 1;
return JsonToken(json, token + 1);
}
// TODO: should be protected
JsonToken nextSibling() const;
bool operator!= (const JsonToken& other)
@ -39,11 +47,13 @@ namespace ArduinoJson
return token != other.token;
}
int size()
static JsonToken null()
{
return token->size;
return JsonToken(0, 0);
}
protected:
bool isValid()
{
return token != 0;
@ -69,12 +79,13 @@ namespace ArduinoJson
return token != 0 && token->type == JSMN_STRING;
}
static JsonToken null()
int size()
{
return 0;
return token->size;
}
private:
char* json;
jsmntok_t* token;
};
}