Support escaped quotes

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

diff --git a/app/Main.hs b/app/Main.hs
index 67ec8ddde92590ba20d677d2f92b7d59128fd58e..0c0d29c7a4acf3351624522b2e96080c4b4c1fc5 100644 (file)
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -9,6 +9,7 @@ data LispVal = Atom String
              | Number Integer
              | String String
              | Bool Bool
+             deriving Show
 
 symbol :: Parser Char
 symbol = oneOf "!#$%&|*+-/:<=>?@^_~"
@@ -17,11 +18,14 @@ 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 "\""
+                                    return $ '\"'
 
 parseAtom :: Parser LispVal
 parseAtom = do
@@ -46,9 +50,10 @@ parseExpr = parseString
 readExpr :: String -> String
 readExpr input = case parse parseExpr "lisp" input of
     Left err -> "No match: " ++ show err
-    Right val -> "Found value"
+    Right val -> "Found value: " ++ show val
 
 main :: IO ()
 main = do
     args <- getLine
     putStrLn (readExpr args)
+    main