X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=AST.icl;h=3679b36e811008c0e1addb1a7ecfbb4e6b5b26e5;hb=5573b4ce8215a277a82146a8dae4c4e7ef205bd8;hp=90d1e53870967dedafb737a435ddae8f3477d668;hpb=817af8de40d49db39dcf02ee5fe346f0d7b73118;p=cc1516.git

diff --git a/AST.icl b/AST.icl
index 90d1e53..3679b36 100644
--- a/AST.icl
+++ b/AST.icl
@@ -84,6 +84,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] ++ 
@@ -110,3 +114,11 @@ printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
 
 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