From 24c4b3be6ea309e6857525d1d0bf0ebbbc4af994 Mon Sep 17 00:00:00 2001 From: Etienne Kneuss <ekneuss@gmail.com> Date: Mon, 29 Oct 2012 18:37:40 +0100 Subject: [PATCH] Simplify a bit --- src/main/scala/leon/Main.scala | 11 +++++------ src/main/scala/leon/Pipeline.scala | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/scala/leon/Main.scala b/src/main/scala/leon/Main.scala index 3f6f9e927..98d9778b8 100644 --- a/src/main/scala/leon/Main.scala +++ b/src/main/scala/leon/Main.scala @@ -117,7 +117,7 @@ object Main { LeonContext(settings = settings, reporter = reporter, files = files, options = leonOptions) } - def computePipeline(settings: Settings): Pipeline[List[String], Unit] = { + def computePipeline(settings: Settings): Pipeline[List[String], Any] = { import purescala.Definitions.Program val pipeBegin : Pipeline[List[String],Program] = plugin.ExtractionPhase @@ -129,28 +129,27 @@ object Main { ImperativeCodeElimination andThen FunctionClosure } else { - NoopPhase[Program]() + NoopPhase() } val pipeSynthesis: Pipeline[Program, Program]= if (settings.synthesis) { synthesis.SynthesisPhase } else { - NoopPhase[Program]() + NoopPhase() } val pipeVerify: Pipeline[Program, Any] = if (settings.verify) { verification.AnalysisPhase } else { - NoopPhase[Program]() + NoopPhase() } pipeBegin andThen pipeTransforms andThen pipeSynthesis andThen - pipeVerify andThen - ExitPhase() + pipeVerify } def main(args : Array[String]) { diff --git a/src/main/scala/leon/Pipeline.scala b/src/main/scala/leon/Pipeline.scala index cc79495df..4cbf3dce3 100644 --- a/src/main/scala/leon/Pipeline.scala +++ b/src/main/scala/leon/Pipeline.scala @@ -1,7 +1,7 @@ package leon abstract class Pipeline[-F, +T] { - self => + self => def andThen[G](then: Pipeline[T, G]): Pipeline[F, G] = new Pipeline[F,G] { def run(ctx : LeonContext)(v : F) : G = then.run(ctx)(self.run(ctx)(v)) -- GitLab