Plugin test harness internal improvements.

Author: gslowikowski

scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala

@@ -27,9 +27,9 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools
 
   class LocationSetter(val global: Global) extends PluginComponent with TypingTransformers with Transform {
 
-    override val phaseName: String = "location-setter"
-    override val runsAfter: List[String] = List("typer")
-    override val runsBefore = List[String]("patmat")
+    override val phaseName = "location-setter"
+    override val runsAfter = List("typer")
+    override val runsBefore = List("patmat")
 
     override protected def newTransformer(unit: global.CompilationUnit): global.Transformer = new Transformer(unit)
     class Transformer(unit: global.CompilationUnit) extends TypingTransformer(unit) {
@@ -44,35 +44,7 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools
   }
 
   override def computeInternalPhases() {
-    val phs = List(
-      syntaxAnalyzer -> "parse source into ASTs, perform simple desugaring",
-      analyzer.namerFactory -> "resolve names, attach symbols to named trees",
-      analyzer.packageObjects -> "load package objects",
-      analyzer.typerFactory -> "the meat and potatoes: type the trees",
-      locationSetter -> "sets locations",
-      patmat -> "translate match expressions",
-      superAccessors -> "add super accessors in traits and nested classes",
-      extensionMethods -> "add extension methods for inline classes",
-      pickler -> "serialize symbol tables",
-      refChecks -> "reference/override checking, translate nested objects",
-      uncurry -> "uncurry, translate function values to anonymous classes",
-      tailCalls -> "replace tail calls by jumps",
-      specializeTypes -> "@specialized-driven class and method specialization",
-      explicitOuter -> "this refs to outer pointers, translate patterns",
-      erasure -> "erase types, add interfaces for traits",
-      postErasure -> "clean up erased inline classes",
-      lazyVals -> "allocate bitmaps, translate lazy vals into lazified defs",
-      lambdaLift -> "move nested functions to top level",
-      constructors -> "move field definitions into constructors",
-      mixer -> "mixin composition",
-      cleanup -> "platform-specific cleanups, generate reflective calls",
-      genicode -> "generate portable intermediate code",
-      inliner -> "optimization: do inlining",
-      inlineExceptionHandlers -> "optimization: inline exception handlers",
-      closureElimination -> "optimization: eliminate uncalled closures",
-      deadCode -> "optimization: eliminate dead code",
-      terminal -> "The last phase in the compiler chain"
-    )
-    phs foreach (addToPhasesSet _).tupled
+    super.computeInternalPhases()
+    addToPhasesSet(locationSetter, "sets locations")
   }
-}
+}

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala

@@ -111,9 +111,9 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
 
   class PositionValidator(val global: Global) extends PluginComponent with TypingTransformers with Transform {
 
-    override val phaseName: String = "scoverage-validator"
-    override val runsAfter: List[String] = List("typer")
-    override val runsBefore = List[String]("scoverage-instrumentation")
+    override val phaseName = "scoverage-validator"
+    override val runsAfter = List("typer")
+    override val runsBefore = List("scoverage-instrumentation")
 
     override protected def newTransformer(unit: global.CompilationUnit): global.Transformer = new Transformer(unit)
     class Transformer(unit: global.CompilationUnit) extends TypingTransformer(unit) {
@@ -129,10 +129,9 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
 
     val sources = new ListBuffer[String]
 
-    override val phaseName: String = "scoverage-teststore"
-    override val runsAfter: List[String] = List("dce")
-    // deadcode
-    override val runsBefore = List[String]("terminal")
+    override val phaseName = "scoverage-teststore"
+    override val runsAfter = List("dce")
+    override val runsBefore = List("terminal")
 
     override protected def newTransformer(unit: global.CompilationUnit): global.Transformer = new Transformer(unit)
     class Transformer(unit: global.CompilationUnit) extends TypingTransformer(unit) {
@@ -145,38 +144,10 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
   }
 
   override def computeInternalPhases() {
-    val phs = List(
-      syntaxAnalyzer -> "parse source into ASTs, perform simple desugaring",
-      analyzer.namerFactory -> "resolve names, attach symbols to named trees",
-      analyzer.packageObjects -> "load package objects",
-      analyzer.typerFactory -> "the meat and potatoes: type the trees",
-      validator -> "scoverage validator",
-      instrumentationComponent -> "scoverage instrumentationComponent",
-      patmat -> "translate match expressions",
-      superAccessors -> "add super accessors in traits and nested classes",
-      extensionMethods -> "add extension methods for inline classes",
-      pickler -> "serialize symbol tables",
-      refChecks -> "reference/override checking, translate nested objects",
-      uncurry -> "uncurry, translate function values to anonymous classes",
-      tailCalls -> "replace tail calls by jumps",
-      specializeTypes -> "@specialized-driven class and method specialization",
-      explicitOuter -> "this refs to outer pointers, translate patterns",
-      erasure -> "erase types, add interfaces for traits",
-      postErasure -> "clean up erased inline classes",
-      lazyVals -> "allocate bitmaps, translate lazy vals into lazified defs",
-      lambdaLift -> "move nested functions to top level",
-      constructors -> "move field definitions into constructors",
-      mixer -> "mixin composition",
-      cleanup -> "platform-specific cleanups, generate reflective calls",
-      genicode -> "generate portable intermediate code",
-      inliner -> "optimization: do inlining",
-      inlineExceptionHandlers -> "optimization: inline exception handlers",
-      closureElimination -> "optimization: eliminate uncalled closures",
-      deadCode -> "optimization: eliminate dead code",
-      testStore -> "scoverage teststore",
-      terminal -> "The last phase in the compiler chain"
-    )
-    phs foreach (addToPhasesSet _).tupled
+    super.computeInternalPhases()
+    addToPhasesSet(validator, "scoverage validator")
+    addToPhasesSet(instrumentationComponent, "scoverage instrumentationComponent")
+    addToPhasesSet(testStore, "scoverage teststore")
   }
 }