Simplify ClassfileParser#innerClasses#classSymbol #3813
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
Member
smarter
commented
Jan 11, 2018
smarter
commented
- Avoid redundant calls to get
- Fix indentation of getMember and add some brackets to make it clearer
allanrenucci
approved these changes
Jan 12, 2018
| val owner = classNameToSymbol(outerName) | ||
| val result = ctx.atPhaseNotLaterThan(ctx.typerPhase) { implicit ctx => | ||
| getMember(owner, innerName.toTypeName) | ||
| } |
There was a problem hiding this comment.
Simpler?
getMember(owner, innerName.toTypeName)(ctx.withPhaseNoLater(ctx.typerPhase))| } | ||
| assert(result ne NoSymbol, | ||
| i"""failure to resolve inner class: | ||
| |externalName = ${entry.externalName}, |
| } | ||
| } | ||
| else { | ||
| if (sym == classRoot.symbol) |
There was a problem hiding this comment.
You could reduce nesting:
if (isStatic(entry.jflags)) {
...
}
else if (sym == classRoot.symbol)
instanceScope.lookup(name)
else
sym.info.member(name).symbol
nicolasstucki
approved these changes
Jan 12, 2018
- Avoid redundant calls to get - Fix indentation of getMember and add some brackets to make it clearer
smarter
force-pushed
the
optimize-classfileparser
branch
from
1a1e932 to
3c0efe8
Compare
|
Comments addressed, thanks @allanrenucci ! |
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.