diff options
| author |  Adam Chlipala <adamc@csail.mit.edu> | 2018-04-15 14:46:29 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-15 14:46:29 -0400 |
| commit | e1ae0ce918c234cbb0b5a6ee72e0443bd04d4127 (patch) | |
| tree | df350f2ffd18c9848e4679243de395ae42d2b957 | |
| parent | 0cadb1a719bc515af2449ac966e545a6599aee4d (diff) | |
| parent | 2bc51bd866b52bc738f259ffe6e9fb8f6068a6b6 (diff) | |
Merge pull request #122 from majorseitan/master
Handling of JSON escape characters
| -rw-r--r-- | lib/ur/json.ur | 22 | ||||
| -rw-r--r-- | tests/jsonTest.ur | 1 |
2 files changed, 18 insertions, 5 deletions
diff --git a/lib/ur/json.ur b/lib/ur/json.ur index 9288a6dd..1e3e3f39 100644 --- a/lib/ur/json.ur +++ b/lib/ur/json.ur @@ -46,10 +46,14 @@ fun escape s = let val ch = String.sub s 0 in - (if ch = #"\"" || ch = #"\\" then - "\\" ^ String.str ch - else - String.str ch) ^ esc (String.suffix s 1) + (case ch of + #"\n" => "\\n" + | #"\r" => "\\r" + | #"\t" => "\\t" + | #"\"" => "\\\"" + | #"\'" => "\\\'" + | x => String.str ch + ) ^ esc (String.suffix s 1) end in "\"" ^ esc s @@ -90,7 +94,15 @@ fun unescape s = if i+1 >= len then error <xml>JSON unescape: Bad escape sequence: {[s]}</xml> else - String.str (String.sub s (i+1)) ^ unesc (i+2) + (case String.sub s (i+1) of + #"n" => "\n" + | #"r" => "\r" + | #"t" => "\t" + | #"\"" => "\"" + | #"\'" => "\'" + | x => error <xml>JSON unescape: Bad escape char: {[x]}</xml>) + ^ + unesc (i+2) | _ => String.str ch ^ unesc (i+1) end in diff --git a/tests/jsonTest.ur b/tests/jsonTest.ur index 97898de8..1be6e7b5 100644 --- a/tests/jsonTest.ur +++ b/tests/jsonTest.ur @@ -1,6 +1,7 @@ open Json fun main () : transaction page = return <xml><body> + <pre>{[ fromJson "\"line 1\\nline 2\"" : string ]}</pre><br/> {[fromJson "[1, 2, 3]" : list int]}<br/> {[toJson ("hi" :: "bye\"" :: "hehe" :: [])]} </body></xml> |