Skip to content

Fix #2363: better handle extractors in exhaustivity check #2424

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.

Sign up for GitHub

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 11 commits into from
May 16, 2017
Merged

Fix #2363: better handle extractors in exhaustivity check #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
495ed99
Fix #2363: better handle extractors in exhaustivity check
liufengyun May 12, 2017
9453f6d
fix false positives in bootstrap
liufengyun May 14, 2017
9d1e94c
add missing @unchecked for `for` patmat
liufengyun May 15, 2017
9f8c089
Fix false warning about unreachable code in Dotty
liufengyun May 15, 2017
31ae57b
Fix #2429: fix true exhaustivity warnings
liufengyun May 15, 2017
20448c8
address review feedback
liufengyun May 15, 2017
30787e5
support option-less patmat as complete match
liufengyun May 15, 2017
61414c2
retract the option-less commit
liufengyun May 15, 2017
c569f23
address review feedback
liufengyun May 15, 2017
fc20768
fix typo in the comment
liufengyun May 15, 2017
1e695ea
use decorators to avoid toTypeName and toTermName
liufengyun May 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/ast/Desugar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ object desugar {
case IdPattern(named, tpt) =>
Function(derivedValDef(pat, named, tpt, EmptyTree, Modifiers(Param)) :: Nil, body)
case _ =>
makeCaseLambda(CaseDef(pat, EmptyTree, body) :: Nil, unchecked = false)
makeCaseLambda(CaseDef(pat, EmptyTree, body) :: Nil)
}

/** If `pat` is not an Identifier, a Typed(Ident, _), or a Bind, wrap
Expand Down
8 changes: 5 additions & 3 deletions compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,17 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
/* (Nil, body) means that `body` is the default case
* It's a bit hacky but it simplifies manipulations.
*/
def extractSwitchCase(treeMakers: List[TreeMaker]): (List[Int], BodyTreeMaker) = treeMakers match {
def extractSwitchCase(treeMakers: List[TreeMaker]): (List[Int], BodyTreeMaker) = (treeMakers: @unchecked) match {
// case 5 =>
case List(IntEqualityTestTreeMaker(intValue), body: BodyTreeMaker) =>
(List(intValue), body)

// case 5 | 6 =>
case List(AlternativesTreeMaker(_, alts, _), body: BodyTreeMaker) =>
val intValues = alts.map {
case List(IntEqualityTestTreeMaker(intValue)) => intValue
val intValues = alts.map { alt =>
(alt: @unchecked) match {
case List(IntEqualityTestTreeMaker(intValue)) => intValue
}
}
(intValues, body)

Expand Down
Loading