X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Typecheck.hs;h=bfef73a68a318cc46188649474881eab2760c4d0;hb=74c984c4c70336e7b7618cd934db819263ceb565;hp=29008bd2213c250a487f7c303287e3f245c445b7;hpb=ff80cbdaf843e2745f59e6f5d3c8670cadbf68b2;p=proglang.git

diff --git a/Typecheck.hs b/Typecheck.hs
index 29008bd..bfef73a 100644
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -1,15 +1,15 @@
-module Typecheck where -- (typeCheckExp, typeCheckStm, typeCheckVar, State) where 
+module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, State(..)) where 
 
 
 import Abssyntax
 import Control.Monad.State hiding (State)
-import Data.Map as Map
+import Data.Map as Map hiding (map)
 import Prelude hiding (lookup)
 
 type Types = [Map Ident Type]
 type Function = (Type, [Type])
 
-data State = State {variables::Types,functions::[Map Ident Function],function::Ident}
+data State = State {variables::Types,functions::(Map Ident Function),function::Ident}
 
 
 inList :: Eq a => a -> [a] -> Bool
@@ -50,6 +50,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
@@ -87,6 +101,12 @@ typeCheckStm (SDecl t i e) = do
 typeCheckStm (SPrint e) = do
 	typeCheckExp e
 	return ()
+typeCheckStm (SReturn e) = do
+	t <- typeCheckExp e
+	state <- get
+	(t2,_) <- lookup (function state) $ functions state
+	assert (t == t2) $ "Illegal to return "++show t++" in function "++show (function state)++" which returns "++show t2
+
 
 addVariable :: (MonadState State m) => Ident -> Type -> m ()
 addVariable i t = do
@@ -94,3 +114,18 @@ addVariable i t = do
 	let (m:ms) = variables s in case insertLookupWithKey (\k a1 a2 -> a1) i t m of
 		(Nothing,m') -> modify (\s -> s{ variables = m':ms})
 		_ -> fail $ "Duplicate variable declaration: "++show i
+
+typeCheckFunction :: (MonadState State m) => Func -> m ()
+typeCheckFunction (Func t i d s) = do
+	state <- get
+	modify (\s -> s{variables=[empty], function=i})
+	mapM (\(Decl t i) -> addVariable i t) d
+	mapM typeCheckStm s
+	put state
+
+addFunction :: (MonadState State m) => Func -> m ()
+addFunction (Func t i d _) = do
+	s <- get
+	let m = functions s in case insertLookupWithKey (\k a1 a2 -> a1) i (t, map (\(Decl t i) -> t) d) m of
+		(Nothing,m') -> modify (\s -> s{ functions = m'})
+		_ -> fail $ "Duplicate variable declaration: "++show i