hoi

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index b9b9417..43c46f7 100644 (file)
--- a/AST.icl
+++ b/AST.icl
@@ -6,14 +6,13 @@ from Data.List import map, intercalate, replicate, flatten, isEmpty
 from Data.Func import $
 from Text import class Text(concat), instance Text String
 from Data.Maybe import :: Maybe, maybe
+import GenEq
 
 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]
 
@@ -37,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
@@ -51,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
@@ -63,7 +62,6 @@ 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]
 
@@ -79,17 +77,17 @@ instance print FieldSelector where
 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] ++ [")"]
-
-instance print Expr where
-       print (VarExpr _ vd) = print vd
-       print (Op2Expr _ e1 o e2) = ["(":print e1] ++ [" ",case o of
+instance toString Op2 where
+       toString o = case o of
                BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
                BiMod = "%"; BiEquals = "=="; BiLesser = "<"; BiGreater = ">"
                BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
                BiAnd = "&&"; BiOr = "||"; BiCons = ":"
-               ," ":print e2] ++ [")"]
+
+instance print Expr where
+       print (VarExpr _ vd) = print vd
+       print (Op2Expr _ e1 o e2) = ["(":print e1] ++ 
+               [" ",toString o, " ":print e2] ++ [")"]
        print (Op1Expr _ o e) = ["(",case o of
                UnNegation = "!"; UnMinus = "-"
                :print e] ++ [")"]
@@ -100,6 +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