SynthesisPhase is now an object

src/main/scala/leon/plugin/AnalysisComponent.scala

@@ -52,7 +52,7 @@ class AnalysisComponent(val global: Global, val leonReporter: Reporter, val plug
       ,
         if (Settings.synthesis)
           List(
-            new SynthesisPhase(leonReporter)
+            SynthesisPhase
           )
         else
           Nil
@@ -71,7 +71,8 @@ class AnalysisComponent(val global: Global, val leonReporter: Reporter, val plug
       //global ref to freshName creator
       fresh = unit.fresh
 
-      var ac = LeonContext(program = extractCode(unit))
+      var ac = LeonContext(program = extractCode(unit),
+                           reporter = leonReporter)
 
       if(Settings.stopAfterExtraction) {
         leonReporter.info("Extracted program for " + unit + ": ")

src/main/scala/leon/plugin/LeonContext.scala

@@ -4,6 +4,7 @@ package plugin
 import purescala.Definitions.Program
 
 case class LeonContext(
-  val program: Program
+  val program: Program,
+  val reporter: Reporter
 )
 

src/main/scala/leon/synthesis/SynthesisPhase.scala

 package leon
 package synthesis
 
+import plugin.LeonContext
 import purescala.Definitions.Program
 
-class SynthesisPhase(reporter: Reporter) extends plugin.TransformationPhase {
+object SynthesisPhase extends plugin.LeonPhase {
   val name        = "Synthesis"
   val description = "Synthesis"
 
-  def apply(program: Program): Program = {
+  def run(ctx: LeonContext): LeonContext = {
     val quietReporter = new QuietReporter
     val solvers  = List(
       new TrivialSolver(quietReporter),
       new FairZ3Solver(quietReporter)
     )
 
-    new Synthesizer(reporter, solvers).synthesizeAll(program)
+    val newProgram = new Synthesizer(ctx.reporter, solvers).synthesizeAll(ctx.program)
+
+    ctx.copy(program = newProgram)
   }
 }