Parse expressions (string, atom or number)

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

diff --git a/app/Main.hs b/app/Main.hs
index 6fcf6675f175374d22b749097dc06142312b8400..58017c55305aa90095ba786e78ed009df4209040 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
 
@@ -32,8 +33,16 @@ parseAtom = do
                 "#f" -> Bool False
                 _    -> Atom atom
 
+parseNumber :: Parser LispVal
+parseNumber = liftM (Number . read) $ many1 digit
+
+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"