diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-23 17:04:16 +0200 |
|---|---|---|
| committer | Vlad Ureche <vlad.ureche@gmail.com> | 2012-08-07 21:24:13 +0200 |
| commit | 8aebc6c805851544a1b8e968d9ef6390298892e3 (patch) | |
| tree | 258f7faa8c28e1c3767b3a5f02546214ae646426 | |
| parent | d8b35a11d67c2a597f1d93456b341a650b542520 (diff) | |
| download | scala-8aebc6c805851544a1b8e968d9ef6390298892e3.tar.gz scala-8aebc6c805851544a1b8e968d9ef6390298892e3.tar.bz2 scala-8aebc6c805851544a1b8e968d9ef6390298892e3.zip | |
SI-5933 do the new patmat translation for scaladoc
especially because it benefits from nicer type inference for partial functions
| -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 |