merged changes to function branch

[proglang.git] / Typecheck.hs

diff --git a/Typecheck.hs b/Typecheck.hs
index 5c70ccf02c04118b27f297e854d887be05c58a13..a8c10e55f5dc570e99e79fd9b30b9ad085664d11 100644 (file)
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -1,4 +1,4 @@
-module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, emptyState, State(..)) where 
+module Typecheck (typeCheck, typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, emptyState, State(..)) where 
 
 
 import Abssyntax
@@ -17,6 +17,11 @@ assert :: Monad m => Bool -> String -> m ()
 assert True _ = return ()
 assert False s = fail s
 
+typeCheck :: [Func] -> [Stm] -> IO ()
+typeCheck fun st = do
+       runStateT (do mapM addFunction fun; mapM typeCheckFunction fun; mapM typeCheckStm st) emptyState
+       return ()
+
 typeCheckExp :: (MonadState State m) => Exp -> m Type
 typeCheckExp (BiOpExp e o e') = do
        t1 <- typeCheckExp e