Decompile while loops and remove empty packages #4250
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
decompile-while-loops
branch
2 times, most recently
from
0f8fe6f to
2d862bc
Compare
nicolasstucki
force-pushed
the
decompile-while-loops
branch
from
2d862bc to
af822e1
Compare
allanrenucci
approved these changes
Apr 5, 2018
| @@ -40,6 +49,12 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) { | |||
| decl ~~ typeText(nameIdText(tree)) ~ withEnclosingDef(tree) { toTextTemplate(impl) } ~ "" | |||
| } | |||
|
|
|||
| override protected def toTextTemplate(impl: Template, ofNew: Boolean = false): Text = { | |||
| val Template(constr, parents, self, preBody) = impl | |||
| val impl1 = Template(constr, parents.filterNot(_.symbol.maybeOwner == defn.ObjectClass), self, preBody) | |||
There was a problem hiding this comment.
val impl1 = impl.copy(parents = impl1.parents.filterNot(_.symbol.maybeOwner == defn.ObjectClass))| @@ -29,8 +36,10 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) { | |||
| case _ => toTextGlobal(stats, "\n") | |||
| } | |||
| val bodyText = | |||
| if (currentPrecedence == TopLevelPrec) "\n" ~ statsText else " {" ~ statsText ~ "}" | |||
| keywordStr("package ") ~ toTextPackageId(tree.pid) ~ bodyText | |||
| if (tree.pid.symbol.isEmptyPackage) statsText | |||
There was a problem hiding this comment.
Isn't this case redundant since you discard it on line 42 if tree.pid.symbol.isEmptyPackage?
There was a problem hiding this comment.
The body is the only part that is not discarded
| if (tree.pid.symbol.isEmptyPackage) statsText | ||
| else if (currentPrecedence == TopLevelPrec) "\n" ~ statsText | ||
| else " {" ~ statsText ~ "}" | ||
| (keywordStr("package ") ~ toTextPackageId(tree.pid)).provided(!tree.pid.symbol.isEmptyPackage) ~ bodyText |
There was a problem hiding this comment.
tree.pid.symbol same as tree.symbol?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.