From e4f98c318fcadff9247c83d1659a39b15e8c9d58 Mon Sep 17 00:00:00 2001
From: Simon Van Casteren <simonvancasteren@localhost.localdomain>
Date: Tue, 10 Dec 2019 22:44:51 +0100
Subject: First working version of publishDiagnostics

---
 src/json.sml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/json.sml')

diff --git a/src/json.sml b/src/json.sml
index f189cc4d..cc9ea6ae 100644
--- a/src/json.sml
+++ b/src/json.sml
@@ -114,8 +114,12 @@ struct
    and parseChars () = 
    let
       fun pickChars s =
-         if peek () = #"\"" (* " *) then s else
-            pickChars (s ^ String.str (take ()))
+          if peek () = #"\"" (* " *)
+          then s
+          else
+              if peek () = #"\\" andalso (String.sub (!inputData, 1)) = #"\""
+              then (consume "\\\""; pickChars (s ^ "\""))
+              else pickChars (s ^ String.str (take ()))
    in
       pickChars ""
    end
@@ -256,8 +260,8 @@ fun parse (str: string): json =
 fun print (ast: json): string = 
     case ast of
         Array l => "["
-                  ^ List.foldl (fn (a, acc) => acc ^ "," ^ print a) "" l
-                  ^ "]"
+                   ^ List.foldl (fn (a, acc) => acc ^ (if acc = "" then "" else ", ") ^ print a) "" l
+                   ^ "]"
       | Null => "null"
       | Float r => Real.toString r
       | String s =>
-- 
cgit v1.2.3