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

diff --git a/sem.icl b/sem.icl
index 7132135..709071c 100644
--- a/sem.icl
+++ b/sem.icl
@@ -61,28 +61,42 @@ semFunDecl f = pure $ Right f
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl vd=:(VarDecl pos type ident ex) = unify type ex
-	>>= \et->pure (
-		et >>= \t->pure $ VarDecl pos t ident ex)
-//Right v
-//	//TODO ident in de environment
-//	Right e = Right $ pure vd
-
-typeOp1 :: Pos Expr Type -> Env Type
-typeOp1 p expr rtype = unify rtype expr
+	>>= \et->case et of
+		Left err = pure $ Left err
+		Right t = putIdent ident t >>| pure (Right $ VarDecl pos t ident ex)
 
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure $ Right IntType
 typeExpr (CharExpr _ _) = pure $ Right CharType
 typeExpr (BoolExpr _ _) = pure $ Right BoolType
-typeExpr (Op1Expr p UnNegation expr) = typeOp1 p expr BoolType
-typeExpr (Op1Expr p UnMinus expr) = typeOp1 p expr IntType
+typeExpr (Op1Expr p UnNegation expr) = unify BoolType expr
+typeExpr (Op1Expr p UnMinus expr) = unify IntType expr
 typeExpr (TupleExpr p (e1, e2)) = typeExpr e1 
 	>>= \ete1->typeExpr e2 >>= \ete2->pure (
 		ete1 >>= \te1->ete2 >>= \te2->Right $ TupleType (te1, te2))
-//typeExpr (Op2Expr Pos Expr Op2 Expr) = undef
+//Int
+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) = 
+typeExpr (Op2Expr p e1 BiUnEqual e2) = undef
+//char of int
+typeExpr (Op2Expr p e1 BiLesser e2) = undef
+typeExpr (Op2Expr p e1 BiGreater e2) = undef
+typeExpr (Op2Expr p e1 BiLesserEq e2) = undef
+typeExpr (Op2Expr p e1 BiGreaterEq e2) = undef
+//bool
+typeExpr (Op2Expr p e1 BiAnd e2) = undef
+typeExpr (Op2Expr p e1 BiOr e2) = undef
+//a
+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
 
@@ -93,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