Skip to content
Snippets Groups Projects
Commit b3559b98 authored by Etienne Kneuss's avatar Etienne Kneuss
Browse files

Mutable field in an object? I don't think so.

This is a dirty quick fix for now until we rewrite the FunctionClosure
phase.
parent 8027db38
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ object Main { ...@@ -17,7 +17,7 @@ object Main {
xlang.ImperativeCodeElimination, xlang.ImperativeCodeElimination,
xlang.FixReportLabels, xlang.FixReportLabels,
xlang.XLangDesugaringPhase, xlang.XLangDesugaringPhase,
purescala.FunctionClosure, new purescala.FunctionClosure,
synthesis.SynthesisPhase, synthesis.SynthesisPhase,
termination.TerminationPhase, termination.TerminationPhase,
verification.AnalysisPhase, verification.AnalysisPhase,
...@@ -190,12 +190,12 @@ object Main { ...@@ -190,12 +190,12 @@ object Main {
else if (synthesisF) SynthesisPhase else if (synthesisF) SynthesisPhase
else if (repairF) RepairPhase else if (repairF) RepairPhase
else if (analysisF) Pipeline.both( else if (analysisF) Pipeline.both(
FunctionClosure andThen analysis, (new FunctionClosure) andThen analysis,
TerminationPhase TerminationPhase
) )
else if (terminationF) TerminationPhase else if (terminationF) TerminationPhase
else if (evalF) EvaluationPhase else if (evalF) EvaluationPhase
else FunctionClosure andThen analysis else (new FunctionClosure) andThen analysis
} }
pipeBegin andThen pipeBegin andThen
......
...@@ -10,7 +10,7 @@ import Extractors._ ...@@ -10,7 +10,7 @@ import Extractors._
import ExprOps._ import ExprOps._
import Constructors._ import Constructors._
object FunctionClosure extends TransformationPhase { class FunctionClosure extends TransformationPhase {
val name = "Function Closure" val name = "Function Closure"
val description = "Closing function with its scoping variables" val description = "Closing function with its scoping variables"
...@@ -175,5 +175,4 @@ object FunctionClosure extends TransformationPhase { ...@@ -175,5 +175,4 @@ object FunctionClosure extends TransformationPhase {
} while(newVars != Set()) } while(newVars != Set())
(filteredConstraints, allVars) (filteredConstraints, allVars)
} }
} }
...@@ -16,7 +16,7 @@ object XLangDesugaringPhase extends TransformationPhase { ...@@ -16,7 +16,7 @@ object XLangDesugaringPhase extends TransformationPhase {
ArrayTransformation andThen ArrayTransformation andThen
EpsilonElimination andThen EpsilonElimination andThen
ImperativeCodeElimination andThen ImperativeCodeElimination andThen
FunctionClosure (new FunctionClosure)
phases.run(ctx)(pgm) phases.run(ctx)(pgm)
} }
......
...@@ -33,7 +33,7 @@ class StablePrintingSuite extends LeonRegressionSuite { ...@@ -33,7 +33,7 @@ class StablePrintingSuite extends LeonRegressionSuite {
val pipeline = leon.utils.TemporaryInputPhase andThen val pipeline = leon.utils.TemporaryInputPhase andThen
frontends.scalac.ExtractionPhase andThen frontends.scalac.ExtractionPhase andThen
leon.utils.PreprocessingPhase andThen leon.utils.PreprocessingPhase andThen
purescala.FunctionClosure (new purescala.FunctionClosure)
val program = pipeline.run(ctx)((List(content), Nil)) val program = pipeline.run(ctx)((List(content), Nil))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment