X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=e1f5bc57d1822da7863ca44a31e1bc434a6f467e;hb=b8aaa94f98ffb9bb18d6b1f2ba91ee81f0fdc0b9;hp=43c46f7052cedda36a1467f773eb480d85d3c6a7;hpb=e34b5f088ff9a86da61afbbe91c2c88f895673c7;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 43c46f7..e1f5bc5 100644
--- a/AST.icl
+++ b/AST.icl
@@ -51,6 +51,8 @@ printStatements [s:ss] i = (case s of
 
 instance print VarDecl where
 	print (VarDecl _ t i e) = maybe ["var"] print t ++ [" ":i:"=":print e] ++ [";"]
+instance toString VarDecl where
+    toString v = concat (print v) 
 
 instance toString Type where
 	toString t = concat $ print t
@@ -63,7 +65,7 @@ instance print Type where
 	print BoolType = print "Bool"
 	print CharType = print "Char"
     print VoidType = print "Void"
-    print (t1 ->> t2) = print t1 ++ [" -> ":print t2]
+    print (t1 ->> t2) = ["(":print t1 ++ [" -> ":print t2]] ++ [")"]
 
 instance print String where
 	print s = [s]
@@ -73,9 +75,11 @@ instance print FieldSelector where
 	print FieldTl = print "tl"
 	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]
+	print (VarDef i fs) = printersperse "." [i:printersperse "" fs]
 
 instance toString Op2 where
 	toString o = case o of
@@ -84,6 +88,10 @@ instance toString Op2 where
 		BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
 		BiAnd = "&&"; BiOr = "||"; BiCons = ":"
 
+instance toString Op1 where
+    toString UnNegation = "!"
+    toString UnMinus = "-"
+
 instance print Expr where
 	print (VarExpr _ vd) = print vd
 	print (Op2Expr _ e1 o e2) = ["(":print e1] ++ 
@@ -101,6 +109,8 @@ instance print Expr where
 	print (FunExpr _ id as fs) = printFunCall id as ++ printSelectors fs
 	print (EmptyListExpr _) = ["[]"]
 	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+instance toString Expr where
+    toString e = concat $ print e
 
 printSelectors :: [FieldSelector] -> [String]
 printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
@@ -110,3 +120,14 @@ printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
 
 derive gEq Op2
 instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
+
+instance zero Pos where
+	zero = {line=0, col=0}
+
+derive gEq Op1
+instance == Op1 where (==) o1 o2 = gEq{|*|} o1 o2
+instance < Op2 where (<) o1 o2 = toString o1 < toString o2
+instance < Op1 where (<) o1 o2 = toString o1 < toString o2
+
+derive gEq Type
+instance == Type where (==) t1 t2 = gEq{|*|} t1 t2
\ No newline at end of file