X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=AST.hs;h=b57d7cb8cede024a9c2bb0e366d8d066474d331d;hb=1e699db7f70bfeaedaa86cac2b11dc0b43ff6500;hp=7dad3a19e91eab9f12657101bd224b5c81742d07;hpb=310a2212dfb2014e8ac7efd1a5d7599a7f9d4057;p=kaleidoscope-hs.git

diff --git a/AST.hs b/AST.hs
index 7dad3a1..b57d7cb 100644
--- a/AST.hs
+++ b/AST.hs
@@ -7,14 +7,16 @@ import Text.ParserCombinators.ReadP hiding ((+++), choice)
 data Expr = Num Float
           | 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 "+" 20 Add
                              , parseBinOp "-" 20 Sub
@@ -30,6 +32,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