X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=7b93acbe4170755986bdff0390bdff1412e5e802;hb=a8348a333a567e5a469d1e5f8ec6c3dafc051c91;hp=6023056fafb7f7ebc279ee76b46eba6abee13fe3;hpb=fe40818bbc1d327f0adfbbbfe7ecfbe15d4eb053;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 6023056..7b93acb 100644
--- a/AST.icl
+++ b/AST.icl
@@ -6,6 +6,10 @@ from Data.List import map, intercalate, replicate, flatten, isEmpty
 from Data.Func import $
 from Text import class Text(concat), instance Text String
 from Data.Maybe import :: Maybe, maybe
+import GenEq
+
+instance toString Pos where
+	toString {line,col} = concat [toString line, ":", toString col, " "]
 
 instance toString AST where
 	toString (AST v f) = concat (
@@ -18,7 +22,7 @@ printersperse :: String [a] -> [String] | print a
 printersperse i j = intercalate [i] (map print j)
 
 instance print FunDecl where
-	print (FunDecl i as t vs ss) =
+	print (FunDecl _ i as t vs ss) =
 		["\n", i, " (":printersperse "," as] ++
 		[")"] ++ maybe [] (\tt->[" :: ":print tt]) t ++
 		["{\n\t":printersperse "\n\t" vs] ++
@@ -47,12 +51,11 @@ printStatements [s:ss] i = (case s of
 		indent :: Int [String] -> [String]
 		indent i rest = replicate i "\t" ++ rest
 
-instance print FunType where
-	print (FunType at rt) = printersperse " " at ++
-		[if (isEmpty at) "" "->":maybe ["Void"] print rt]
-
 instance print VarDecl where
-	print (VarDecl t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
+	print (VarDecl _ t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
+
+instance toString Type where
+	toString t = concat $ print t
 
 instance print Type where
 	print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
@@ -62,6 +65,8 @@ instance print Type where
 	print BoolType = print "Bool"
 	print CharType = print "Char"
 	print VarType = print "var"
+    print VoidType = print "Void"
+    print (t1 ->> t2) = print t1 ++ [" -> ":print t2]
 
 instance print String where
 	print s = [s]
@@ -72,30 +77,39 @@ instance print FieldSelector where
 	print FieldSnd = print "snd"
 	print FieldFst = print "fst"
 
+instance toString FieldSelector where
+    toString fs = concat $ print fs
+
 instance print VarDef where
 	print (VarDef i fs) = printersperse "." [i:flatten $ map print fs]
 
 instance print FunCall where
 	print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
 
-instance print Expr where
-	print (VarExpr vd) = print vd
-	print (Op2Expr e1 o e2) = ["(":print e1] ++ [" ",case o of
+instance toString Op2 where
+	toString o = case o of
 		BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
-		BiMod = "%"; BiEquals = "="; BiLesser = "<"; BiGreater = ">"
+		BiMod = "%"; BiEquals = "=="; BiLesser = "<"; BiGreater = ">"
 		BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
 		BiAnd = "&&"; BiOr = "||"; BiCons = ":"
-		," ":print e2] ++ [")"]
-	print (Op1Expr o e) = ["(",case o of
+
+instance print Expr where
+	print (VarExpr _ vd) = print vd
+	print (Op2Expr _ e1 o e2) = ["(":print e1] ++ 
+		[" ",toString o, " ":print e2] ++ [")"]
+	print (Op1Expr _ o e) = ["(",case o of
 		UnNegation = "!"; UnMinus = "-"
 		:print e] ++ [")"]
-	print (IntExpr i) = [toString i]
-	print (CharExpr c) = ["\'", case c of
+	print (IntExpr _ i) = [toString i]
+	print (CharExpr _ c) = ["\'", case c of
 		'\b' = "\\b"; '\f' = "\\f"; '\n' = "\\n"
 		'\r' = "\\r"; '\t' = "\\t"; '\v' = "\\v"
 		c = if (c == toChar 7) "\\a" (toString c)
 		,"\'"]
-	print (BoolExpr b) = [toString b]
-	print (FunExpr fc) = print fc
-	print EmptyListExpr = ["[]"]
-	print (TupleExpr (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+	print (BoolExpr _ b) = [toString b]
+	print (FunExpr _ fc) = print fc
+	print (EmptyListExpr _) = ["[]"]
+	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+
+derive gEq Op2
+instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2