diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 00:04:51 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-08-08 00:04:51 -0700 |
| commit | ab1058c31d10d3d4d569cb1d1cdd0a35a2c66902 (patch) | |
| tree | fa739379b04774c351f9d23bc906569bc738ba4e /src | |
| parent | 45d045f8e3d7006890c5a3a187b8b2fc262ad5c7 (diff) | |
| parent | 36784d83dec93012e30254ba5207c59d868b613c (diff) | |
| download | scala-ab1058c31d10d3d4d569cb1d1cdd0a35a2c66902.tar.gz scala-ab1058c31d10d3d4d569cb1d1cdd0a35a2c66902.tar.bz2 scala-ab1058c31d10d3d4d569cb1d1cdd0a35a2c66902.zip | |
Merge pull request #1084 from VladUreche/issue/5933
SI-5933 do the new patmat translation for scaladoc …
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 43e1accec6..063f615e17 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -92,8 +92,8 @@ trait Typers extends Modes with Adaptations with Tags { // when true: // - we may virtualize matches (if -Xexperimental and there's a suitable __match in scope) // - we synthesize PartialFunction implementations for `x => x match {...}` and `match {...}` when the expected type is PartialFunction - // this is disabled by: -Xoldpatmat, scaladoc or interactive compilation - @inline private def newPatternMatching = opt.virtPatmat && !forScaladoc && !forInteractive // && (phase.id < currentRun.uncurryPhase.id) + // this is disabled by: -Xoldpatmat or interactive compilation (we run it for scaladoc due to SI-5933) + @inline private def newPatternMatching = opt.virtPatmat && !forInteractive //&& !forScaladoc && (phase.id < currentRun.uncurryPhase.id) abstract class Typer(context0: Context) extends TyperDiagnostics with Adaptation with Tag with TyperContextErrors { import context0.unit |