Use do block again

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

diff --git a/app/Main.hs b/app/Main.hs
index 7c987cee50d96d97e445cc1b18756f845a47a24f..67ec8ddde92590ba20d677d2f92b7d59128fd58e 100644 (file)
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,4 +1,5 @@
 module Main where
+import Control.Monad
 import Text.ParserCombinators.Parsec hiding (spaces)
 import System.Environment
 
@@ -26,10 +27,24 @@ parseAtom :: Parser LispVal
 parseAtom = do
     a <- letter <|> symbol
     b <- many (letter <|> digit <|> symbol)
-    return $ Atom (a:b)
+    let atom = a:b
+    return $ case atom of
+                "#t" -> Bool True
+                "#f" -> Bool False
+                _    -> Atom atom
+
+parseNumber :: Parser LispVal
+parseNumber = do ds <- many1 digit
+                 let a = read ds
+                 return $ Number a
+
+parseExpr :: Parser LispVal
+parseExpr = parseString
+        <|> parseAtom
+        <|> parseNumber
 
 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"