Allow MiniPhase to be DenotTransformer

All MiniPhases now as are full-fledged phases,
and are given their own periods and can register DenotTransformers.
MiniPhases belonging to same group(list) will be squashed to single phase.

1 files changed, 7 insertions, 6 deletions

diff --git a/test/test/DottyTest.scala b/test/test/DottyTest.scala
index ba67f14ce..fcc211175 100644
--- a/test/test/DottyTest.scala
+++ b/test/test/DottyTest.scala
@@ -41,15 +41,16 @@ class DottyTest {
   private def compilerWithChecker(phase: String)(assertion:(tpd.Tree, Context) => Unit) = new Compiler {
     override def phases = {
       val allPhases = super.phases
-      val targetPhase = allPhases.find{p=> p.name == phase}
-      assert(targetPhase isDefined)
-      val phasesBefore = allPhases.takeWhile(x=> ! (x eq targetPhase.get))
-
-      val checker = new Phase{
+      val targetPhase = allPhases.flatten.find(p => p.name == phase).get
+      val groupsBefore = allPhases.takeWhile(x => !x.contains(targetPhase))
+      val lastGroup = allPhases.find(x => x.contains(targetPhase)).get.takeWhile(x => !(x eq targetPhase))
+      val checker = new Phase {
         def name = "assertionChecker"
         override def run(implicit ctx: Context): Unit = assertion(ctx.compilationUnit.tpdTree, ctx)
       }
-      phasesBefore:::List(targetPhase.get, checker)
+      val lastGroupAppended = List(lastGroup ::: targetPhase :: Nil)
+
+      groupsBefore ::: lastGroupAppended ::: List(List(checker))
     }
   }