X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.icl;h=d2d1a95c6103afe1203f35e664cd3123755ff234;hb=c5fb28639ae923d9b55f5832e45186911e610991;hp=6f2e5c63a50b3c5d406a01c46d5c235314e3630d;hpb=220cb1cc56feab3f818503838b3afd7ea2225403;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 6f2e5c6..d2d1a95 100644
--- a/AST.icl
+++ b/AST.icl
@@ -26,6 +26,9 @@ instance print FunDecl where
 		["{\n\t":printersperse "\n\t" vs] ++
 		["\n":printStatements ss 1] ++ ["}\n"]
 
+instance toString FunDecl where
+    toString fd = concat $ print fd
+
 printStatements :: [Stmt] Int -> [String]
 printStatements [] i = []
 printStatements [s:ss] i = (case s of
@@ -36,7 +39,7 @@ printStatements [s:ss] i = (case s of
 		[")":printCodeBlock dos i]
 	(AssStmt vardef val) =
 		indent i $ print vardef ++ ["=":print val] ++ [";\n"]
-	(FunStmt ident args) = indent i $ printFunCall ident args
+	(FunStmt ident args fs) = indent i $ printFunCall ident args fs ++ [";\n"]
 	(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
 	) ++ printStatements ss i
 	where
@@ -51,6 +54,8 @@ printStatements [s:ss] i = (case s of
 
 instance print VarDecl where
 	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
@@ -63,6 +68,7 @@ instance print Type where
 	print BoolType = print "Bool"
 	print CharType = print "Char"
     print VoidType = print "Void"
+    print (FuncType t) = ["(-> ":print t] ++ [")"]
     print (t1 ->> t2) = ["(":print t1 ++ [" -> ":print t2]] ++ [")"]
 
 instance print String where
@@ -73,6 +79,8 @@ 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:printersperse "" fs]
@@ -84,6 +92,10 @@ instance toString Op2 where
 		BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
 		BiAnd = "&&"; BiOr = "||"; BiCons = ":"
 
+instance toString Op1 where
+    toString UnNegation = "!"
+    toString UnMinus = "-"
+
 instance print Expr where
 	print (VarExpr _ vd) = print vd
 	print (Op2Expr _ e1 o e2) = ["(":print e1] ++ 
@@ -98,18 +110,30 @@ instance print Expr where
 		c = if (c == toChar 7) "\\a" (toString c)
 		,"\'"]
 	print (BoolExpr _ b) = [toString b]
-	print (FunExpr _ id as fs) = printFunCall id as ++ printSelectors fs
+	print (FunExpr _ id as fs) = printFunCall id as fs
 	print (EmptyListExpr _) = ["[]"]
 	print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+    print (LambdaExpr _ args e) = ["\\":args] ++ ["->": print e]
+instance toString Expr where
+    toString e = concat $ print e
 
 printSelectors :: [FieldSelector] -> [String]
-printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
+printSelectors fs = printersperse "." fs
 
-printFunCall :: String [Expr] -> [String]
-printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
+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