Handle ending ;

[kaleidoscope-hs-old.git] / AST.hs

diff --git a/AST.hs b/AST.hs
index 1965ae6ba8378bc8277b2b46fe031ea04a64a5d5..6b9928d5b13fa0d67c848b8c3c0e446c2babb4f4 100644 (file)
--- a/AST.hs
+++ b/AST.hs
@@ -8,10 +8,14 @@ newtype Program = Program [AST]
   deriving Show
 
 instance Read Program where
-  readPrec = fmap Program $ lift $ sepBy1 (readPrec_to_P readPrec 0) $ do
+  readPrec = fmap Program $ lift $ do
+    asts <- sepBy1 (readS_to_P reads) $ do
       skipSpaces
       char ';'
       skipSpaces
+    optional $ char ';'
+    skipSpaces
+    return asts
 
 data AST = Function String [String] Expr
          | Eval Expr
@@ -20,8 +24,9 @@ data Expr = Num Float
           | BinOp BinOpType Expr Expr
           | Var String
           | Call String [Expr]
+          | If Expr Expr Expr
   deriving Show
-data BinOpType = Add | Sub | Mul
+data BinOpType = Add | Sub | Mul | Cmp Ordering
   deriving Show
 
 instance Read AST where
@@ -38,14 +43,21 @@ instance Read AST where
             return (Function name params body)
 
 instance Read Expr where
-  readPrec = choice [ parseNum
+  readPrec = choice [ parseParens
+                    , parseNum
                     , parseVar
                     , parseCall
-                    , parseBinOp '+' Add
-                    , parseBinOp '-' Sub
-                    , parseBinOp '*' Mul
+                    , parseIf
+                    , parseBinOp "+" Add
+                    , parseBinOp "-" Sub
+                    , parseBinOp "*" Mul
+                    , parseBinOp ">" (Cmp GT)
+                    , parseBinOp "<" (Cmp LT)
+                    , parseBinOp "==" (Cmp EQ)
                     ]
-    where parseNum = Num <$> readPrec
+    where parseParens = step $ lift $
+            between (char '(') (char ')') (readS_to_P reads)
+          parseNum = Num <$> readPrec
           parseVar = Var <$> lift (munch1 isAlpha)
           parseCall = do
             func <- lift (munch1 isAlpha)
@@ -53,11 +65,27 @@ instance Read Expr where
                         sepBy (readS_to_P reads)
                               (skipSpaces >> char ',' >> skipSpaces)
             return (Call func params)
-          parseBinOp c typ = step $ do
+          parseBinOp s typ = step $ do
             a <- prec 11 readPrec
             lift $ do
               skipSpaces
-              char c
+              string s
               skipSpaces
             b <- readPrec
             return (BinOp typ a b)
+          parseIf = do
+            lift $ do
+              string "if"
+              skipSpaces
+            cond <- step readPrec
+            lift $ do
+              skipSpaces
+              string "then"
+              skipSpaces
+            thenE <- step readPrec
+            lift $ do
+              skipSpaces
+              string "else"
+              skipSpaces
+            elseE <- step readPrec
+            return (If cond thenE elseE)