typechecking of functions added, not function calls yet though

[proglang.git] / Typecheck.hs

diff --git a/Typecheck.hs b/Typecheck.hs
index a78f8f02c6a51d5d6d643d01ee8a4232f4223dab..18146506a227857ce792198ba9e8575491c7f553 100644 (file)
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -1,12 +1,16 @@
-module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar) where 
+module Typecheck (typeCheckExp, typeCheckStm, typeCheckVar, typeCheckFunction, addFunction, State(..)) where 
 
 
 import Abssyntax
-import Control.Monad.State
-import Data.Map as Map
+import Control.Monad.State hiding (State)
+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}
+
 
 inList :: Eq a => a -> [a] -> Bool
 inList _ [] = False
@@ -16,7 +20,7 @@ assert :: Monad m => Bool -> String -> m ()
 assert True _ = return ()
 assert False s = fail s
 
-typeCheckExp :: (MonadState Types m) => Exp -> m Type
+typeCheckExp :: (MonadState State m) => Exp -> m Type
 typeCheckExp (BiOpExp e o e') = do
        t1 <- typeCheckExp e
        t2 <- typeCheckExp e'
@@ -47,43 +51,67 @@ typeCheckExp (ENot e) = do
        TBool <- typeCheckExp e
        return TBool
 
-typeCheckVar :: (MonadState Types m) => Ident -> m Type 
+typeCheckVar :: (MonadState State m) => Ident -> m Type 
 typeCheckVar i = do
-       ms <- get
-       findVariable i ms
+       s <- get
+       findVariable i $ variables s
 
-findVariable :: (MonadState Types m) => Ident -> Types -> m Type
+findVariable :: (MonadState State m) => Ident -> Types -> m Type
 findVariable i [] = fail $ "Variable "++show i++" not found in any scope."
 findVariable i (m:ms) = if member i m then lookup i m else findVariable i ms
 
-typeCheckStm :: (MonadState Types m) => Stm -> m ()
+pushAndPop :: (MonadState State m) => m a -> m ()
+pushAndPop s = do
+       modify (\s -> s { variables = empty:variables s})
+       s
+       modify (\s -> s { variables = tail $ variables s})
+
+typeCheckStm :: (MonadState State m) => Stm -> m ()
 typeCheckStm SNoop = return ()
 typeCheckStm (SExp e) = do 
        typeCheckExp e
        return ()
-typeCheckStm (SBlock ss) = do 
-       modify (empty:)
-       mapM typeCheckStm ss
-       modify tail
+typeCheckStm (SBlock ss) = pushAndPop $ mapM typeCheckStm ss
 typeCheckStm (SIf e s s') = do
        TBool <- typeCheckExp e
-       modify (empty:)
-       typeCheckStm s
-       modify (\s -> empty:tail s)
-       typeCheckStm s'
-       modify tail
+       pushAndPop $ typeCheckStm s
+       pushAndPop $ typeCheckStm s'
 typeCheckStm (SWhile e s) = do
        TBool <- typeCheckExp e
-       modify (empty:)
-       typeCheckStm s
-       modify tail
+       pushAndPop $ typeCheckStm s
+typeCheckStm (SDeclD t i) = addVariable i t
 typeCheckStm (SDecl t i e) = do
        t2 <- typeCheckExp e
        assert (t == t2) $ "Illegal to assign an expression of type "++show t2++" to variable "++show i++" of type "++show t
-       (m:ms) <- get
-       case insertLookupWithKey (\k a1 a2 -> a1) i t m of
-               (Nothing,m') -> put (m':ms)
-               _ -> fail $ "Duplicate variable declaration: "++show i
+       addVariable i t
 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
+       s <- get
+       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