X-Git-Url: https://git.rmz.io/my-scheme.git/blobdiff_plain/7495ece1a44cd1a8cccae2bdbc61fa6873f106d2..68bf6f9829f136bb6d1f9c87fc78547f0c290e5c:/app/Main.hs

diff --git a/app/Main.hs b/app/Main.hs
index 6daf522..67ec8dd 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -34,10 +34,17 @@ parseAtom = do
                 _    -> Atom atom
 
 parseNumber :: Parser LispVal
-parseNumber = liftM (Number . read) $ many1 digit
+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"