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

Merged parse() and parseToken()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-19 15:36:01 +02:00
parent a1e8c8800a
commit 1e28217393
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonParser/JsonParserBase.cpp
View File

@ -8,7 +8,7 @@
using namespace ArduinoJson::Parser;
JsonToken JsonParserBase::parseToken(char* json)
JsonValue JsonParserBase::parse(char* json)
{
jsmn_parser parser;
jsmn_init(&parser);

11
JsonParser/JsonParserBase.h
View File

@ -21,10 +21,7 @@ namespace ArduinoJson
{
}
JsonValue parse(char* json)
{
return parseToken(json);
}
JsonValue parse(char* json);
/*
* Parse the JSON string and return a array.
@ -34,7 +31,7 @@ namespace ArduinoJson
*/
DEPRECATED JsonArray parseArray(char* json)
{
return parseToken(json);
return parse(json);
}
/*
@ -45,14 +42,12 @@ namespace ArduinoJson
*/
DEPRECATED JsonObject parseHashTable(char* json)
{
return parseToken(json);
return parse(json);
}
private:
jsmntok_t* tokens;
int maxTokens;
JsonToken parseToken(char* json);
};
}
}