X-Git-Url: https://git.lukelau.me/?p=kaleidoscope-hs-old.git;a=blobdiff_plain;f=AST.hs;h=73523d6d4c8a37cef977d5614d355aaac13756af;hp=1965ae6ba8378bc8277b2b46fe031ea04a64a5d5;hb=fd502ca628b539cffbc38c21755ebaa615b30b72;hpb=808a6ae35fb1f2ff61a84991af1e7722298a4d62

diff --git a/AST.hs b/AST.hs
index 1965ae6..73523d6 100644
--- a/AST.hs
+++ b/AST.hs
@@ -8,7 +8,7 @@ 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 $ sepBy1 (readS_to_P reads) $ do
     skipSpaces
     char ';'
     skipSpaces
@@ -20,8 +20,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 +39,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 +61,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)