Omit Obj/Arr open token from jsonTokenIsValue() test

More correct, less caller specific.
KolbyML · Nov 7, 2015 · eb6cd64 · eb6cd64
1 parent bfef9e2
commit eb6cd64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/include/univalue.h b/include/univalue.h
@@ -246,8 +246,6 @@ extern const char *uvTypeName(UniValue::VType t);
 static inline bool jsonTokenIsValue(enum jtokentype jtt)
 {
     switch (jtt) {
-    case JTOK_OBJ_OPEN:
-    case JTOK_ARR_OPEN:
     case JTOK_KW_NULL:
     case JTOK_KW_TRUE:
     case JTOK_KW_FALSE:

diff --git a/lib/univalue_read.cpp b/lib/univalue_read.cpp
@@ -271,15 +271,16 @@ bool UniValue::read(const char *raw)
             return false;
         raw += consumed;
 
-        bool isValue = jsonTokenIsValue(tok);
+        bool isValueOpen = jsonTokenIsValue(tok) ||
+            tok == JTOK_OBJ_OPEN || tok == JTOK_ARR_OPEN;
 
         if (expect(VALUE)) {
-            if (!isValue)
+            if (!isValueOpen)
                 return false;
             clearExpect(VALUE);
 
         } else if (expect(ARR_VALUE)) {
-            bool isArrValue = isValue || (tok == JTOK_ARR_CLOSE);
+            bool isArrValue = isValueOpen || (tok == JTOK_ARR_CLOSE);
             if (!isArrValue)
                 return false;