Make instrumentation happen before patmat mangles match-cases

mtkopone · Dec 7, 2012 · 43249e6 · 43249e6
1 parent 35a6c22
commit 43249e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/resources/scalac-plugin.xml b/src/main/resources/scalac-plugin.xml
@@ -1,4 +1,4 @@
 <plugin>
-  <name>scctPlugin</name>
+  <name>scctInstrumentation</name>
   <classname>reaktor.scct.ScctInstrumentPlugin</classname>
 </plugin>
diff --git a/src/main/scala/reaktor/scct/ScctInstrumentPlugin.scala b/src/main/scala/reaktor/scct/ScctInstrumentPlugin.scala
@@ -10,8 +10,6 @@ import util.Random
 class ScctInstrumentPlugin(val global: Global) extends Plugin {
   val name = "scct"
   val description = "Scala code coverage instrumentation plugin."
-  val runsAfter = List("typer")
-
   val options = new ScctInstrumentPluginOptions()
   val components = List(new ScctTransformComponent(global, options))
 
@@ -50,6 +48,8 @@ class ScctTransformComponent(val global: Global, val opts:ScctInstrumentPluginOp
   import global.definitions._
 
   val runsAfter = List[String]("typer")
+  override val runsBefore = List[String]("patmat")
+
   val phaseName = "scctInstrumentation"
   def newTransformer(unit: CompilationUnit) = new Instrumenter(unit)
 

diff --git a/src/test/scala/reaktor/scct/ScctInstrumentPluginSpec.scala b/src/test/scala/reaktor/scct/ScctInstrumentPluginSpec.scala
@@ -12,14 +12,16 @@ class ScctInstrumentPluginSpec extends Specification with Mockito {
       sut.name mustEqual "scct"
       sut.description mustEqual "Scala code coverage instrumentation plugin."
     }
-    "run after typer" in {
-      sut.runsAfter mustEqual List("typer")
-    }
     "only contain the transformer component" in {
       val components = sut.components
       components.size mustEqual 1
       components(0) must haveClass[ScctTransformComponent]
     }
+    "run after typer and before patmat" in {
+      val c = sut.components(0)
+      c.runsAfter mustEqual List("typer")
+      c.runsBefore mustEqual List("patmat")
+    }
   }
 
   "Plugin options" should {