Fix unescaping strings for racket, elixir and io

jmckitrick · Sep 28, 2017 · 1b17329 · 1b17329
1 parent 0794206
commit 1b17329
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/elixir/lib/mal/reader.ex b/elixir/lib/mal/reader.ex
@@ -85,10 +85,8 @@ defmodule Mal.Reader do
     cond do
       String.starts_with?(token, "\"") and String.ends_with?(token, "\"") ->
         token
-          |> String.slice(1..-2)
-          |> String.replace("\\\"", "\"")
-          |> String.replace("\\n", "\n")
-          |> String.replace("\\\\", "\\")
+          |> Code.string_to_quoted
+          |> elem(1)
 
       integer?(token) ->
         Integer.parse(token)

diff --git a/io/MalReader.io b/io/MalReader.io
@@ -28,7 +28,8 @@ MalReader := Object clone do (
     numberRegex := Regex with("^-?[0-9]+$")
 
     read_string := method(token,
-        token exSlice(1, -1) replaceSeq("\\\"", "\"") replaceSeq("\\n", "\n") replaceSeq("\\\\", "\\")
+        placeholder := 127 asCharacter
+        token exSlice(1, -1) replaceSeq("\\\\", placeholder) replaceSeq("\\\"", "\"") replaceSeq("\\n", "\n") replaceSeq(placeholder, "\\")
     )
 
     read_atom := method(rdr,

diff --git a/racket/reader.rkt b/racket/reader.rkt
@@ -32,13 +32,7 @@
           [(regexp-match #px"^-?[0-9][0-9.]*$" token)
            (string->number token)]
           [(regexp-match #px"^\".*\"$" token)
-           (string-replace
-             (string-replace
-               (string-replace
-                 (substring token 1 (- (string-length token) 1))
-                 "\\\"" "\"")
-               "\\n" "\n")
-             "\\\\" "\\")]
+           (with-input-from-string token read)]
           [(regexp-match #px"^:" token) (_keyword (substring token 1))]
           [(equal? "nil" token) nil]
           [(equal? "true" token) #t]