Fix #3847: Handle correctly splicing of (possibly) nested type parameters #4116
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
biboudis
force-pushed
the
fix-#3847-2
branch
2 times, most recently
from
c8affb6 to
f7b179c
Compare
|
You probably can uncomment this https://github.com/lampepfl/dotty/blob/master/tests/run-with-compiler/quote-lib.scala#L123 |
nicolasstucki
suggested changes
Mar 17, 2018
| val splicedType = tree.tpe.asInstanceOf[TypeRef].prefix.termSymbol | ||
| splice(ref(splicedType).select(tpnme.UNARY_~)) | ||
| case tree: TypeApply => | ||
| super.transform(tree) |
There was a problem hiding this comment.
I think we do not need this branch
There was a problem hiding this comment.
True! Not anymore!
| if (map.contains(tp)) | ||
| map.apply(tp) | ||
| else | ||
| mapOver(tp) |
There was a problem hiding this comment.
Shorter and more efficient:
override def apply(tp: Type): Type = map.getOrElse(tp, mapOver(tp))| } | ||
| } | ||
|
|
||
| Block(typeDefs ++ tagsExplicitTypeDefsPairs.map(_._2), |
There was a problem hiding this comment.
Isn't this just Block(typeDefs ++ explicitTypeDefs,?
|
Updated! Thanks for the review! |
nicolasstucki
approved these changes
Mar 20, 2018
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.
Based on #4081
The proposed fix handle the case when a type splice e.g.,
~tappears in possibly nested positions as a type parameter, e.g.,List[~t]andList[Array[~t]]. If the code included justList[T]andList[Array[T]]the types are extracted and added as tags using implicit search in the phase oftryHeal. This commit collects and handles spliced types as well, using the same mechanism as before.