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

JsonArray is now a simple wrapper on top of JsonValue

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-17 13:12:12 +02:00
parent f2579397d6
commit 5e1697f47b
9 changed files with 93 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
JsonParser/JsonValue.h
View File

@ -6,7 +6,14 @@
#pragma once
#include "jsmn.h"
#include "JsonObjectBase.h"
#ifdef __GNUC__
#define DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER)
#define DEPRECATED __declspec(deprecated)
#else
#define DEPRECATED
#endif
namespace ArduinoJson
{
@ -15,15 +22,24 @@ namespace ArduinoJson
class JsonArray;
class JsonHashTable;
class JsonValue : public JsonObjectBase
class JsonValue
{
public:
JsonValue() {}
JsonValue(char* json, jsmntok_t* tokens)
: JsonObjectBase(json, tokens)
JsonValue()
: json(0), tokens(0)
{
}
JsonValue(char* json, jsmntok_t* tokens)
: json(json), tokens(tokens)
{
}
bool success()
{
return json != 0 && tokens != 0;
}
operator bool();
@ -33,7 +49,17 @@ namespace ArduinoJson
operator JsonArray();
operator JsonHashTable();
JsonValue operator[](const char* key);
JsonValue operator[](const char*);
JsonValue operator[](int);
int size();
private:
char* json;
jsmntok_t* tokens;
static int getNestedTokenCount(jsmntok_t* token);
};
}
}