betere gamma

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index 70c1282..b9b9417 100644 (file)
--- 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]