X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=AST.icl;h=774e158ef5f9d774ad0dd355ce520243d009e6e7;hb=74b900cf6db033a51e177f7f85d835dae44217e5;hp=26686b2a4c9dc373f5082cdf9fe987c477196396;hpb=43f59bf00c11cfbeee906b16063abfca6f4c09cc;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 26686b2..774e158 100644
--- a/AST.icl
+++ b/AST.icl
@@ -36,7 +36,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 +51,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 +65,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 +76,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]
@@ -102,24 +107,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
 
-instance < Op2 where
-    (<) o1 o2 = (toString o1) < (toString o2)
-
-instance < Op1 where
-    (<) o1 o2 = (toString o1) < (toString o2)
\ No newline at end of file
+derive gEq Type
+instance == Type where (==) t1 t2 = gEq{|*|} t1 t2