Tail recursing main function

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

diff --git a/app/Main.hs b/app/Main.hs
index 88ae7f7ff2ff0b439dcb452d24c2be9a66e55e41..233fa6c9e85a81dfb98934e6624baa1391a14489 100644 (file)
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -9,6 +9,7 @@ data LispVal = Atom String
              | Number Integer
              | String String
              | Bool Bool
+             deriving Show
 
 symbol :: Parser Char
 symbol = oneOf "!#$%&|*+-/:<=>?@^_~"
@@ -34,9 +35,9 @@ parseAtom = do
                 _    -> Atom atom
 
 parseNumber :: Parser LispVal
-parseNumber = many1 digit >>= \ ds ->
-              let a = read ds
-              in return $ Number a
+parseNumber = do ds <- many1 digit
+                 let a = read ds
+                 return $ Number a
 
 parseExpr :: Parser LispVal
 parseExpr = parseString
@@ -46,9 +47,10 @@ parseExpr = parseString
 readExpr :: String -> String
 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