Interpreter works

[proglang.git] / Typecheck.hs

diff --git a/Typecheck.hs b/Typecheck.hs
index bfef73a68a318cc46188649474881eab2760c4d0..e2aa3d7182d61eef64d28b462efb2f3d9efde328 100644 (file)
--- 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