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

Added class JsonValue.

Browse Source 
Added subscript operator on JsonArray and JsonHashTable
This commit is contained in:
Benoît Blanchon
2014-07-16 13:26:11 +02:00
parent 9f07cdcabf
commit d189bd7140
10 changed files with 205 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
JsonParser/JsonArray.cpp
View File

@ -19,11 +19,11 @@ JsonArray::JsonArray(char* json, jsmntok_t* tokens)
/*
* Returns the token for the value at the specified index
*/
jsmntok_t* JsonArray::getToken(int index)
JsonValue JsonArray::operator[](int index)
{
// sanity check
if (json == 0 || tokens == 0 || index < 0 || index >= tokens[0].size)
return 0;
return JsonValue();
// skip first token, it's the whole object
jsmntok_t* currentToken = tokens + 1;
@ -35,35 +35,11 @@ jsmntok_t* JsonArray::getToken(int index)
currentToken += 1 + getNestedTokenCount(currentToken);
}
return currentToken;
return JsonValue(json, currentToken);
}
JsonArray JsonArray::getArray(int index)
{
return JsonArray(json, getToken(index));
}
bool JsonArray::getBool(int index)
JsonHashTable JsonArray::getHashTable(int index) DEPRECATED
{
return getBoolFromToken(getToken(index));
return (JsonHashTable) (*this)[index];
}
double JsonArray::getDouble(int index)
{
return getDoubleFromToken(getToken(index));
}
JsonHashTable JsonArray::getHashTable(int index)
{
return JsonHashTable(json, getToken(index));
}
long JsonArray::getLong(int index)
{
return getLongFromToken(getToken(index));
}
char* JsonArray::getString(int index)
{
return getStringFromToken(getToken(index));
}