X-Git-Url: https://git.lukelau.me/?p=kaleidoscope-hs.git;a=blobdiff_plain;f=AST.hs;h=1e505af4f47116e401e2523f10c90ac1c466c360;hp=7dad3a19e91eab9f12657101bd224b5c81742d07;hb=HEAD;hpb=8a66ac4f81c3d1eab3b13a9e58cee0098573eff1

diff --git a/AST.hs b/AST.hs
index 7dad3a1..9ff555a 100644
--- a/AST.hs
+++ b/AST.hs
@@ -4,18 +4,22 @@ import Data.Char
 import Text.Read 
 import Text.ParserCombinators.ReadP hiding ((+++), choice)
 
-data Expr = Num Float
+data Expr = Num Double
           | Var String
           | BinOp BinOp Expr Expr
+          | Call String [Expr]
   deriving Show
 
 data BinOp = Add | Sub | Mul | Cmp Ordering
   deriving Show
 
 instance Read Expr where
-  readPrec = choice [ parseNum
+  readPrec = parens $ choice [ parseNum
                              , parseVar
+                             , parseCall
                              , parseBinOp "<" 10 (Cmp LT)
+                             , parseBinOp ">" 10 (Cmp GT)
+                             , parseBinOp "==" 10 (Cmp EQ)
                              , parseBinOp "+" 20 Add
                              , parseBinOp "-" 20 Sub
                              , parseBinOp "*" 40 Mul
@@ -30,6 +34,12 @@ instance Read Expr where
               skipSpaces
             b <- readPrec
             return (BinOp op a b)
+          parseCall = do
+            func <- lift (munch1 isAlpha)
+            params <- lift $ between (char '(') (char ')') $
+                        sepBy (readS_to_P reads)
+                              (skipSpaces >> char ',' >> skipSpaces)
+            return (Call func params)
             
 data Prototype = Prototype String [String]
   deriving Show