Parse Numbers

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

diff --git a/app/Main.hs b/app/Main.hs
index 7c987cee50d96d97e445cc1b18756f845a47a24f..6daf522b2c86598881760fa72c242009d8516092 100644 (file)
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,4 +1,5 @@
 module Main where
 module Main where

+import Control.Monad

 import Text.ParserCombinators.Parsec hiding (spaces)
 import System.Environment
 
 import Text.ParserCombinators.Parsec hiding (spaces)
 import System.Environment
 


@@ -26,7 +27,14 @@ parseAtom :: Parser LispVal
 parseAtom = do
     a <- letter <|> symbol
     b <- many (letter <|> digit <|> symbol)
 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 = liftM (Number . read) $ many1 digit

 
 readExpr :: String -> String
 readExpr input = case parse (spaces >> symbol) "lisp" input of
 
 readExpr :: String -> String
 readExpr input = case parse (spaces >> symbol) "lisp" input of