Using the "bind" operator

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

diff --git a/app/Main.hs b/app/Main.hs
index 22de7480421b03aaa552b541b8266a4a9bd41135..88ae7f7ff2ff0b439dcb452d24c2be9a66e55e41 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
 


@@ -22,8 +23,28 @@ parseString = do
     char '"'
     return $ String x
 
     char '"'
     return $ String x
 

+parseAtom :: Parser LispVal
+parseAtom = do
+    a <- letter <|> symbol
+    b <- many (letter <|> digit <|> symbol)
+    let atom = a:b
+    return $ case atom of
+                "#t" -> Bool True
+                "#f" -> Bool False
+                _    -> Atom atom
+
+parseNumber :: Parser LispVal
+parseNumber = many1 digit >>= \ ds ->
+              let a = read ds
+              in return $ Number a
+
+parseExpr :: Parser LispVal
+parseExpr = parseString
+        <|> parseAtom
+        <|> parseNumber
+

 readExpr :: String -> String
 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"
 
     Left err -> "No match: " ++ show err
     Right val -> "Found value"