X-Git-Url: https://git.rmz.io/my-scheme.git/blobdiff_plain/5988ad89d4dd34b63abf5512ce3308ed86ff279d..2cd941c44d3b067acab871474383057344afcf37:/app/Main.hs

diff --git a/app/Main.hs b/app/Main.hs
index 01fd038..533d260 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -18,11 +18,20 @@ spaces :: Parser ()
 spaces = skipMany space
 
 parseString :: Parser LispVal
-parseString = do
-    char '"'
-    x <- many (noneOf "\"")
-    char '"'
-    return $ String x
+parseString = do char '"'
+                 x <- many innerChar
+                 char '"'
+                 return $ String x
+              where innerChar = noneOf ['\\', '\"'] <|> escapeChar
+                    escapeChar = do char '\\'
+                                    c <- oneOf ['\"', '\\', 'n', 'r', 't', 'f']
+                                    return $ case c of
+                                                '\"' -> '\"'
+                                                '\\' -> '\\'
+                                                'n'  -> '\n'
+                                                'r'  -> '\r'
+                                                't'  -> '\t'
+                                                'f'  -> '\f'
 
 parseAtom :: Parser LispVal
 parseAtom = do
@@ -53,3 +62,4 @@ main :: IO ()
 main = do
     args <- getLine
     putStrLn (readExpr args)
+    main