repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added function type inference
[cc1516.git]
/
AST.icl
diff --git
a/AST.icl
b/AST.icl
index
b5f8ca0
..
5173c4c
100644
(file)
--- a/
AST.icl
+++ b/
AST.icl
@@
-6,6
+6,7
@@
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
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 Pos where
toString {line,col} = concat [toString line, ":", toString col, " "]
@@
-85,14
+86,17
@@
instance print VarDef where
instance print FunCall where
print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
instance print FunCall where
print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
-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 = ":"
BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
BiMod = "%"; BiEquals = "=="; BiLesser = "<"; BiGreater = ">"
BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
BiAnd = "&&"; BiOr = "||"; BiCons = ":"
- ," ":print e2] ++ [")"]
+
+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] ++ [")"]
print (Op1Expr _ o e) = ["(",case o of
UnNegation = "!"; UnMinus = "-"
:print e] ++ [")"]
@@
-106,3
+110,7
@@
instance print Expr where
print (FunExpr _ fc) = print fc
print (EmptyListExpr _) = ["[]"]
print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
print (FunExpr _ fc) = print fc
print (EmptyListExpr _) = ["[]"]
print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+
+derive gEq Op2, Type
+instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
+instance == Type where (==) o1 o2 = gEq{|*|} o1 o2