nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: update sav/nitserial_args1.res because change in RTA
[nit.git]
/
src
/
pretty.nit
diff --git
a/src/pretty.nit
b/src/pretty.nit
index
f037479
..
e4d848d
100644
(file)
--- a/
src/pretty.nit
+++ b/
src/pretty.nit
@@
-121,6
+121,7
@@
class PrettyPrinterVisitor
# Is the node inlinable and can fit on the line.
fun can_inline(n: nullable ANode): Bool do
if n == null then return true
# Is the node inlinable and can fit on the line.
fun can_inline(n: nullable ANode): Bool do
if n == null then return true
+ if no_inline and n.location.line_start != n.location.line_end then return false
if n.must_be_inline then return true
if n.must_be_block then return false
# check length
if n.must_be_inline then return true
if n.must_be_block then return false
# check length
@@
-284,6
+285,9
@@
class PrettyPrinterVisitor
# Do we force the deletion of empty lines?
var skip_empty = false is public writable
# Do we force the deletion of empty lines?
var skip_empty = false is public writable
+
+ # Disable automatic inlining.
+ var no_inline = false is writable
end
# Base framework redefs
end
# Base framework redefs
@@
-1059,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
@@
-1159,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
@@
-1236,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
@@
-1578,7
+1582,7
@@
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
@@
-1727,7
+1731,7
@@
redef class ANewExpr
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
v.indent += 1
v.addt
v.indent -= 1
@@
-1845,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"
@@
-1973,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
@@
-2040,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