repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:dopefishh/cc1516
[cc1516.git]
/
AST.icl
diff --git
a/AST.icl
b/AST.icl
index
7b93acb
..
3679b36
100644
(file)
--- a/
AST.icl
+++ b/
AST.icl
@@
-12,9
+12,7
@@
instance toString Pos where
toString {line,col} = concat [toString line, ":", toString col, " "]
instance toString AST where
toString {line,col} = concat [toString line, ":", toString col, " "]
instance toString AST where
- toString (AST v f) = concat (
- ["\n":printersperse "\n" v] ++
- ["\n":printersperse "\n" f])
+ toString (AST f) = concat ["\n":printersperse "\n" f]
class print a :: a -> [String]
class print a :: a -> [String]
@@
-38,7
+36,7
@@
printStatements [s:ss] i = (case s of
[")":printCodeBlock dos i]
(AssStmt vardef val) =
indent i $ print vardef ++ ["=":print val] ++ [";\n"]
[")":printCodeBlock dos i]
(AssStmt vardef val) =
indent i $ print vardef ++ ["=":print val] ++ [";\n"]
- (FunStmt
fc) = indent i $ print fc ++ [";\n"]
+ (FunStmt
ident args) = indent i $ printFunCall ident args
(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
) ++ printStatements ss i
where
(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
) ++ printStatements ss i
where
@@
-52,7
+50,7
@@
printStatements [s:ss] i = (case s of
indent i rest = replicate i "\t" ++ rest
instance print VarDecl where
indent i rest = replicate i "\t" ++ rest
instance print VarDecl where
- print (VarDecl _ t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
+ print (VarDecl _ t i e) =
maybe ["var"]
print t ++ [" ":i:"=":print e] ++ [";"]
instance toString Type where
toString t = concat $ print t
instance toString Type where
toString t = concat $ print t
@@
-64,9
+62,8
@@
instance print Type where
print IntType = print "Int"
print BoolType = print "Bool"
print CharType = print "Char"
print IntType = print "Int"
print BoolType = print "Bool"
print CharType = print "Char"
- print VarType = print "var"
print VoidType = print "Void"
print VoidType = print "Void"
- print (t1 ->> t2) =
print t1 ++ [" -> ":print t2
]
+ print (t1 ->> t2) =
["(":print t1 ++ [" -> ":print t2]] ++ [")"
]
instance print String where
print s = [s]
instance print String where
print s = [s]
@@
-77,14
+74,8
@@
instance print FieldSelector where
print FieldSnd = print "snd"
print FieldFst = print "fst"
print FieldSnd = print "snd"
print FieldFst = print "fst"
-instance toString FieldSelector where
- toString fs = concat $ print fs
-
instance print VarDef where
instance print VarDef where
- print (VarDef i fs) = printersperse "." [i:flatten $ map print fs]
-
-instance print FunCall where
- print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
+ print (VarDef i fs) = printersperse "." [i:printersperse "" fs]
instance toString Op2 where
toString o = case o of
instance toString Op2 where
toString o = case o of
@@
-93,6
+84,10
@@
instance toString Op2 where
BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
BiAnd = "&&"; BiOr = "||"; BiCons = ":"
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] ++
instance print Expr where
print (VarExpr _ vd) = print vd
print (Op2Expr _ e1 o e2) = ["(":print e1] ++
@@
-107,9
+102,23
@@
instance print Expr where
c = if (c == toChar 7) "\\a" (toString c)
,"\'"]
print (BoolExpr _ b) = [toString b]
c = if (c == toChar 7) "\\a" (toString c)
,"\'"]
print (BoolExpr _ b) = [toString b]
- print (FunExpr _
fc) = print fc
+ print (FunExpr _
id as fs) = printFunCall id as ++ printSelectors fs
print (EmptyListExpr _) = ["[]"]
print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
print (EmptyListExpr _) = ["[]"]
print (TupleExpr _ (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+printSelectors :: [FieldSelector] -> [String]
+printSelectors x = case x of [] = [""]; _ = [".":printersperse "." x]
+
+printFunCall :: String [Expr] -> [String]
+printFunCall s args = [s, "(":printersperse "," args] ++ [")"]
+
derive gEq Op2
instance == Op2 where (==) o1 o2 = gEq{|*|} o1 o2
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