Handle some explicit paths in quotes #8113
Closed
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
force-pushed
the
fix-#8100
branch
from
5415988 to
fc373e5
Compare
nicolasstucki
changed the title
liufengyun
reviewed
Feb 10, 2020
| @@ -7,7 +7,7 @@ object Unpickler { | |||
|
|
|||
| type PickledQuote = List[String] | |||
| type PickledExprArgs = Seq[Seq[Any] => ((QuoteContext ?=> Expr[Any]) | Type[_])] | |||
| type PickledTypeArgs = Seq[Seq[Any] => Type[_]] | |||
| type PickledTypeArgs = Seq[Seq[Any] => ((QuoteContext ?=> Expr[Any]) | Type[_])] | |||
There was a problem hiding this comment.
Can we simplify to only keep PickledArgs, as PickledExprArgs and PickledTypeArgs now have the same definition.
There was a problem hiding this comment.
Yes, but there are some bootstrapping constraints.
| @@ -179,6 +183,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages( | |||
| case tp: TypeRef => | |||
| if levelOf(sym).getOrElse(0) < level then tryHeal(sym, tp, pos) | |||
| else None | |||
| case _: TermRef if ctx.mode.is(Mode.Type) && levelOf(sym).getOrElse(0) >= level => None | |||
There was a problem hiding this comment.
Will it be an issue, if it's used in pattern matching, e.g. case _: p.T? Or, t.asInstanceOf[p.T] can also be problematic.
| @@ -100,7 +104,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages( | |||
| case Some(tpRef) => tpRef | |||
| case _ => tree | |||
| } | |||
| case _: TypeTree | _: AppliedTypeTree | _: Apply | _: TypeApply | _: UnApply | Select(_, OuterSelectName(_, _)) => | |||
| case _: TypeTree | _: AppliedTypeTree | _: Apply | _: UnApply | Select(_, OuterSelectName(_, _)) => | |||
| tree.withType(checkTp(tree.tpe)) | |||
|
Replaced with #8796 |
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.
Towards fixing #8100
This is an extension of #7682 that handles path-dependent types used in lower levels.