curry gotcha

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index 305e8f3..24b0ac6 100644 (file)
--- a/AST.icl
+++ b/AST.icl
@@ -26,6 +26,9 @@ instance print FunDecl where
                ["{\n\t":printersperse "\n\t" vs] ++
                ["\n":printStatements ss 1] ++ ["}\n"]
 
+instance toString FunDecl where
+    toString fd = concat $ print fd
+
 printStatements :: [Stmt] Int -> [String]
 printStatements [] i = []
 printStatements [s:ss] i = (case s of
@@ -65,6 +68,7 @@ instance print Type where
        print BoolType = print "Bool"
        print CharType = print "Char"
     print VoidType = print "Void"
+    print (FuncType t) = ["(-> ":print t] ++ [")"]
     print (t1 ->> t2) = ["(":print t1 ++ [" -> ":print t2]] ++ [")"]
 
 instance print String where
@@ -109,11 +113,12 @@ instance print Expr where
        print (FunExpr _ id as fs) = printFunCall id as fs
        print (EmptyListExpr _) = ["[]"]
        print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+    print (LambdaExpr _ args e) = ["\\":args] ++ ["->": print e]
 instance toString Expr where
     toString e = concat $ print e
 
 printSelectors :: [FieldSelector] -> [String]
-printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
+printSelectors fs = ["."] ++ printersperse "." fs
 
 printFunCall :: String [Expr] [FieldSelector] -> [String]
 printFunCall s args fs = [s, "(":printersperse "," args] ++ [")"] ++