X-Git-Url: https://git.rmz.io/my-scheme.git/blobdiff_plain/081ba0cc6439a82a508100a59d6fa5dba80609d9..369fde6e9fc7f5ddd28d83e34da21624cb4c2c7c:/app/Main.hs

diff --git a/app/Main.hs b/app/Main.hs
index 6fcf667..c71126b 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,6 +1,8 @@
 module Main where
+import Control.Monad
 import Text.ParserCombinators.Parsec hiding (spaces)
 import System.Environment
+import Numeric
 
 data LispVal = Atom String
              | List [LispVal]
@@ -8,6 +10,7 @@ data LispVal = Atom String
              | Number Integer
              | String String
              | Bool Bool
+             deriving Show
 
 symbol :: Parser Char
 symbol = oneOf "!#$%&|*+-/:<=>?@^_~"
@@ -16,11 +19,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
@@ -32,12 +44,30 @@ parseAtom = do
                 "#f" -> Bool False
                 _    -> Atom atom
 
+parseNumber :: Parser LispVal
+parseNumber = do toNum <- radix
+                 ds <- many1 digit
+                 let ((a,_):_) = toNum ds
+                 return $ Number a
+              where radix = do r <- try (char '#' >> oneOf "bodx") <|> return 'd'
+                               return $ case r of
+                                           'd' -> readDec
+                                           'x' -> readHex
+                                           'o' -> readOct
+                                           'b' -> readInt 2 (\x -> elem x "01") (read . (:[]))
+
+parseExpr :: Parser LispVal
+parseExpr = parseString
+        <|> parseNumber
+        <|> parseAtom
+
 readExpr :: String -> String
-readExpr input = case parse (spaces >> symbol) "lisp" input of
+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