diff --git a/src/main/scala/leon/Main.scala b/src/main/scala/leon/Main.scala index 6dbc05306c67196944a0d5a5b52cce1b011ace82..5ba9bfa5357d69d3715b7e24276d3b90700cd151 100644 --- a/src/main/scala/leon/Main.scala +++ b/src/main/scala/leon/Main.scala @@ -16,7 +16,7 @@ object Main { xlang.EpsilonElimination, xlang.ImperativeCodeElimination, xlang.FixReportLabels, - xlang.XLangAnalysisPhase, + xlang.XLangDesugaringPhase, purescala.FunctionClosure, synthesis.SynthesisPhase, termination.TerminationPhase, @@ -140,7 +140,7 @@ object Main { import frontends.scalac.ExtractionPhase import synthesis.SynthesisPhase import termination.TerminationPhase - import xlang.{XLangAnalysisPhase, FixReportLabels} + import xlang.{XLangDesugaringPhase, FixReportLabels} import verification.AnalysisPhase import repair.RepairPhase import evaluators.EvaluationPhase @@ -174,7 +174,7 @@ object Main { debugTrees("Program after extraction") andThen PreprocessingPhase andThen debugTrees("Program after pre-processing") andThen - XLangAnalysisPhase andThen + XLangDesugaringPhase andThen debugTrees("Program after xlang desugaring") else ExtractionPhase andThen diff --git a/src/main/scala/leon/xlang/XLangAnalysisPhase.scala b/src/main/scala/leon/xlang/XLangDesugaringPhase.scala similarity index 89% rename from src/main/scala/leon/xlang/XLangAnalysisPhase.scala rename to src/main/scala/leon/xlang/XLangDesugaringPhase.scala index 470c0d38990ceaad3a0a9fffb1fe9625b227ac0c..f891b212e7c5c2b87c9646df3b1509755f464f39 100644 --- a/src/main/scala/leon/xlang/XLangAnalysisPhase.scala +++ b/src/main/scala/leon/xlang/XLangDesugaringPhase.scala @@ -6,7 +6,7 @@ package xlang import purescala.Definitions.Program import purescala.FunctionClosure -object XLangAnalysisPhase extends TransformationPhase { +object XLangDesugaringPhase extends TransformationPhase { val name = "xlang desugaring" val description = "Desugar xlang features into PureScala" diff --git a/src/test/scala/leon/test/verification/XLangVerificationSuite.scala b/src/test/scala/leon/test/verification/XLangVerificationSuite.scala index 4792a2b425471eeac9fe8bb10b1733ff8dafb96a..12112037487a59689afce69e1c454ace5efb223e 100644 --- a/src/test/scala/leon/test/verification/XLangVerificationSuite.scala +++ b/src/test/scala/leon/test/verification/XLangVerificationSuite.scala @@ -6,7 +6,7 @@ import leon._ import leon.test._ import leon.verification.{AnalysisPhase, VerificationReport} -import leon.xlang.{FixReportLabels, XLangAnalysisPhase} +import leon.xlang.{FixReportLabels, XLangDesugaringPhase} import leon.frontends.scalac.ExtractionPhase import leon.utils.PreprocessingPhase @@ -23,10 +23,10 @@ class XLangVerificationSuite extends LeonTestSuite { private case class Output(report : VerificationReport, reporter : Reporter) private def mkPipeline : Pipeline[List[String],VerificationReport] = - ExtractionPhase andThen - PreprocessingPhase andThen - XLangAnalysisPhase andThen - AnalysisPhase andThen + ExtractionPhase andThen + PreprocessingPhase andThen + XLangDesugaringPhase andThen + AnalysisPhase andThen FixReportLabels private def mkTest(file : File, leonOptions : Seq[String], forError: Boolean)(block: Output=>Unit) = {