X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Typecheck.hs;h=922264061337362de5dab48dcbdb8163b9bee8d4;hb=da42df3f49c904ed4e85d35562311d5b99d804a8;hp=ec2270e01c3860215b28dcb851807b8f8f14ea99;hpb=9726c329b6d9ab02a1b50566ae96c82f29c5ec4d;p=proglang.git

diff --git a/Typecheck.hs b/Typecheck.hs
index ec2270e..9222640 100644
--- 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 "Så får du inte göra!!!"
+		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