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

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

9
JsonParser/JsonArray.cpp
View File

@ -7,7 +7,6 @@
#include "JsonObject.h"
using namespace ArduinoJson::Parser;
using namespace ArduinoJson::Internal;
DEPRECATED JsonObject JsonArray::getHashTable(int index)
{
@ -17,14 +16,14 @@ DEPRECATED JsonObject JsonArray::getHashTable(int index)
/*
* Returns the token for the value at the specified index
*/
JsonValue JsonArray::operator[](int index)
JsonValue JsonArray::getValue(int index)
{
// sanity check
if (index < 0 || !token.isArray() || index >= token.size())
if (index < 0 || !isArray() || index >= size())
return JsonValue::null();
// skip first token, it's the whole object
JsonToken runningToken = token.firstChild();
JsonToken runningToken = firstChild();
// skip all tokens before the specified index
for (int i = 0; i < index; i++)
@ -33,5 +32,5 @@ JsonValue JsonArray::operator[](int index)
runningToken = runningToken.nextSibling();
}
return JsonValue(json, runningToken);
return runningToken;
}