op2

[cc1516.git] / sem.icl

diff --git a/sem.icl b/sem.icl
index 1a2ed00..709071c 100644 (file)
--- a/sem.icl
+++ b/sem.icl
@@ -64,9 +64,6 @@ semVarDecl vd=:(VarDecl pos type ident ex) = unify type ex
        >>= \et->case et of
                Left err = pure $ Left err
                Right t = putIdent ident t >>| pure (Right $ VarDecl pos t ident ex)
-//Right v
-//     //TODO ident in de environment
-//     Right e = Right $ pure vd
 
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure $ Right IntType
@@ -77,10 +74,29 @@ 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
 
@@ -91,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