projects
/
kaleidoscope-hs-old.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
882cd77
)
Add basic error handling
author
Luke Lau
<luke_lau@icloud.com>
Sun, 10 Mar 2019 15:13:34 +0000
(15:13 +0000)
committer
Luke Lau
<luke_lau@icloud.com>
Wed, 17 Apr 2019 22:38:30 +0000
(23:38 +0100)
Main.hs
patch
|
blob
|
history
diff --git
a/Main.hs
b/Main.hs
index f721911af3da8488e855ca46c966b736da2a5440..29592b18b0d3a4612c7d034bfae4822e12ef04d9 100644
(file)
--- a/
Main.hs
+++ b/
Main.hs
@@
-8,6
+8,7
@@
import qualified Data.Text.Lazy.IO as Text
import Data.String
import Foreign.Ptr
import System.IO
import Data.String
import Foreign.Ptr
import System.IO
+import System.Exit
import LLVM.Context
import LLVM.ExecutionEngine
import LLVM.Module
import LLVM.Context
import LLVM.ExecutionEngine
import LLVM.Module
@@
-20,14
+21,19
@@
import LLVM.AST.Operand
import LLVM.AST.Type as Type
import LLVM.Pretty
import Control.Monad
import LLVM.AST.Type as Type
import LLVM.Pretty
import Control.Monad
+import Control.Monad.Trans.Class
+
+type ModuleBuilderE = ModuleBuilderT (Either String)
foreign import ccall "dynamic" exprFun :: FunPtr (IO Float) -> IO Float
main :: IO ()
main = do
AST.Program asts <- read <$> getContents
foreign import ccall "dynamic" exprFun :: FunPtr (IO Float) -> IO Float
main :: IO ()
main = do
AST.Program asts <- read <$> getContents
- let mdl = buildModule "main" $ mapM buildAST asts
- withContext $ \ctx ->
+ let eitherMdl = buildModuleT "main" $ mapM buildAST asts
+ case eitherMdl of
+ Left err -> die err
+ Right mdl -> withContext $ \ctx ->
withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->
withModuleFromAST ctx mdl $ \mdl' ->
withPassManager defaultCuratedPassSetSpec $ \pm -> do
withMCJIT ctx Nothing Nothing Nothing Nothing $ \mcjit ->
withModuleFromAST ctx mdl $ \mdl' ->
withPassManager defaultCuratedPassSetSpec $ \pm -> do
@@
-38,19
+44,21
@@
main = do
let f' = castFunPtr f :: FunPtr (IO Float)
exprFun f' >>= print
let f' = castFunPtr f :: FunPtr (IO Float)
exprFun f' >>= print
-buildAST :: AST.AST -> ModuleBuilder Operand
+buildAST :: AST.AST -> ModuleBuilder
E
Operand
buildAST (AST.Function nameStr paramStrs body) = do
buildAST (AST.Function nameStr paramStrs body) = do
- let n
ame
= fromString nameStr
- function n
ame
params float $ \binds -> do
+ let n = fromString nameStr
+ function n 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
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 :: Map.Map String Operand -> AST.Expr -> IRBuilderT ModuleBuilder
E
Operand
buildExpr _ (AST.Num a) = pure $ ConstantOperand (Float (Single a))
buildExpr _ (AST.Num a) = pure $ ConstantOperand (Float (Single a))
-buildExpr binds (AST.Var name) = pure $ binds Map.! name
+buildExpr binds (AST.Var n) = case binds Map.!? n of
+ Just x -> pure x
+ Nothing -> lift $ lift $ Left $ "'" <> n <> "' doesn't exist in scope"
buildExpr binds (AST.Call nameStr params) = do
paramOps <- mapM (buildExpr binds) params
buildExpr binds (AST.Call nameStr params) = do
paramOps <- mapM (buildExpr binds) params