fixes pluginsEnterStats

xeno-by · xeno-by · commit 97f7f5868961 · 2015-02-22T18:50:33.000+01:00
Initial implementation of pluginsEnterStats was incorrect, because I got
the foldLeft wrong, making it perpetuate the initial value of stats.
This worked fine if zero or one macro plugins were active at a time,
but broke down if there were multiple of such plugins (concretely,
I discovered this issue when trying to marry macro paradise with scalahost).
diff --git a/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala b/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala
@@ -447,6 +447,6 @@ trait AnalyzerPlugins { self: Analyzer =>
     // performance opt
     if (macroPlugins.isEmpty) stats
     else macroPlugins.foldLeft(stats)((current, plugin) =>
-      if (!plugin.isActive()) current else plugin.pluginsEnterStats(typer, stats))
+      if (!plugin.isActive()) current else plugin.pluginsEnterStats(typer, current))
   }
 }
diff --git a/test/files/run/macroPlugins-enterStats.check b/test/files/run/macroPlugins-enterStats.check
@@ -0,0 +1,30 @@
+[[syntax trees at end of                     typer]] // newSource1.scala
+package <empty> {
+  class C extends scala.AnyRef {
+    def <init>(): C = {
+      C.super.<init>();
+      ()
+    };
+    def x: Int = 2;
+    def xmacroPlugin1: Nothing = scala.this.Predef.???;
+    def xmacroPlugin2: Nothing = scala.this.Predef.???;
+    def xmacroPlugin2macroPlugin1: Nothing = scala.this.Predef.???;
+    def y: Int = 3;
+    def ymacroPlugin1: Nothing = scala.this.Predef.???;
+    def ymacroPlugin2: Nothing = scala.this.Predef.???;
+    def ymacroPlugin2macroPlugin1: Nothing = scala.this.Predef.???
+  }
+}
+
+macroPlugin2:enterStat(class C extends scala.AnyRef {   def <init>() = {     super.<init>();     ()   };   def x = 2;   def y = 3 })
+macroPlugin1:enterStat(class C extends scala.AnyRef {   def <init>() = {     super.<init>();     ()   };   def x = 2;   def y = 3 })
+macroPlugin2:enterStat(def <init>() = {   super.<init>();   () })
+macroPlugin2:enterStat(def x = 2)
+macroPlugin2:enterStat(def y = 3)
+macroPlugin1:enterStat(def <init>() = {   super.<init>();   () })
+macroPlugin1:enterStat(def x = 2)
+macroPlugin1:enterStat(def xmacroPlugin2 = $qmark$qmark$qmark)
+macroPlugin1:enterStat(def y = 3)
+macroPlugin1:enterStat(def ymacroPlugin2 = $qmark$qmark$qmark)
+macroPlugin2:enterStat(super.<init>())
+macroPlugin1:enterStat(super.<init>())
diff --git a/test/files/run/macroPlugins-enterStats.scala b/test/files/run/macroPlugins-enterStats.scala
@@ -0,0 +1,50 @@
+import scala.tools.partest._
+import scala.tools.nsc._
+
+object Test extends DirectTest {
+  override def extraSettings: String = "-usejavacp -Xprint:typer"
+
+  def code = """
+    class C {
+      def x = 2
+      def y = 3
+    }
+  """.trim
+
+  def show() {
+    val global = newCompiler()
+    import global._
+    import analyzer._
+
+    val output = collection.mutable.ListBuffer[String]()
+    def log(what: String) = output += what.replace(String.format("%n"), " ")
+
+    def logEnterStat(pluginName: String, stat: Tree): Unit = log(s"$pluginName:enterStat($stat)")
+    def deriveStat(pluginName: String, typer: Typer, stat: Tree): List[Tree] = stat match {
+      case DefDef(mods, name, Nil, Nil, TypeTree(), body) =>
+        val derived = DefDef(NoMods, TermName(name + pluginName), Nil, Nil, TypeTree(), Ident(TermName("$qmark$qmark$qmark")))
+        newNamer(typer.context).enterSym(derived)
+        List(derived)
+      case _ =>
+        Nil
+    }
+
+    object macroPlugin1 extends MacroPlugin {
+      override def pluginsEnterStats(typer: Typer, stats: List[Tree]): List[Tree] = {
+        stats.foreach(stat => logEnterStat("macroPlugin1", stat))
+        stats.flatMap(stat => stat +: deriveStat("macroPlugin1", typer, stat))
+      }
+    }
+    object macroPlugin2 extends MacroPlugin {
+      override def pluginsEnterStats(typer: Typer, stats: List[Tree]): List[Tree] = {
+        stats.foreach(stat => logEnterStat("macroPlugin2", stat))
+        stats.flatMap(stat => stat +: deriveStat("macroPlugin2", typer, stat))
+      }
+    }
+
+    addMacroPlugin(macroPlugin1)
+    addMacroPlugin(macroPlugin2)
+    compileString(global)(code)
+    println(output.mkString("\n"))
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,6 @@ trait AnalyzerPlugins { self: Analyzer =>`
`447`	`447`	`// performance opt`
`448`	`448`	`if (macroPlugins.isEmpty) stats`
`449`	`449`	`else macroPlugins.foldLeft(stats)((current, plugin) =>`
`450`		`- if (!plugin.isActive()) current else plugin.pluginsEnterStats(typer, stats))`
	`450`	`+ if (!plugin.isActive()) current else plugin.pluginsEnterStats(typer, current))`
`451`	`451`	`}`
`452`	`452`	`}`