done?

[proglang.git] / Typecheck.hs

diff --git a/Typecheck.hs b/Typecheck.hs
index 35ed382d11e00e572eb4094153101ba54a34453e..922264061337362de5dab48dcbdb8163b9bee8d4 100644 (file)
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -33,6 +33,9 @@ typeCheckExp EDefault = return NoType
 typeCheckExp (EPost i op) = do
        TInt <- typeCheckVar i
        return TInt
+typeCheckExp (ENeg e) = do
+       TInt <- typeCheckExp e
+       return TInt
 
 
 typeCheckVar :: (MonadState Types m) => Ident -> m Type 
@@ -59,11 +62,11 @@ typeCheckStm (SWhile e s) = do
        return NoType
 typeCheckStm (SDecl t i e) = do
        t2 <- typeCheckExp e
-       if t == t2 then do
+       if t == t2 || t2 == NoType then do
                m <- get
                put (insert i t m)
                return NoType
-               else fail $ "Illegal to assign an expression of type "++show t2++" to variable "++show i++" of type "++show t2
+               else fail $ "Illegal to assign an expression of type "++show t2++" to variable "++show i++" of type "++show t
 typeCheckStm (SPrint e) = do
        typeCheckExp e
        return NoType