Ontwerpbesluit toegevoegd dat functies pas na decla beschikbaar zijn

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index 70c1282..5173c4c 100644 (file)
--- a/AST.icl
+++ b/AST.icl
@@ -6,6 +6,10 @@ 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 (
@@ -47,13 +51,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 +65,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]
@@ -72,20 +77,26 @@ instance print FieldSelector where
        print FieldSnd = print "snd"
        print FieldFst = print "fst"
 
+instance toString FieldSelector where
+    toString fs = concat $ print fs
+
 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] ++ [")"]
@@ -99,3 +110,7 @@ instance print Expr where
        print (FunExpr _ fc) = print fc
        print (EmptyListExpr _) = ["[]"]
        print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+
+derive gEq Op2, Type
+instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
+instance == Type where (==) o1 o2 = gEq{|*|} o1 o2