-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fix #3561: Correctly handle switches followed by other tests in matches #3724
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ba41139
Fix #3561: Correctly handle switches followed by other tests in matches
odersky a06ab12
Refine switch warning
odersky 27a8c34
Add switch warning test
odersky 4867326
Fix switch warning criterion
odersky df3a482
Fix tests to avoid new switch warnings
odersky 9191288
Clarify switch error message if there are too few cases
odersky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
class Test { | ||
val Constant = 'Q' // OK if final | ||
def tokenMe(ch: Char) = (ch: @annotation.switch) match { // error: could not emit switch | ||
case ' ' => 1 | ||
case 'A' => 2 | ||
case '5' | Constant => 3 | ||
case '4' => 4 | ||
} | ||
|
||
def test2(x: Any) = (x: @annotation.switch) match { // error: could not emit switch | ||
case ' ' => 1 | ||
case 'A' => 2 | ||
case '5' | Constant => 3 | ||
case '4' => 4 | ||
} | ||
|
||
def test3(x: Any) = (x: @annotation.switch) match { // error: could not emit switch - too few cases | ||
case 1 => 1 | ||
case 2 => 2 | ||
case x: String => 4 | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
class Test { | ||
val Constant = 'Q' // OK if final | ||
def tokenMe(ch: Char) = (ch: @annotation.switch) match { | ||
case ' ' => 1 | ||
case 'A' => 2 | ||
case '5' | Constant => 3 | ||
} | ||
|
||
def test2(x: Any) = x match { | ||
case 1 => 1 | ||
case 2 => 2 | ||
case 3 => 3 | ||
case x: String => 4 | ||
} | ||
} |
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
scalac supports emitting switch when cases contain conditions, it translates something like:
to
Is this an intended limitation of Dotty
@switch
, or something that still needs to be implemented?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was supposed to go in the local optimizations. I made an implementation of this a while ago but I do not know if it went into Dotty or just stayed in the linker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would make sense to have it by default. Could you open an issue so we keep track of it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Turns out there's already one: #1313