Type inference for functions works YAAAY

[cc1516.git] / AST.icl

diff --git a/AST.icl b/AST.icl
index 26686b2..ae4934f 100644 (file)
--- a/AST.icl
+++ b/AST.icl
@@ -73,6 +73,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]
@@ -105,6 +107,8 @@ instance print Expr where
        print (FunExpr _ id as fs) = printFunCall id as ++ printSelectors 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]
@@ -115,11 +119,13 @@ 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
 
-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
\ No newline at end of file