X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=305e8f375050ce9d1cf87227f6161d6cc320dac1;hb=3e6f3b020114be9550bb5893874fdb40b86fa2de;hp=e1f5bc57d1822da7863ca44a31e1bc434a6f467e;hpb=079fe4889a4220df26a7e86f1929967dbe427893;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index e1f5bc5..305e8f3 100644
--- a/AST.icl
+++ b/AST.icl
@@ -36,7 +36,7 @@ printStatements [s:ss] i = (case s of
 		[")":printCodeBlock dos i]
 	(AssStmt vardef val) =
 		indent i $ print vardef ++ ["=":print val] ++ [";\n"]
-	(FunStmt ident args) = indent i $ printFunCall ident args
+	(FunStmt ident args fs) = indent i $ printFunCall ident args fs ++ [";\n"]
 	(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
 	) ++ printStatements ss i
 	where
@@ -106,7 +106,7 @@ instance print Expr where
 		c = if (c == toChar 7) "\\a" (toString c)
 		,"\'"]
 	print (BoolExpr _ b) = [toString b]
-	print (FunExpr _ id as fs) = printFunCall id as ++ printSelectors fs
+	print (FunExpr _ id as fs) = printFunCall id as fs
 	print (EmptyListExpr _) = ["[]"]
 	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
 instance toString Expr where
@@ -115,8 +115,9 @@ instance toString Expr where
 printSelectors :: [FieldSelector] -> [String]
 printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
 
-printFunCall :: String [Expr] -> [String]
-printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
+printFunCall :: String [Expr] [FieldSelector] -> [String]
+printFunCall s args fs = [s, "(":printersperse "," args] ++ [")"] ++
+	printSelectors fs
 
 derive gEq Op2
 instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
@@ -130,4 +131,4 @@ 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
+instance == Type where (==) t1 t2 = gEq{|*|} t1 t2