Support escaped quotes

[my-scheme.git] / app / Main.hs

diff --git a/app/Main.hs b/app/Main.hs
index 01fd038650e2e9277b72b919ba357b7acffefd19..0c0d29c7a4acf3351624522b2e96080c4b4c1fc5 100644 (file)
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -18,11 +18,14 @@ spaces :: Parser ()
 spaces = skipMany space
 
 parseString :: Parser LispVal
 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 "\""
+                                    return $ '\"'

 
 parseAtom :: Parser LispVal
 parseAtom = do
 
 parseAtom :: Parser LispVal
 parseAtom = do


@@ -53,3 +56,4 @@ main :: IO ()
 main = do
     args <- getLine
     putStrLn (readExpr args)
 main = do
     args <- getLine
     putStrLn (readExpr args)

+    main