X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=b5f8ca026a3bec381f22b0c9c0648aaa62c67f35;hb=2473a12c050ab50a6fded6d4ea6df9b81ab8abf1;hp=fb4c4050cf75718a46d4e6e09c5aeefc6ee26a31;hpb=3ca56ec76529508b1e6a3c10c145b15312f571f7;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index fb4c405..b5f8ca0 100644
--- a/AST.icl
+++ b/AST.icl
@@ -7,6 +7,9 @@ from Data.Func import $
 from Text import class Text(concat), instance Text String
 from Data.Maybe import :: Maybe, maybe
 
+instance toString Pos where
+	toString {line,col} = concat [toString line, ":", toString col, " "]
+
 instance toString AST where
 	toString (AST v f) = concat (
 		["\n":printersperse "\n" v] ++
@@ -47,13 +50,12 @@ 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] ++ [";"]
 
+instance toString Type where
+	toString t = concat $ print t
+
 instance print Type where
 	print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
 	print (ListType t) = ["[":print t] ++ ["]"]
@@ -62,6 +64,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,6 +76,9 @@ 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]
 
@@ -82,7 +89,7 @@ instance print Expr where
 	print (VarExpr _ vd) = print vd
 	print (Op2Expr _ e1 o e2) = ["(":print e1] ++ [" ",case o of
 		BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
-		BiMod = "%"; BiEquals = "="; BiLesser = "<"; BiGreater = ">"
+		BiMod = "%"; BiEquals = "=="; BiLesser = "<"; BiGreater = ">"
 		BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
 		BiAnd = "&&"; BiOr = "||"; BiCons = ":"
 		," ":print e2] ++ [")"]