X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=c7a41e95b860f5af510c9332a641d9c896d79ce0;hb=2953e6cc260d8243e5434b7e787258ab073d34d2;hp=8c40fb5e68b5e423711310b06448ff0df47ba1e5;hpb=fcb2ca9a7905e5f02431ebad7ac54dba256493e9;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 8c40fb5..c7a41e9 100644
--- a/sem.icl
+++ b/sem.icl
@@ -60,6 +60,10 @@ instance toString SemError where
         toString p,
         "SemError: Cannot select ", toString fs, " from type: ",
         toString t]
+	toString (OperatorError p o t) = concat [
+		toString p, 
+		"SemError: No ", toString o, " for type ",
+		toString t]
     toString (UndeclaredVariableError p ident) = concat [
         toString p, "SemError: identifier: ", ident, " undefined."]
 
@@ -82,6 +86,11 @@ semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl (VarDecl pos type ident ex) = unify type ex
     >>= \t-> putIdent ident t >>| (pure $ VarDecl pos t ident ex)
 
+typeOp2 :: Expr Expr Op2 [Type] -> Env Type
+typeOp2 e1 e2 op ts = typeExpr e1 >>= \t1-> typeExpr e2 >>= \t2->
+	unify t1 t2	>>= \t3->if (isMember t3 ts) (pure t3)
+		(liftT $ Left $ OperatorError (extrPos e1) op t3)
+
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure IntType
 typeExpr (CharExpr _ _) = pure CharType
@@ -90,30 +99,20 @@ typeExpr (Op1Expr p UnNegation expr) = unify BoolType expr
 typeExpr (Op1Expr p UnMinus expr) = unify IntType expr
 typeExpr (TupleExpr p (e1, e2)) = typeExpr e1 
     >>= \t1-> typeExpr e2 >>= \t2-> pure $ TupleType (t1, t2)
-//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 e1 >>= \t1 -> unify t1 e2 
-    >>| pure BoolType //todo, actually check t1 in Char,Bool,Int
-typeExpr (Op2Expr p e1 BiUnEqual e2) = typeExpr (Op2Expr p e1 BiEquals e2)
-//char of int
-typeExpr (Op2Expr p e1 BiLesser e2) = typeExpr e1 >>= \t1 -> unify t1 e2 
-    >>| pure BoolType //todo, actually check t1 in Char, Int
-typeExpr (Op2Expr p e1 BiGreater e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-typeExpr (Op2Expr p e1 BiLesserEq e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-typeExpr (Op2Expr p e1 BiGreaterEq e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-//bool
-typeExpr (Op2Expr p e1 BiAnd e2) = unify BoolType e1 >>| unify BoolType e2
-typeExpr (Op2Expr p e1 BiOr e2) = unify BoolType e1 >>| unify BoolType e2
-//a
-typeExpr (Op2Expr p e1 BiCons e2) = typeExpr e1 >>= \t1-> typeExpr e2 
-    >>= \t2-> unify (ListType t1) t2
+typeExpr (Op2Expr p e1 op e2)
+| isMember op [BiPlus, BiMinus, BiTimes, BiDivide, BiMod] =
+	typeOp2 e1 e2 op [IntType]
+| isMember op [BiEquals, BiUnEqual] =
+	typeOp2 e1 e2 op [IntType, BoolType, CharType]
+| isMember op [BiLesser, BiGreater, BiLesserEq, BiGreaterEq] =
+	typeOp2 e1 e2 op [IntType, CharType]
+| isMember op [BiAnd, BiOr] =
+	typeOp2 e1 e2 op [BoolType]
+| op == BiCons = typeExpr e1 >>= \t1-> typeExpr e2 
+	>>= \t2-> unify (ListType t1) t2
 typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
     putIdent frsh t >>| pure t
+//ignore field selectors
 typeExpr (FunExpr p (FunCall f es)) = gets (\(st, r)->'Map'.get f st)
     >>= \mt-> case mt of
         Nothing = let t = IdType f in putIdent f t >>| pure t