X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=305e8f375050ce9d1cf87227f6161d6cc320dac1;hb=3e6f3b020114be9550bb5893874fdb40b86fa2de;hp=70c12829eccbc6103ae57dab63a156afa4da0395;hpb=f297ddf3ea579fcafe3111510b385da1ba150a89;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 70c1282..305e8f3 100644
--- a/AST.icl
+++ b/AST.icl
@@ -6,11 +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]
 
@@ -34,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 fs) = indent i $ printFunCall ident args fs ++ [";\n"]
 	(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
 	) ++ printStatements ss i
 	where
@@ -47,12 +49,13 @@ 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) = maybe ["var"] print t ++ [" ":i:"=":print e] ++ [";"]
+instance toString VarDecl where
+    toString v = concat (print v) 
+
+instance toString Type where
+	toString t = concat $ print t
 
 instance print Type where
 	print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
@@ -61,7 +64,8 @@ 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]] ++ [")"]
 
 instance print String where
 	print s = [s]
@@ -71,21 +75,27 @@ instance print FieldSelector where
 	print FieldTl = print "tl"
 	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] ++ [")"]
+	print (VarDef i fs) = printersperse "." [i:printersperse "" fs]
 
-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 toString Op1 where
+    toString UnNegation = "!"
+    toString UnMinus = "-"
+
+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] ++ [")"]
@@ -96,6 +106,29 @@ 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 fs
 	print (EmptyListExpr _) = ["[]"]
 	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+instance toString Expr where
+    toString e = concat $ print e
+
+printSelectors :: [FieldSelector] -> [String]
+printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
+
+printFunCall :: String [Expr] [FieldSelector] -> [String]
+printFunCall s args fs = [s, "(":printersperse "," args] ++ [")"] ++
+	printSelectors fs
+
+derive gEq Op2
+instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
+
+instance zero Pos where
+	zero = {line=0, col=0}
+
+derive gEq Op1
+instance == Op1 where (==) o1 o2 = gEq{|*|} o1 o2
+instance < Op2 where (<) o1 o2 = toString o1 < toString o2
+instance < Op1 where (<) o1 o2 = toString o1 < toString o2
+
+derive gEq Type
+instance == Type where (==) t1 t2 = gEq{|*|} t1 t2