From: pimjager <pim@pimjager.nl>
Date: Tue, 12 Apr 2016 19:25:30 +0000 (+0200)
Subject: op2
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;ds=sidebyside;h=9e1081469910f9b70a1ea713f431aadf385c52b7;p=cc1516.git

op2
---

diff --git a/examples/example.spl b/examples/example.spl
index e71c216..0bf275e 100644
--- a/examples/example.spl
+++ b/examples/example.spl
@@ -2,14 +2,6 @@
 	Three ways to implement the f acto rial function in SPL.
 	First the recursive version .
 */
-Int r = 1;
-Char r = 1;
-Int r = -1;
-Void r = 0;
-Bool r = !True;
-Bool r = -True;
-//var facN = 1;
-//var ok = True;
 
 facR(n) :: Int -> Int {
 	if (n < 2) {
diff --git a/examples/varEx.spl b/examples/varEx.spl
new file mode 100644
index 0000000..c400caf
--- /dev/null
+++ b/examples/varEx.spl
@@ -0,0 +1,10 @@
+
+
+Int t = 1 + 1;
+var t = True;
+var x = 2 + 2;
+
+var x = True;
+var z = 4;
+//Int y = 4 + True;
+
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