Merge pull request #211 from dotty-staging/phase-runOn

Phase.runOn is now List[ComliplationUnit] => List[ComliplationUnit]

Author: DarkDimius

src/dotty/tools/dotc/Run.scala

@@ -46,7 +46,7 @@ class Run(comp: Compiler)(implicit ctx: Context) {
         .filterNot(ctx.settings.Yskip.value.containsPhase(_)) // TODO: skip only subphase
       for (phase <- phasesToRun)
         if (!ctx.reporter.hasErrors) {
-          phase.runOn(units)
+          units = phase.runOn(units)
           def foreachUnit(op: Context => Unit)(implicit ctx: Context): Unit =
             for (unit <- units) op(ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))
           if (ctx.settings.Xprint.value.containsPhase(phase))

src/dotty/tools/dotc/core/Phases.scala

@@ -192,8 +192,12 @@ object Phases {
 
     def run(implicit ctx: Context): Unit
 
-    def runOn(units: List[CompilationUnit])(implicit ctx: Context): Unit =
-      for (unit <- units) run(ctx.fresh.setPhase(this).setCompilationUnit(unit))
+    def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] =
+      units.map { unit =>
+        val unitCtx = ctx.fresh.setPhase(this).setCompilationUnit(unit)
+        run(unitCtx)
+        unitCtx.compilationUnit
+      }
 
     def description: String = phaseName
 

src/dotty/tools/dotc/typer/FrontEnd.scala

@@ -40,13 +40,14 @@ class FrontEnd extends Phase {
     record("retainedTypedTrees", unit.tpdTree.treeSize)
   }
 
-  override def runOn(units: List[CompilationUnit])(implicit ctx: Context): Unit = {
+  override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] = {
     val unitContexts = units map (unit => ctx.fresh.setCompilationUnit(unit))
     unitContexts foreach (parse(_))
     record("parsedTrees", ast.Trees.ntrees)
     unitContexts foreach (enterSyms(_))
     unitContexts foreach (typeCheck(_))
     record("totalTrees", ast.Trees.ntrees)
+    unitContexts.map(_.compilationUnit)
   }
 
   override def run(implicit ctx: Context): Unit = {