Added class JsonToken

JsonParser/JsonValue.cpp

@@ -4,141 +4,57 @@
  */
 
 #include <stdlib.h> // for strtol, strtod
-#include <string.h> // for strcmp()
 #include "JsonArray.h"
 #include "JsonHashTable.h"
 #include "JsonValue.h"
 
 using namespace ArduinoJson::Parser;
+using namespace ArduinoJson::Internal;
 
 JsonValue::operator bool()
 {
-    if (tokens == 0 || tokens->type != JSMN_PRIMITIVE) return 0;
+    if (!token.isPrimitive()) return 0;
+
+    char *text = token.getText(json);
 
     // "true"
-    if (json[tokens->start] == 't') return true;
+    if (text[0] == 't') return true;
 
     // "false"
-    if (json[tokens->start] == 'f') return false;
+    if (text[0] == 'f') return false;
 
     // "null"
-    if (json[tokens->start] == 'n') return false;
+    if (text[0] == 'n') return false;
 
     // number
-    return strtol(json + tokens->start, 0, 0) != 0;
+    return strtol(text, 0, 0) != 0;
 }
 
 JsonValue::operator double()
 {
-    if (tokens == 0 || tokens->type != JSMN_PRIMITIVE) return 0;
-
-    return strtod(json + tokens->start, 0);
+    return token.isPrimitive() ? strtod(token.getText(json), 0) : 0;
 }
 
 JsonValue::operator long()
 {
-    if (tokens == 0 || tokens->type != JSMN_PRIMITIVE) return 0;
-
-    return strtol(json + tokens->start, 0, 0);
+    return token.isPrimitive() ? strtol(token.getText(json), 0, 0) : 0;
 }
 
 JsonValue::operator char*()
 {
-    if (tokens == 0 || tokens->type != JSMN_PRIMITIVE && tokens->type != JSMN_STRING)
-        return 0;
-
-    // add null terminator to the string
-    json[tokens->end] = 0;
-
-    return json + tokens->start;
+    return token.isString() || token.isPrimitive() ? token.getText(json) : 0;
 }
 
 JsonValue::operator JsonArray()
 {
-    return tokens != 0 && tokens->type == JSMN_ARRAY
-        ? JsonArray(*this)
-        : JsonArray();
+    return token.isArray()
+        ? JsonArray(json, token)
+        : JsonArray::null();
 }
 
 JsonValue::operator JsonHashTable()
 {
-    return tokens != 0 && tokens->type == JSMN_OBJECT
-        ? JsonHashTable(*this)
-        : JsonHashTable();
-}
-
-int JsonValue::size()
-{
-    return tokens != 0 && tokens->type == JSMN_ARRAY ? tokens->size : 0;
-}
-
-/*
-* Returns the token for the value associated with the specified key
-*/
-JsonValue JsonValue::operator [](const char* desiredKey)
-{
-    // sanity check
-    if (json == 0 || desiredKey == 0 || tokens->type != JSMN_OBJECT)
-        return JsonValue();
-
-    // skip first token, it's the whole object
-    jsmntok_t* currentToken = tokens + 1;
-
-    // scan each keys
-    for (int i = 0; i < tokens[0].size / 2; i++)
-    {
-        // get key token string
-        char* key = JsonValue(json, currentToken);
-
-        // compare with desired name
-        if (strcmp(desiredKey, key) == 0)
-        {
-            // return the value token that follows the key token
-            return JsonValue(json, currentToken + 1);
-        }
-
-        // move forward: key + value + nested tokens
-        currentToken += 2 + getNestedTokenCount(currentToken + 1);
-    }
-
-    // nothing found, return NULL
-    return JsonValue();
-}
-
-/*
-* Returns the token for the value at the specified index
-*/
-JsonValue JsonValue::operator[](int index)
-{
-    // sanity check
-    if (index < 0 || index >= size())
-        return JsonValue();
-
-    // skip first token, it's the whole object
-    jsmntok_t* currentToken = tokens + 1;
-
-    // skip all tokens before the specified index
-    for (int i = 0; i < index; i++)
-    {
-        // move forward: current + nested tokens
-        currentToken += 1 + getNestedTokenCount(currentToken);
-    }
-
-    return JsonValue(json, currentToken);
-}
-
-int JsonValue::getNestedTokenCount(jsmntok_t* token)
-{
-    int tokensToVisit = token->size;
-    int count = 0;
-
-    while (tokensToVisit)
-    {
-        count++;
-        token++;
-        tokensToVisit--;
-        tokensToVisit += token->size;
-    }
-
-    return count;
+    return token.isObject()
+        ? JsonHashTable(json, token)
+        : JsonHashTable::null();
 }