Fix sequence matching. #669
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
|
Unintentionally fixed #656. |
Even if an explicit outer accessor was a method, it got a TermRef as type.
|
I believe we have some issue with partest here. I can locally reproduce partest failure on the local machine. Though I cannot reproduce it if I directly use class files that partest generated: If I go to the directory with class files compiled by partest and execute the very same command that partest did: The test runs correctly. |
If an inner class has proxy fields, we missed so far the assignment sfrom the proxy parameters in the primary constructor of the class to the proxy fields. Test case tries several variations of this.
|
When I try manually it I get the same error as partest. |
They used to be discoverable using repeatedType, but ElimRepeated eliminates it. Instead I'm using internal synthetic Typed nodes name, similar to how it's done for non-star Wildcards. This makes handling Wildcards and Wildacard_Star more symmetric in patmat.
Call drop method directly if class derives from sequence. I do not understand how callRuntime works in scalac. Calling this method requires implicit search.
Was also fixed in this PR.
DarkDimius
force-pushed
the
fix-patmat-seq
branch
from
c26b336 to
d3819ce
Compare
| @@ -136,7 +136,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {thisTrans | |||
| def callDirect = tgt.select(nme.drop).appliedTo(Literal(Constant(n))) | |||
| def callRuntime = ref(defn.traversableDropMethod).appliedTo(tgt, Literal(Constant(n))) | |||
|
|
|||
| def needsRuntime = tgt.tpe derivesFrom defn.SeqClass /*typeOfMemberNamedDrop(tgt.tpe) == NoType*/ | |||
| def needsRuntime = !(tgt.tpe derivesFrom defn.SeqClass) /*typeOfMemberNamedDrop(tgt.tpe) == NoType*/ | |||
There was a problem hiding this comment.
Redundant parens around the expression.
There was a problem hiding this comment.
Sorry, I was myopic here. All's good.
|
Otherwise LGTM. |
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.
@odersky please review.
Fixes #660