Working Monad transformer except for Clean not finding an existing instance

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index 6023056..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] ++
@@ -18,7 +21,7 @@ printersperse :: String [a] -> [String] | print a
 printersperse i j = intercalate [i] (map print j)
 
 instance print FunDecl where
-       print (FunDecl i as t vs ss) =
+       print (FunDecl _ i as t vs ss) =
                ["\n", i, " (":printersperse "," as] ++
                [")"] ++ maybe [] (\tt->[" :: ":print tt]) t ++
                ["{\n\t":printersperse "\n\t" vs] ++
@@ -47,12 +50,11 @@ 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] ++ [";"]
+       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] ++ [")"]
@@ -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]
@@ -79,23 +83,23 @@ instance print FunCall where
        print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
 
 instance print Expr where
-       print (VarExpr vd) = print vd
-       print (Op2Expr e1 o e2) = ["(":print e1] ++ [" ",case o of
+       print (VarExpr _ vd) = print vd
+       print (Op2Expr _ e1 o e2) = ["(":print e1] ++ [" ",case o of
                BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
-               BiMod = "%"; BiEquals = "="; BiLesser = "<"; BiGreater = ">"
+               BiMod = "%"; BiEquals = "=="; BiLesser = "<"; BiGreater = ">"
                BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
                BiAnd = "&&"; BiOr = "||"; BiCons = ":"
                ," ":print e2] ++ [")"]
-       print (Op1Expr o e) = ["(",case o of
+       print (Op1Expr _ o e) = ["(",case o of
                UnNegation = "!"; UnMinus = "-"
                :print e] ++ [")"]
-       print (IntExpr i) = [toString i]
-       print (CharExpr c) = ["\'", case c of
+       print (IntExpr _ i) = [toString i]
+       print (CharExpr _ c) = ["\'", case c of
                '\b' = "\\b"; '\f' = "\\f"; '\n' = "\\n"
                '\r' = "\\r"; '\t' = "\\t"; '\v' = "\\v"
                c = if (c == toChar 7) "\\a" (toString c)
                ,"\'"]
-       print (BoolExpr b) = [toString b]
-       print (FunExpr fc) = print fc
-       print EmptyListExpr = ["[]"]
-       print (TupleExpr (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+       print (BoolExpr _ b) = [toString b]
+       print (FunExpr _ fc) = print fc
+       print (EmptyListExpr _) = ["[]"]
+       print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]