X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=709071c9cdde16695b64b55a5f09408a2062ae60;hb=9e1081469910f9b70a1ea713f431aadf385c52b7;hp=9be1948f44cd92ac5a5f63f66575bc058c104f95;hpb=fcd59b28f747edf11a7910ad842ed259847fd79d;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 9be1948..709071c 100644
--- a/sem.icl
+++ b/sem.icl
@@ -75,13 +75,13 @@ typeExpr (TupleExpr p (e1, e2)) = typeExpr e1
 	>>= \ete1->typeExpr e2 >>= \ete2->pure (
 		ete1 >>= \te1->ete2 >>= \te2->Right $ TupleType (te1, te2))
 //Int
-typeExpr (Op2Expr p e1 BiPlus e2) = undef
-typeExpr (Op2Expr p e1 BiMinus e2) = undef
-typeExpr (Op2Expr p e1 BiTimes e2) = undef
-typeExpr (Op2Expr p e1 BiDivide e2) = undef
-typeExpr (Op2Expr p e1 BiMod e2) = undef
+typeExpr (Op2Expr p e1 BiPlus e2) = unify IntType e1 >>| unify IntType e2
+typeExpr (Op2Expr p e1 BiMinus e2) = unify IntType e1 >>| unify IntType e2
+typeExpr (Op2Expr p e1 BiTimes e2) = unify IntType e1 >>| unify IntType e2
+typeExpr (Op2Expr p e1 BiDivide e2) = unify IntType e1 >>| unify IntType e2
+typeExpr (Op2Expr p e1 BiMod e2) = unify IntType e1 >>| unify IntType e2
 //bool, char of int
-typeExpr (Op2Expr p e1 BiEquals e2) = undef
+typeExpr (Op2Expr p e1 BiEquals e2) = 
 typeExpr (Op2Expr p e1 BiUnEqual e2) = undef
 //char of int
 typeExpr (Op2Expr p e1 BiLesser e2) = undef
@@ -95,7 +95,8 @@ typeExpr (Op2Expr p e1 BiOr e2) = undef
 typeExpr (Op2Expr p e1 BiCons e2) = undef
 //typeExpr (FunExpr Pos FunCall) = undef
 //typeExpr (EmptyListExpr Pos) = undef
-//typeExpr (VarExpr Pos VarDef) = undef
+//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to put the infered type
+                                        //in the context
 
 class unify a :: Type a -> Env Type
 
@@ -106,6 +107,7 @@ instance unify Expr where
 			"Expression cannot be a Void type."
 	unify (IdType _) e = pure $ Left $ ParseError (extrPos e)
 			"Expression cannot be an polymorf type."
+    unify VarType e = typeExpr e
 	unify t e = typeExpr e
 		>>= \eithertype->case eithertype of
 			Left e = pure $ Left e