diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-28 05:29:09 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-28 05:29:09 -0700 |
| commit | 6da73dd38d6dd7d8b463520bf54fc79975afc2a0 (patch) | |
| tree | 60b381e92051e22abaf3c98f5e88de3ca6910d7b /src/compiler | |
| parent | ac3fdfddb64a93a17f414e34692b2fd86e7f4746 (diff) | |
| parent | 7d0fdb37f4ae4555a51e13b17cca3e8ec94dd9d1 (diff) | |
| download | scala-6da73dd38d6dd7d8b463520bf54fc79975afc2a0.tar.gz scala-6da73dd38d6dd7d8b463520bf54fc79975afc2a0.tar.bz2 scala-6da73dd38d6dd7d8b463520bf54fc79975afc2a0.zip | |
Merge pull request #635 from adriaanm/topic/virtpatmat
fixes for exhaustivity
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index 4d66fb5617..b36a92a186 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -1457,6 +1457,9 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL def binderToUniqueTree(b: Symbol) = unique(accumSubst(normalize(CODE.REF(b))), b.tpe) + @inline def /\(conds: Iterable[Cond]) = if (conds.isEmpty) Top else conds.reduceLeft(AndCond(_, _)) + @inline def \/(conds: Iterable[Cond]) = if (conds.isEmpty) Havoc else conds.reduceLeft(OrCond(_, _)) + // note that the sequencing of operations is important: must visit in same order as match execution // binderToUniqueTree uses the type of the first symbol that was encountered as the type for all future binders def treeMakerToCond(tm: TreeMaker): Cond = { @@ -1475,7 +1478,7 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL } ttm.renderCondition(condStrategy) case EqualityTestTreeMaker(prevBinder, patTree, _) => EqualityCond(binderToUniqueTree(prevBinder), unique(patTree)) - case AlternativesTreeMaker(_, altss, _) => altss map (_ map treeMakerToCond reduceLeft AndCond) reduceLeft OrCond + case AlternativesTreeMaker(_, altss, _) => \/(altss map (alts => /\(alts map treeMakerToCond))) case ProductExtractorTreeMaker(testedBinder, None, subst) => NonNullCond(binderToUniqueTree(testedBinder)) case ExtractorTreeMaker(_, _, _, _) | GuardTreeMaker(_) @@ -1973,6 +1976,7 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL case Some(0) if testedBinder.tpe.typeSymbol == ListClass => // extractor.symbol.owner == SeqFactory EqualityCond(binderToUniqueTree(p.prevBinder), unique(Ident(NilModule) setType NilModule.tpe)) case _ => + backoff = true super.treeMakerToCond(tm) } case ExtractorTreeMaker(_, _, _, _) => |