Update AST to match Kaleidoscope more closely

diff --git a/AST.hs b/AST.hs
index 2bea0028cf47bb61f94c982f011ca24b72a612ac..1965ae6ba8378bc8277b2b46fe031ea04a64a5d5 100644 (file)
--- a/AST.hs
+++ b/AST.hs
@@ -4,6 +4,15 @@ import Data.Char
 import Text.Read
 import Text.ParserCombinators.ReadP hiding ((+++), choice)
 
 import Text.Read
 import Text.ParserCombinators.ReadP hiding ((+++), choice)
 

+newtype Program = Program [AST]
+  deriving Show
+
+instance Read Program where
+  readPrec = fmap Program $ lift $ sepBy1 (readPrec_to_P readPrec 0) $ do
+    skipSpaces
+    char ';'
+    skipSpaces
+

 data AST = Function String [String] Expr
          | Eval Expr
   deriving Show
 data AST = Function String [String] Expr
          | Eval Expr
   deriving Show


@@ -25,9 +34,7 @@ instance Read AST where
             params <- between (char '(') (char ')') $
                       sepBy (munch1 isAlpha) skipSpaces
             skipSpaces
             params <- between (char '(') (char ')') $
                       sepBy (munch1 isAlpha) skipSpaces
             skipSpaces

-            body <- between (char '{') (char '}') $
-                      readS_to_P reads
-            skipSpaces
+            body <- readS_to_P reads

             return (Function name params body)
 
 instance Read Expr where
             return (Function name params body)
 
 instance Read Expr where

diff --git a/Main.hs b/Main.hs
index 8f4610af8b249920f0b03e67091804ad70c34faa..fcfe5dfff83e36cdf16525069f89620bf581e9df 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -3,27 +3,28 @@
 module Main where
 
 import qualified AST
 module Main where
 
 import qualified AST

+import qualified Data.Map as Map

 import qualified Data.Text.Lazy.IO as Text
 import qualified Data.Text.Lazy.IO as Text

+import           Data.String

 import Foreign.Ptr
 import System.IO
 import LLVM.Context
 import Foreign.Ptr
 import System.IO
 import LLVM.Context

-import LLVM.CodeModel

 import LLVM.ExecutionEngine
 import LLVM.Module
 import LLVM.IRBuilder
 import LLVM.ExecutionEngine
 import LLVM.Module
 import LLVM.IRBuilder

+import LLVM.AST.AddrSpace

 import LLVM.AST.Constant
 import LLVM.AST.Float
 import LLVM.AST.Operand
 import LLVM.AST.Constant
 import LLVM.AST.Float
 import LLVM.AST.Operand

-import LLVM.AST.Type
+import LLVM.AST.Type as Type

 import LLVM.Pretty
 
 foreign import ccall "dynamic" exprFun :: FunPtr (IO Float) -> IO Float
 
 main :: IO ()
 main = do
 import LLVM.Pretty
 
 foreign import ccall "dynamic" exprFun :: FunPtr (IO Float) -> IO Float
 
 main :: IO ()
 main = do

-  ast <- read <$> getContents
-  let mdl = buildModule "main" $
-        function "expr" [] float $ \_ -> build ast >>= ret
+  program <- read <$> getContents
+  let mdl = buildModule "main" $ mapM buildAST program

   Text.hPutStrLn stderr (ppllvm mdl)
   withContext $ \ctx ->
     withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->
   Text.hPutStrLn stderr (ppllvm mdl)
   withContext $ \ctx ->
     withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->


@@ -33,11 +34,32 @@ main = do
           let f' = castFunPtr f :: FunPtr (IO Float)
           exprFun f' >>= print
 
           let f' = castFunPtr f :: FunPtr (IO Float)
           exprFun f' >>= print
 

-build :: AST.Expr -> IRBuilderT ModuleBuilder Operand
-build (AST.Num a) = pure $ ConstantOperand (Float (Single a))
-build (AST.BinOp op a b) = do
-  va <- build a
-  vb <- build b
+buildAST :: AST.AST -> ModuleBuilder Operand
+buildAST (AST.Function nameStr paramStrs body) = do
+  let name = fromString nameStr
+  function name params float $ \binds -> do
+    let bindMap = Map.fromList (zip paramStrs binds)
+    buildExpr bindMap body >>= ret
+  where params = zip (repeat float) (map fromString paramStrs)
+buildAST (AST.Eval e) =
+  function "expr" [] float $ \_ -> buildExpr mempty e >>= ret
+
+buildExpr :: Map.Map String Operand -> AST.Expr -> IRBuilderT ModuleBuilder Operand
+buildExpr _ (AST.Num a) = pure $ ConstantOperand (Float (Single a))
+buildExpr binds (AST.Var name) = pure $ binds Map.! name
+
+buildExpr binds (AST.Call nameStr params) = do
+  paramOps <- mapM (buildExpr binds) params
+  let name = fromString nameStr
+      -- get a pointer to the function
+      typ = FunctionType float (replicate (length params) float) False
+      ptrTyp = Type.PointerType typ (AddrSpace 0)
+      ref = GlobalReference ptrTyp name
+  call (ConstantOperand ref) (zip paramOps (repeat []))
+
+buildExpr binds (AST.BinOp op a b) = do
+  va <- buildExpr binds a
+  vb <- buildExpr binds b

   let instr = case op of
                 AST.Add -> fadd
                 AST.Sub -> fsub
   let instr = case op of
                 AST.Add -> fadd
                 AST.Sub -> fsub