Partially fix Java interop for emitted inner classes #1894
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
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jan 11, 2017
It does not compile with dotty because of scala#1894 and lampepfl/scala#4
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jan 11, 2017
It does not compile with dotty because of scala#1894 and lampepfl/scala#4
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jan 11, 2017
It does not compile with dotty because of scala#1894 and lampepfl/scala#4
DarkDimius
previously requested changes
Jan 11, 2017
| @@ -560,7 +560,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma | |||
| def javaBinaryName: Name = toDenot(sym).fullNameSeparated("/") // addModuleSuffix(fullNameInternal('/')) | |||
| def javaClassName: String = toDenot(sym).fullName.toString// addModuleSuffix(fullNameInternal('.')).toString | |||
| def name: Name = sym.name | |||
| def rawname: Name = sym.name // todo ???? | |||
| def rawname: Name = sym.name(ctx.withPhase(ctx.flattenPhase)) | |||
There was a problem hiding this comment.
should be initial phase, instead of flatten.
The backend uses `rawname` to define the "inner name" of an InnerClass entry in a classfile, this should be the simple name of the class before any mangling takes place. Fixing this allows Java code to reference dotty inner classes, except if they're defined in objects which is still broken until lampepfl/scala#4 is merged and a new backend is published.
smarter
force-pushed
the
fix/inner-class-emission
branch
from
755abf7 to
50268a1
Compare
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.
The backend uses
rawnameto define the "inner name" of an InnerClassentry in a classfile, this should be the simple name of the class before
any mangling takes place but before this commit, we put the mangled name
after flatten there.
Fixing this allows Java code to reference dotty inner classes, except if
they're defined in objects which is still broken until
lampepfl/scala#4 is merged and a new backend
is published.
Review by @DarkDimius