X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=31221ca3c289dca1c46587fe0318c684a25dd3cd;hb=6f035b0bf9e10d215a2d8d6198d29f7727877cad;hp=50b67ea59690922dd6dea7d0c5c658140f041e93;hpb=4f162814483aa0ab4e11cab51e23f807bece906c;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 50b67ea..31221ca 100644
--- a/sem.icl
+++ b/sem.icl
@@ -35,6 +35,8 @@ instance toString SemError where
 	toString (ParseError p e) = concat [
 		toString p,"SemError: ParseError: ", e]
 	toString (Error e) = "SemError: " +++ e
+	toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1
+t2)
 	toString (UnifyError p t1 t2) = concat [
 		toString p,
 		"SemError: Cannot unify types. Expected: ",
@@ -59,66 +61,83 @@ semFunDecl :: FunDecl -> Env FunDecl
 semFunDecl f = pure $ Right f
 
 semVarDecl :: VarDecl -> Env VarDecl
-semVarDecl v = pure $ Right v
-//Right v
-//semVarDecl vd=:(VarDecl pos type ident expr) = case unify type expr of
-//	Left e = Left e
-//	//TODO ident in de environment
-//	Right e = Right $ pure vd
-//
+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)
+
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure $ Right IntType
 typeExpr (CharExpr _ _) = pure $ Right CharType
 typeExpr (BoolExpr _ _) = pure $ Right BoolType
-typeExpr (Op1Expr p UnNegation expr) = typeExpr expr 
-	>>= \exprtype->case exprtype of
-        Left e = pure $ Left e
-		Right BoolType = pure $ Right BoolType
-        Right (IdType ident) = putIdent ident BoolType >>| pure (Right BoolType)
-		Right t = pure $ Left $ UnifyError p BoolType t
-//typeExpr (Op1Expr p UnMinus expr) = typeExpr expr 
-//	>>= \exprtype->case exprtype of
-//		IntType = pure $ Right IntType
-//		t = Left $ UnifyError p IntType exprtype
-//typeExpr (Op2Expr Pos Expr Op2 Expr) = undef
+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))
+//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 (TupleExpr Pos (Expr, Expr)) = 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
 
+instance unify Expr where
+	unify (_ ->> _) e = pure $ Left $ ParseError (extrPos e)
+			"Expression cannot be a higher order function. Yet..."
+	unify VoidType e = pure $ Left $ ParseError (extrPos e)
+			"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
+			Right tex = unify t tex >>= \eitherun->case eitherun of
+				Left err = pure $ Left $ decErr e err
+				Right t = pure $ Right t
+
 instance unify Type where
 	unify IntType IntType = pure $ Right IntType
 	unify BoolType BoolType = pure $ Right BoolType
 	unify CharType CharType = pure $ Right CharType
-	unify _ _ = undef
-//
-//instance unify Expr where
-//	unify type expr = case type of
-//		_ ->> _ = Left $ ParseError (extrPos expr)
-//			"Expression cannot be a higher order function. Yet..."
-//		VoidType = Left $ ParseError (extrPos expr)
-//			"Expression cannot be a Void type."
-//		IdType _ = Left $ ParseError (extrPos expr)
-//			"Expression cannot be an polymorf type."
-//		TupleType (_, _) = undef
-//		ListType _ = undef
-//		IntType = undef
-//		BoolType = undef
-//		CharType = undef
-//		VarType = undef
-//
-//extrPos :: Expr -> Pos
-//extrPos (VarExpr p _) = p
-//extrPos (Op2Expr p _ _ _) = p
-//extrPos (Op1Expr p _ _) = p
-//extrPos (IntExpr p _) = p
-//extrPos (CharExpr p _) = p
-//extrPos (BoolExpr p _) = p
-//extrPos (FunExpr p _) = p
-//extrPos (EmptyListExpr p) = p
-//extrPos (TupleExpr p _) = p
+	unify t1 t2 = pure $ Left $ UnifyError zero t1 t2
+
+instance zero Pos where
+	zero = {line=0,col=0}
+
+decErr :: Expr SemError -> SemError
+decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
+decErr e (ParseError _ s) = ParseError (extrPos e) s
+decErr e err = err
+
+extrPos :: Expr -> Pos
+extrPos (VarExpr p _) = p
+extrPos (Op2Expr p _ _ _) = p
+extrPos (Op1Expr p _ _) = p
+extrPos (IntExpr p _) = p
+extrPos (CharExpr p _) = p
+extrPos (BoolExpr p _) = p
+extrPos (FunExpr p _) = p
+extrPos (EmptyListExpr p) = p
+extrPos (TupleExpr p _) = p