X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Typecheck.hs;h=5c70ccf02c04118b27f297e854d887be05c58a13;hb=8687a7c6790e959242228d64c8c513771565f8c1;hp=18146506a227857ce792198ba9e8575491c7f553;hpb=9254ff63648d9a6f4b058c0a53438db7b60a28cd;p=proglang.git

diff --git a/Typecheck.hs b/Typecheck.hs
index 1814650..5c70ccf 100644
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -1,4 +1,4 @@
-module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, State(..)) where 
+module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, emptyState, State(..)) where 
 
 
 import Abssyntax
@@ -11,10 +11,7 @@ type Function = (Type, [Type])
 
 data State = State {variables::Types,functions::(Map Ident Function),function::Ident}
 
-
-inList :: Eq a => a -> [a] -> Bool
-inList _ [] = False
-inList a (x:xs) = if a == x then True else inList a xs
+emptyState = State{variables=[empty], functions=(empty), function=(Ident "")}
 
 assert :: Monad m => Bool -> String -> m ()
 assert True _ = return ()
@@ -25,10 +22,10 @@ typeCheckExp (BiOpExp e o e') = do
 	t1 <- typeCheckExp e
 	t2 <- typeCheckExp e'
 	assert (t1 == t2) "The parameters for the binary operator aren't equal"
-	if inList o [Eq,NEq] then return TBool
+	if elem o [Eq,NEq] then return TBool
 		else do 
 			assert (t1 == TInt) "The parameters need to be of type int" 
-			if inList o [Plus,Minus,Times,Div]
+			if elem o [Plus,Minus,Times,Div]
 				then return TInt
 				else return TBool
 typeCheckExp (EVar i) = typeCheckVar i
@@ -50,6 +47,20 @@ typeCheckExp (ENeg e) = do
 typeCheckExp (ENot e) = do
 	TBool <- typeCheckExp e
 	return TBool
+typeCheckExp (EFunc i as) = do
+	state <- get
+	(t,ts) <- lookup i $ functions state
+	checkParams as ts
+	return t
+
+checkParams :: (MonadState State m) => [Exp] -> [Type] -> m ()
+checkParams [] [] = return ()
+checkParams [] _ = fail "Too for arguments when calling function" 
+checkParams _ [] = fail "Too many arguments when calling function" 
+checkParams (e:es) (t:ts) = do
+	t2 <- typeCheckExp e
+	assert (t == t2) "Arugments does not match"
+	checkParams es ts
 
 typeCheckVar :: (MonadState State m) => Ident -> m Type 
 typeCheckVar i = do
@@ -106,6 +117,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