bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-18 04:52:22 +02:00
Code Issues Packages Projects Releases Wiki 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; using namespace ArduinoJson::Parser;
JsonToken JsonParserBase::parseToken(char* json) JsonValue JsonParserBase::parse(char* json)
{ {
jsmn_parser parser; jsmn_parser parser;
jsmn_init(&parser); jsmn_init(&parser);

11
JsonParser/JsonParserBase.h
View File

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