Merge remote-tracking branch 'origin' into string-render
Conflicts: src/main/scala/leon/frontends/scalac/CodeExtraction.scala src/main/scala/leon/purescala/TypeOps.scala src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
No related branches found
No related tags found
Showing
- src/main/scala/leon/codegen/CodeGeneration.scala 1 addition, 1 deletionsrc/main/scala/leon/codegen/CodeGeneration.scala
- src/main/scala/leon/evaluators/RecursiveEvaluator.scala 4 additions, 4 deletionssrc/main/scala/leon/evaluators/RecursiveEvaluator.scala
- src/main/scala/leon/evaluators/StreamEvaluator.scala 6 additions, 6 deletionssrc/main/scala/leon/evaluators/StreamEvaluator.scala
- src/main/scala/leon/frontends/scalac/ASTExtractors.scala 3 additions, 4 deletionssrc/main/scala/leon/frontends/scalac/ASTExtractors.scala
- src/main/scala/leon/frontends/scalac/CodeExtraction.scala 53 additions, 41 deletionssrc/main/scala/leon/frontends/scalac/CodeExtraction.scala
- src/main/scala/leon/invariant/datastructure/DisjointSets.scala 0 additions, 2 deletions...ain/scala/leon/invariant/datastructure/DisjointSets.scala
- src/main/scala/leon/invariant/datastructure/Graph.scala 1 addition, 1 deletionsrc/main/scala/leon/invariant/datastructure/Graph.scala
- src/main/scala/leon/invariant/datastructure/Maps.scala 1 addition, 8 deletionssrc/main/scala/leon/invariant/datastructure/Maps.scala
- src/main/scala/leon/invariant/engine/CompositionalTimeBoundSolver.scala 15 additions, 21 deletions.../leon/invariant/engine/CompositionalTimeBoundSolver.scala
- src/main/scala/leon/invariant/engine/ConstraintTracker.scala 0 additions, 11 deletionssrc/main/scala/leon/invariant/engine/ConstraintTracker.scala
- src/main/scala/leon/invariant/engine/InferInvariantsPhase.scala 0 additions, 14 deletions...in/scala/leon/invariant/engine/InferInvariantsPhase.scala
- src/main/scala/leon/invariant/engine/InferenceContext.scala 2 additions, 3 deletionssrc/main/scala/leon/invariant/engine/InferenceContext.scala
- src/main/scala/leon/invariant/engine/InferenceEngine.scala 3 additions, 16 deletionssrc/main/scala/leon/invariant/engine/InferenceEngine.scala
- src/main/scala/leon/invariant/engine/InferenceReport.scala 10 additions, 13 deletionssrc/main/scala/leon/invariant/engine/InferenceReport.scala
- src/main/scala/leon/invariant/engine/SpecInstantiator.scala 0 additions, 0 deletionssrc/main/scala/leon/invariant/engine/SpecInstantiator.scala
- src/main/scala/leon/invariant/engine/TemplateEnumerator.scala 3 additions, 14 deletions...main/scala/leon/invariant/engine/TemplateEnumerator.scala
- src/main/scala/leon/invariant/engine/UnfoldingTemplateSolver.scala 5 additions, 12 deletions...scala/leon/invariant/engine/UnfoldingTemplateSolver.scala
- src/main/scala/leon/invariant/factories/AxiomFactory.scala 0 additions, 14 deletionssrc/main/scala/leon/invariant/factories/AxiomFactory.scala
- src/main/scala/leon/invariant/factories/TemplateFactory.scala 3 additions, 10 deletions...main/scala/leon/invariant/factories/TemplateFactory.scala
- src/main/scala/leon/invariant/factories/TemplateInstantiator.scala 5 additions, 13 deletions...scala/leon/invariant/factories/TemplateInstantiator.scala
Loading
Please register or sign in to comment