X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=90d1e53870967dedafb737a435ddae8f3477d668;hb=13a108705dbabbc75711ce9b3b29fe508262919f;hp=7b93acbe4170755986bdff0390bdff1412e5e802;hpb=302891ef956bd735780714742850947bf7588ce5;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 7b93acb..90d1e53 100644
--- a/AST.icl
+++ b/AST.icl
@@ -12,9 +12,7 @@ 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] ++
-		["\n":printersperse "\n" f])
+	toString (AST f) = concat ["\n":printersperse "\n" f]
 
 class print a :: a -> [String]
 
@@ -38,7 +36,7 @@ printStatements [s:ss] i = (case s of
 		[")":printCodeBlock dos i]
 	(AssStmt vardef val) =
 		indent i $ print vardef ++ ["=":print val] ++ [";\n"]
-	(FunStmt fc) = indent i $ print fc ++ [";\n"]
+	(FunStmt ident args) = indent i $ printFunCall ident args
 	(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
 	) ++ printStatements ss i
 	where
@@ -52,7 +50,7 @@ printStatements [s:ss] i = (case s of
 		indent i rest = replicate i "\t" ++ rest
 
 instance print VarDecl where
-	print (VarDecl _ t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
+	print (VarDecl _ t i e) = maybe ["var"] print t ++ [" ":i:"=":print e] ++ [";"]
 
 instance toString Type where
 	toString t = concat $ print t
@@ -64,9 +62,8 @@ instance print Type where
 	print IntType = print "Int"
 	print BoolType = print "Bool"
 	print CharType = print "Char"
-	print VarType = print "var"
     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]
@@ -77,14 +74,8 @@ 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] ++ [")"]
+	print (VarDef i fs) = printersperse "." [i:printersperse "" fs]
 
 instance toString Op2 where
 	toString o = case o of
@@ -107,9 +98,15 @@ instance print Expr where
 		c = if (c == toChar 7) "\\a" (toString c)
 		,"\'"]
 	print (BoolExpr _ b) = [toString b]
-	print (FunExpr _ fc) = print fc
+	print (FunExpr _ id as fs) = printFunCall id as ++ printSelectors fs
 	print (EmptyListExpr _) = ["[]"]
 	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
 
+printSelectors :: [FieldSelector] -> [String]
+printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
+
+printFunCall :: String [Expr] -> [String]
+printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
+
 derive gEq Op2
 instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2