Add support for more binary ops

diff --git a/AST.hs b/AST.hs
index 6528215422482fbfa3111faece64c3ff80205983..424cfbe7b13010e0960e4b88a1675cdcfa3b3f0f 100644 (file)
--- a/AST.hs
+++ b/AST.hs
@@ -1,20 +1,26 @@
 module AST where
 
 import Text.Read
-import Text.ParserCombinators.ReadP hiding ((+++))
+import Text.ParserCombinators.ReadP hiding ((+++), choice)
 
+data BinOpType = Add | Sub | Mul
+  deriving Show
 data Expr = Num Float
-          | Add Expr Expr
+          | BinOp BinOpType Expr Expr
   deriving Show
 
 instance Read Expr where
-  readPrec = parseNum +++ parseAdd
+  readPrec = choice [ parseNum
+                    , parseBinOp '+' Add
+                    , parseBinOp '-' Sub
+                    , parseBinOp '*' Mul
+                    ]
     where parseNum = Num <$> readPrec
-          parseAdd = step $ do
+          parseBinOp c typ = step $ do
             a <- prec 11 readPrec
             lift $ do
               skipSpaces
-              char '+'
+              char c
               skipSpaces
             b <- readPrec
-            return (Add a b)
+            return (BinOp typ a b)

diff --git a/Main.hs b/Main.hs
index 2d838d339da3d1a04c5354fc8e920085aa565d0e..8f4610af8b249920f0b03e67091804ad70c34faa 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -35,7 +35,11 @@ main = do
 
 build :: AST.Expr -> IRBuilderT ModuleBuilder Operand
 build (AST.Num a) = pure $ ConstantOperand (Float (Single a))
-build (AST.Add a b) = do
+build (AST.BinOp op a b) = do
   va <- build a
   vb <- build b
-  fadd va vb
+  let instr = case op of
+                AST.Add -> fadd
+                AST.Sub -> fsub
+                AST.Mul -> fmul
+  instr va vb