Skip to content
Snippets Groups Projects
  • Mikaël Mayer's avatar
    d1cc5a7f
    Merge branch 'master' of https://github.com/epfl-lara/leon into string-render · d1cc5a7f
    Mikaël Mayer authored
    Conflicts:
    	build.sbt
    	src/main/scala/leon/datagen/VanuatooDataGen.scala
    	src/main/scala/leon/evaluators/AngelicEvaluator.scala
    	src/main/scala/leon/evaluators/CodeGenEvaluator.scala
    	src/main/scala/leon/evaluators/ContextualEvaluator.scala
    	src/main/scala/leon/evaluators/DefaultEvaluator.scala
    	src/main/scala/leon/evaluators/DualEvaluator.scala
    	src/main/scala/leon/evaluators/Evaluator.scala
    	src/main/scala/leon/evaluators/EvaluatorContexts.scala
    	src/main/scala/leon/evaluators/RecursiveEvaluator.scala
    	src/main/scala/leon/evaluators/StreamEvaluator.scala
    	src/main/scala/leon/evaluators/TracingEvaluator.scala
    	src/main/scala/leon/purescala/ExprOps.scala
    	src/main/scala/leon/repair/RepairNDEvaluator.scala
    	src/main/scala/leon/repair/RepairTrackingEvaluator.scala
    	src/main/scala/leon/repair/rules/Focus.scala
    	src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
    	src/main/scala/leon/utils/StreamUtils.scala
    	src/test/scala/leon/integration/solvers/SolversSuite.scala
    d1cc5a7f
    History
    Merge branch 'master' of https://github.com/epfl-lara/leon into string-render
    Mikaël Mayer authored
    Conflicts:
    	build.sbt
    	src/main/scala/leon/datagen/VanuatooDataGen.scala
    	src/main/scala/leon/evaluators/AngelicEvaluator.scala
    	src/main/scala/leon/evaluators/CodeGenEvaluator.scala
    	src/main/scala/leon/evaluators/ContextualEvaluator.scala
    	src/main/scala/leon/evaluators/DefaultEvaluator.scala
    	src/main/scala/leon/evaluators/DualEvaluator.scala
    	src/main/scala/leon/evaluators/Evaluator.scala
    	src/main/scala/leon/evaluators/EvaluatorContexts.scala
    	src/main/scala/leon/evaluators/RecursiveEvaluator.scala
    	src/main/scala/leon/evaluators/StreamEvaluator.scala
    	src/main/scala/leon/evaluators/TracingEvaluator.scala
    	src/main/scala/leon/purescala/ExprOps.scala
    	src/main/scala/leon/repair/RepairNDEvaluator.scala
    	src/main/scala/leon/repair/RepairTrackingEvaluator.scala
    	src/main/scala/leon/repair/rules/Focus.scala
    	src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
    	src/main/scala/leon/utils/StreamUtils.scala
    	src/test/scala/leon/integration/solvers/SolversSuite.scala