Make the "lldb/Utility/JSON.h" able to parse JSON into tokens with the new JSONParser class.

Change over existing code to use this new parser so StructuredData can use the tokenizer to parse JSON instead of doing it manually.

This allowed us to easily parse JSON into JSON* objects as well as into StructuredData.

llvm-svn: 241522

1 files changed, 83 insertions, 59 deletions

diff --git a/lldb/source/Host/common/StringConvert.cpp b/lldb/source/Host/common/StringConvert.cpp
index 0a8e75f4b87..c4ff67515d4 100644
--- a/lldb/source/Host/common/StringConvert.cpp
+++ b/lldb/source/Host/common/StringConvert.cpp
@@ -15,79 +15,103 @@
 // Project includes
 #include "lldb/Host/StringConvert.h"
 
-namespace lldb_private {
-
-namespace StringConvert {
-
-int32_t
-ToSInt32 (const char *s, int32_t fail_value, int base, bool *success_ptr)
+namespace lldb_private
 {
-    if (s && s[0])
+    namespace StringConvert
     {
-        char *end = nullptr;
-        const long sval = ::strtol (s, &end, base);
-        if (*end == '\0')
+
+        int32_t
+        ToSInt32 (const char *s, int32_t fail_value, int base, bool *success_ptr)
         {
+            if (s && s[0])
+            {
+                char *end = nullptr;
+                const long sval = ::strtol (s, &end, base);
+                if (*end == '\0')
+                {
+                    if (success_ptr)
+                        *success_ptr = ((sval <= INT32_MAX) && (sval >= INT32_MIN));
+                    return (int32_t)sval; // All characters were used, return the result
+                }
+            }
             if (success_ptr)
-                *success_ptr = ((sval <= INT32_MAX) && (sval >= INT32_MIN));
-            return (int32_t)sval; // All characters were used, return the result
+                *success_ptr = false;
+            return fail_value;
         }
-    }
-    if (success_ptr) *success_ptr = false;
-    return fail_value;
-}
 
-uint32_t
-ToUInt32 (const char *s, uint32_t fail_value, int base, bool *success_ptr)
-{
-    if (s && s[0])
-    {
-        char *end = nullptr;
-        const unsigned long uval = ::strtoul (s, &end, base);
-        if (*end == '\0')
+        uint32_t
+        ToUInt32 (const char *s, uint32_t fail_value, int base, bool *success_ptr)
         {
+            if (s && s[0])
+            {
+                char *end = nullptr;
+                const unsigned long uval = ::strtoul (s, &end, base);
+                if (*end == '\0')
+                {
+                    if (success_ptr)
+                        *success_ptr = (uval <= UINT32_MAX);
+                    return (uint32_t)uval; // All characters were used, return the result
+                }
+            }
             if (success_ptr)
-                *success_ptr = (uval <= UINT32_MAX);
-            return (uint32_t)uval; // All characters were used, return the result
+                *success_ptr = false;
+            return fail_value;
         }
-    }
-    if (success_ptr) *success_ptr = false;
-    return fail_value;
-}
 
-int64_t
-ToSInt64 (const char *s, int64_t fail_value, int base, bool *success_ptr)
-{
-    if (s && s[0])
-    {
-        char *end = nullptr;
-        int64_t uval = ::strtoll (s, &end, base);
-        if (*end == '\0')
+        int64_t
+        ToSInt64 (const char *s, int64_t fail_value, int base, bool *success_ptr)
         {
-            if (success_ptr) *success_ptr = true;
-            return uval; // All characters were used, return the result
+            if (s && s[0])
+            {
+                char *end = nullptr;
+                int64_t uval = ::strtoll (s, &end, base);
+                if (*end == '\0')
+                {
+                    if (success_ptr)
+                        *success_ptr = true;
+                    return uval; // All characters were used, return the result
+                }
+            }
+            if (success_ptr)
+                *success_ptr = false;
+            return fail_value;
         }
-    }
-    if (success_ptr) *success_ptr = false;
-    return fail_value;
-}
 
-uint64_t
-ToUInt64 (const char *s, uint64_t fail_value, int base, bool *success_ptr)
-{
-    if (s && s[0])
-    {
-        char *end = nullptr;
-        uint64_t uval = ::strtoull (s, &end, base);
-        if (*end == '\0')
+        uint64_t
+        ToUInt64 (const char *s, uint64_t fail_value, int base, bool *success_ptr)
         {
-            if (success_ptr) *success_ptr = true;
-            return uval; // All characters were used, return the result
+            if (s && s[0])
+            {
+                char *end = nullptr;
+                uint64_t uval = ::strtoull (s, &end, base);
+                if (*end == '\0')
+                {
+                    if (success_ptr)
+                        *success_ptr = true;
+                    return uval; // All characters were used, return the result
+                }
+            }
+            if (success_ptr) *success_ptr = false;
+            return fail_value;
         }
-    }
-    if (success_ptr) *success_ptr = false;
-    return fail_value;
-}
 
-}
+        double
+        ToDouble (const char *s, double fail_value, bool *success_ptr)
+        {
+            if (s && s[0])
+            {
+                char *end = nullptr;
+                double val = strtod (s, &end);
+                if (*end == '\0')
+                {
+                    if (success_ptr)
+                        *success_ptr = true;
+                    return val; // All characters were used, return the result
+                }
+            }
+            if (success_ptr)
+                *success_ptr = false;
+            return fail_value;
+        }
+    }
 }