Support Scala 2.12 Mixins #2685
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
In compiler/test/dotc/tests.scala there is a reference to LinkScala2ImplClasses.scala that needs to be renamed. |
senia-psm
reviewed
Jun 6, 2017
| @@ -399,9 +399,15 @@ object Flags { | |||
| /** A module variable (Scala 2.x only) */ | |||
| final val Scala2ModuleVar = termFlag(57, "<modulevar>") | |||
|
|
|||
| /** A Scala 2.12 trait that has been augmented with static members */ | |||
| final val Scala_2_12_Augmented = typeFlag(57, "<scala12augmented") | |||
There was a problem hiding this comment.
I don't know the convention about type flag names, but this is the only one with <, but without >.
Should it be <scala12augmented> instead?
senia-psm
reviewed
Jun 6, 2017
| @@ -734,7 +734,7 @@ object Denotations { | |||
| this | |||
| case _ => | |||
| if (coveredInterval.containsPhaseId(ctx.phaseId)) { | |||
| if (ctx.debug) ctx.traceInvalid(this) | |||
| if (ctx.debug || true) ctx.traceInvalid(this) | |||
There was a problem hiding this comment.
Good catches, thanks!
Speed up construction and testing of base class sets. Use a linear search with automatic bubbling up of hits.
Adapt to either 2.11 or 2.12 scheme.
Don't mention ImplClasses in the name since they do not exist in the scheme for 2.12.
odersky
force-pushed
the
add-scala12-mixins-v2
branch
from
f43ee97 to
f521a5a
Compare
DarkDimius
reviewed
Jun 14, 2017
| @@ -70,26 +70,29 @@ object Mode { | |||
| /** We are currently unpickling Scala2 info */ | |||
| val Scala2Unpickling = newMode(13, "Scala2Unpickling") | |||
|
|
|||
| /** We are currently unpickling from Java 8 or higher */ | |||
| val Java8Unpickling = newMode(14, "Java8Unpickling") | |||
There was a problem hiding this comment.
it would be nice to leave a note that it is used as heuristic to find scala 2.12
|
Otherwise LGTM. |
DarkDimius
approved these changes
Jun 14, 2017
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.
This PR is a first step to Scala 2.12 support from Dotty. It makes it possible for Dotty to extend traits compiled with Scala 2.12.