From 2606bd921e434a6d8edb21f7f04dbfb10045026e Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 14 Aug 2014 23:40:37 +0200 Subject: Don't traverse all trees in delambdafy phase if delambdafy:inline If delambdafy:method is not enabled, the delambdafy method is a nop. --- src/compiler/scala/tools/nsc/transform/Delambdafy.scala | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala index 371061662e..9cc8d779a0 100644 --- a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala +++ b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala @@ -37,6 +37,15 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre /** the following two members override abstract members in Transform */ val phaseName: String = "delambdafy" + override def newPhase(prev: scala.tools.nsc.Phase): StdPhase = { + if (settings.Ydelambdafy.value == "method") new Phase(prev) + else new SkipPhase(prev) + } + + class SkipPhase(prev: scala.tools.nsc.Phase) extends StdPhase(prev) { + def apply(unit: global.CompilationUnit): Unit = () + } + protected def newTransformer(unit: CompilationUnit): Transformer = new DelambdafyTransformer(unit) -- cgit v1.2.3