SI-7877 Only look for unapplies in term trees #2992
Merged
Conversation
This file contains 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
| @@ -3245,7 +3245,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper | |||
| if (!tree.isErrorTyped) setError(tree) else tree | |||
| // @H change to setError(treeCopy.Apply(tree, fun, args)) | |||
|
|
|||
| case ExtractorType(unapply) if mode.inPatternMode => | |||
| case ExtractorType(unapply) if mode.inPatternMode && fun.isTerm => | |||
There was a problem hiding this comment.
How about integrating this check into ExtractorType?
There was a problem hiding this comment.
Won't work: that's only considering the type, and the extra test must be made on the tree to exclude TypeTree(<C[T]>) but allow Ident("X") or <<RichSC(StringContext()).rx>>.
There was a problem hiding this comment.
Oh wow, didn't realize it's so complicated. Then how about renaming ExtractorType, so that it doesn't trick people into it being an ultimate authority? Something like HasUnapplyMember. Also a comment here most definitely will help.
Since Scala 2.10.2, the enclosed test case has crashed in the backend. Before, we correctly rejected this pattern match. My bisection landed at a merge commit f16f4ab, although both parents were good. So I don't quite trust that. I do think the regression stems from the changes to allow: case rx"AB(.+)" => Examples of this are in run/t7715.scala. This commit limits the search for extractors to cases where the function within the Apply is a term tree.
|
lgtm |
retronym
added a commit
that referenced
this pull request
Sep 27, 2013
Only look for unapplies in term trees
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.
Since Scala 2.10.2, the enclosed test case has crashed
in the backend. Before, we correctly rejected this pattern match.
My bisection landed at a merge commit f16f4ab, although both
parents were good. So I don't quite trust that.
I do think the regression stems from the changes to allow:
Examples of this are in run/t7715.scala.
This commit limits the search for extractors to cases where the
function within the Apply is a term tree.
Review by @xeno-by