diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-25 02:20:24 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-25 02:20:24 -0700 |
| commit | 1ef679bc18c7fd342bbc76865cfbf4a1c99fd035 (patch) | |
| tree | 1bc7f4f9e6373633b71d8f089cff8214820bb106 | |
| parent | f43de697595eaebcf2feec03beb95daf606ac678 (diff) | |
| parent | c27e5f0d60c853868b3676f1449e42dd351b0644 (diff) | |
| download | scala-1ef679bc18c7fd342bbc76865cfbf4a1c99fd035.tar.gz scala-1ef679bc18c7fd342bbc76865cfbf4a1c99fd035.tar.bz2 scala-1ef679bc18c7fd342bbc76865cfbf4a1c99fd035.zip | |
Merge pull request #767 from retronym/ticket/5968
SI-5968 Eliminate spurious exhaustiveness warning with singleton types.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t5968.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t5968.scala | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index 9b8ddffb49..f99d0e733b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -2362,6 +2362,8 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL // patmatDebug("enum bool "+ tp) Some(List(ConstantType(Constant(true)), ConstantType(Constant(false)))) // TODO case _ if tp.isTupleType => // recurse into component types + case modSym: ModuleClassSymbol => + Some(List(tp)) case sym if !sym.isSealed || isPrimitiveValueClass(sym) => // patmatDebug("enum unsealed "+ (tp, sym, sym.isSealed, isPrimitiveValueClass(sym))) None diff --git a/test/files/pos/t5968.flags b/test/files/pos/t5968.flags new file mode 100644 index 0000000000..e8fb65d50c --- /dev/null +++ b/test/files/pos/t5968.flags @@ -0,0 +1 @@ +-Xfatal-warnings
\ No newline at end of file diff --git a/test/files/pos/t5968.scala b/test/files/pos/t5968.scala new file mode 100644 index 0000000000..0093f84fc0 --- /dev/null +++ b/test/files/pos/t5968.scala @@ -0,0 +1,8 @@ +object X { + def f(e: Either[Int, X.type]) = e match { + case Left(i) => i + case Right(X) => 0 + // SI-5986 spurious exhaustivity warning here + } +} + |