diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-25 04:39:14 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-25 04:39:14 -0700 |
| commit | 09e8361a5c485e52b40f9f863469d5830f1cfabf (patch) | |
| tree | 385c893ee6708411328c3cff33ebb3a0161b80ab | |
| parent | 5a21e6367abca37a55744fd383bc1f52239d3710 (diff) | |
| parent | aee338da477bbe6e059f8ed3ae231e5e51128d93 (diff) | |
| download | scala-09e8361a5c485e52b40f9f863469d5830f1cfabf.tar.gz scala-09e8361a5c485e52b40f9f863469d5830f1cfabf.tar.bz2 scala-09e8361a5c485e52b40f9f863469d5830f1cfabf.zip | |
Merge pull request #623 from adriaanm/ticket/switch-warning-not-error
don't error when not emitting required switch
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/switch.flags | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index 80d40011ad..4d66fb5617 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -1105,7 +1105,7 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL } emitSwitch(scrut, scrutSym, casesNoSubstOnly, pt, matchFailGenOverride).getOrElse{ - if (requireSwitch) typer.context.unit.error(scrut.pos, "could not emit switch for @switch annotated match") + if (requireSwitch) typer.context.unit.warning(scrut.pos, "could not emit switch for @switch annotated match") if (casesNoSubstOnly nonEmpty) { // before optimizing, check casesNoSubstOnly for presence of a default case, diff --git a/test/files/neg/switch.flags b/test/files/neg/switch.flags new file mode 100644 index 0000000000..e8fb65d50c --- /dev/null +++ b/test/files/neg/switch.flags @@ -0,0 +1 @@ +-Xfatal-warnings
\ No newline at end of file |