X-Git-Url: https://ruin.nu/git/?p=proglang.git;a=blobdiff_plain;f=Typecheck.hs;h=a8c10e55f5dc570e99e79fd9b30b9ad085664d11;hp=e2aa3d7182d61eef64d28b462efb2f3d9efde328;hb=HEAD;hpb=08d98a82fabc381a8b101387f39ae5752cfeb314

diff --git a/Typecheck.hs b/Typecheck.hs
index e2aa3d7..a8c10e5 100644
--- 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
@@ -117,6 +122,9 @@ typeCheckFunction (Func t i d s) = do
 	state <- get
 	modify (\s -> s{variables=[empty], function=i})
 	mapM (\(Decl t i) -> addVariable i t) d
+	case last s of
+		(SReturn _) -> return ()
+		_ -> fail $ "Function "++show i++" doesn't end with return statement"
 	mapM typeCheckStm s
 	put state