nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Ballz improvements
[nit.git]
/
src
/
pretty.nit
diff --git
a/src/pretty.nit
b/src/pretty.nit
index
67b67ca
..
d55e248
100644
(file)
--- a/
src/pretty.nit
+++ b/
src/pretty.nit
@@
-1063,7
+1063,7
@@
redef class AExternCalls
v.adds
v.visit_list n_extern_calls
else
v.adds
v.visit_list n_extern_calls
else
- v.addn
+ v.forcen
v.indent += 1
v.addt
v.indent -= 1
v.indent += 1
v.addt
v.indent -= 1
@@
-1163,7
+1163,7
@@
redef class TExternCodeSegment
v.add "`\{"
if not lines.first.trim.is_empty then
v.add "`\{"
if not lines.first.trim.is_empty then
- v.addn
+ v.forcen
lines.first.l_trim
v.indent += 1
v.addt
lines.first.l_trim
v.indent += 1
v.addt
@@
-1240,7
+1240,7
@@
redef class AIfExpr
v.adds
else
v.visit n_expr
v.adds
else
v.visit n_expr
- v.addn
+ v.forcen
v.addt
end
v.addt
end
@@
-1582,11
+1582,11
@@
redef class ACallExpr
v.visit_recv n_expr
if not n_expr isa AImplicitSelfExpr and not can_inline then
v.visit_recv n_expr
if not n_expr isa AImplicitSelfExpr and not can_inline then
- v.addn
+ v.forcen
v.addt
end
v.addt
end
- v.visit n_id
+ v.visit n_qid
if not n_args.n_exprs.is_empty then
if is_stmt and n_args.n_exprs.length == 1 then
if not n_args.n_exprs.is_empty then
if is_stmt and n_args.n_exprs.length == 1 then
@@
-1607,7
+1607,7
@@
end
redef class ACallAssignExpr
redef fun accept_pretty_printer(v) do
v.visit_recv n_expr
redef class ACallAssignExpr
redef fun accept_pretty_printer(v) do
v.visit_recv n_expr
- v.visit n_id
+ v.visit n_qid
if not n_args.n_exprs.is_empty then
v.consume "("
if not n_args.n_exprs.is_empty then
v.consume "("
@@
-1625,7
+1625,7
@@
end
redef class ACallReassignExpr
redef fun accept_pretty_printer(v) do
v.visit_recv n_expr
redef class ACallReassignExpr
redef fun accept_pretty_printer(v) do
v.visit_recv n_expr
- v.visit n_id
+ v.visit n_qid
if not n_args.n_exprs.is_empty then
v.consume "("
if not n_args.n_exprs.is_empty then
v.consume "("
@@
-1727,17
+1727,17
@@
redef class ANewExpr
v.adds
v.visit n_type
v.adds
v.visit n_type
- if n_id != null then
+ if n_qid != null then
v.consume "."
if not can_inline then
v.consume "."
if not can_inline then
- v.addn
+ v.forcen
v.indent += 1
v.addt
v.indent -= 1
end
v.indent += 1
v.addt
v.indent -= 1
end
- v.visit n_id
+ v.visit n_qid
end
v.visit_args n_args.n_exprs
end
v.visit_args n_args.n_exprs
@@
-1849,7
+1849,7
@@
redef class AAssertExpr
else
v.addt
v.visit n_else
else
v.addt
v.visit n_else
- v.addn
+ v.forcen
v.indent -= 1
v.addt
v.add "end"
v.indent -= 1
v.addt
v.add "end"
@@
-1977,7
+1977,7
@@
private class ABinOpHelper
v.adds
v.visit bin_expr2
else
v.adds
v.visit bin_expr2
else
- v.addn
+ v.forcen
v.indent += 1
v.addt
v.indent -= 1
v.indent += 1
v.addt
v.indent -= 1
@@
-2044,16
+2044,9
@@
end
# Syntax
# Syntax
-redef class AUplusExpr
- redef fun accept_pretty_printer(v) do
- v.consume "+"
- v.visit n_expr
- end
-end
-
-redef class AUminusExpr
+redef class AUnaryopExpr
redef fun accept_pretty_printer(v) do
redef fun accept_pretty_printer(v) do
- v.consume "-"
+ v.visit n_op
v.visit n_expr
end
end
v.visit n_expr
end
end