Avoid printing extra blocks and inline nodes #5510
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolasstucki
changed the title
nicolasstucki
force-pushed
the
avoid-printing-nested-empty-blocks
branch
from
5fe2c2c to
ca35eee
Compare
nicolasstucki
force-pushed
the
avoid-printing-nested-empty-blocks
branch
10 times, most recently
from
e74e9d4 to
52dddce
Compare
nicolasstucki
force-pushed
the
avoid-printing-nested-empty-blocks
branch
from
52dddce to
0bc7db4
Compare
|
Rebased |
nicolasstucki
requested review from
allanrenucci
and removed request for
OlivierBlanvillain and
allanrenucci
Avoid printing extra blocks and inline nodes
nicolasstucki
force-pushed
the
avoid-printing-nested-empty-blocks
branch
from
0bc7db4 to
0dc0587
Compare
|
Rebased |
liufengyun
approved these changes
Dec 6, 2018
| case IsValDef(tree) => !tree.symbol.flags.isObject | ||
| case _ => true | ||
| } | ||
| printFlatBlock(stats, expr) |
There was a problem hiding this comment.
The code seems to have forgotten the case implicit object A.
| extractFlatStats(it.next()) | ||
| val flatExpr = extractFlatExpr(expr) | ||
| (flatStats.result(), flatExpr) | ||
| } |
There was a problem hiding this comment.
Code smell for flatBlock: is there a way to simplify the code and logic?
| val init :+ last = stats2 | ||
| (init, last) | ||
| case _ => (stats2, expr1) | ||
| } |
There was a problem hiding this comment.
The Remove Term.Lambda logic seems to belong to somewhere else .
There was a problem hiding this comment.
For the decompiler, Term.Lambda are no-op/no-print trees that must be removed from the blocks. We need to remove them here because they might affect the block flattening.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Avoid printing extra blocks and inline nodes