json: object refactor

src/Parser/JSON.md

@@ -121,8 +121,7 @@ Top level json value parser
 export 
 value : Parser (t : JSONType ** JSONValue t)
 value = do 
-  _ <- many whitespace
+  surround whitespace $ oneOfE 
-  val <- oneOfE 
     (throwParseError "Expected JSON Value") 
     (the (List _) 
       [
@@ -133,8 +132,6 @@ value = do
       , dpairize bool
       , dpairize null
       ])
-  _ <- many whitespace
-  pure val
 ```
 
 Now go through our json value types
@@ -147,29 +144,27 @@ object = do
   where
     emptyObject : Parser (JSONValue TObject)
     emptyObject = do
-      _ <- parseExactChar '{'
+      delimited '{' '}' (nom whitespace)
-      _ <- many whitespace
-      _ <- parseExactChar '}'
       pure $ VObject Nil
-    firstKeyValue : Parser (t : JSONType ** (String, JSONValue t))
+    keyValue : Parser (t : JSONType ** (String, JSONValue t))
-    firstKeyValue = do
+    keyValue = do
-      _ <- many whitespace
+      VString key <- surround whitespace string
-      VString key <- string
-      _ <- many whitespace
       _ <- parseExactChar ':'
       (typ ** val) <- value
       pure (typ ** (key, val))
     restKeyValue : Parser (t : JSONType ** (String, JSONValue t))
     restKeyValue = do
       _ <- parseExactChar ','
-      firstKeyValue
+      keyValue
+    pairs : Parser (List1 (t : JSONType ** (String, JSONValue t)))
+    pairs = do
+      first <- keyValue
+      rest <- many restKeyValue
+      pure $ first ::: rest
     occupiedObject : Parser (JSONValue TObject)
     occupiedObject = do
-      _ <- parseExactChar '{'
+      val <- delimited '{' '}' pairs
-      first <- firstKeyValue
+      let (types ** xs) = DList.fromList (forget val)
-      rest <- many restKeyValue
-      _ <- parseExactChar '}'
-      let (types ** xs) = DList.fromList (first :: rest)
       pure $ VObject xs
 ```
 
@@ -237,3 +232,23 @@ null = do
   _ <- exactString "null"
   pure VNull
 ```
+
+## Unit tests
+
+Quick smoke test
+
+```idris
+-- @@test JSON Quick Smoke
+quickSmoke : IO Bool
+quickSmoke = do
+  let input = "{\"string\":\"string\",\"number\":5,\"true\":true,\"false\":false,\"null\":null,\"array\":[1,2,3]}"
+  putStrLn input
+  Right parsed <- runFirstIO object input
+    | Left err => do
+      printLn err
+      pure False
+  putStrLn "Input: \{input}\nOutput: \{show parsed}"
+  case parsed of
+    VObject xs => ?quickSmoke_rhs_0
+    _ => pure False
+```