Skip to content
Snippets Groups Projects
Commit b453606d authored by Manos Koukoutos's avatar Manos Koukoutos Committed by Etienne Kneuss
Browse files

Make sure we call application constructor

parent 2a1e3558
Branches
Tags
No related merge requests found
...@@ -106,7 +106,7 @@ object Extractors { ...@@ -106,7 +106,7 @@ object Extractors {
})) }))
case fi @ FunctionInvocation(fd, args) => Some((args, (as => FunctionInvocation(fd, as).setPos(fi)))) case fi @ FunctionInvocation(fd, args) => Some((args, (as => FunctionInvocation(fd, as).setPos(fi))))
case mi @ MethodInvocation(rec, cd, tfd, args) => Some((rec +: args, (as => MethodInvocation(as.head, cd, tfd, as.tail).setPos(mi)))) case mi @ MethodInvocation(rec, cd, tfd, args) => Some((rec +: args, (as => MethodInvocation(as.head, cd, tfd, as.tail).setPos(mi))))
case fa @ Application(caller, args) => Some((caller +: args), (as => Application(as.head, as.tail).setPos(fa))) case fa @ Application(caller, args) => Some((caller +: args), (as => application(as.head, as.tail).setPos(fa)))
case CaseClass(cd, args) => Some((args, CaseClass(cd, _))) case CaseClass(cd, args) => Some((args, CaseClass(cd, _)))
case And(args) => Some((args, and)) case And(args) => Some((args, and))
case Or(args) => Some((args, or)) case Or(args) => Some((args, or))
......
...@@ -69,7 +69,7 @@ class DefaultTactic(vctx: VerificationContext) extends Tactic(vctx) { ...@@ -69,7 +69,7 @@ class DefaultTactic(vctx: VerificationContext) extends Tactic(vctx) {
(a, kind, cond) (a, kind, cond)
case a @ Assert(cond, None, _) => (a, VCAssert, cond) case a @ Assert(cond, None, _) => (a, VCAssert, cond)
// Only triggered for inner ensurings, general postconditions are handled by generatePostconditions // Only triggered for inner ensurings, general postconditions are handled by generatePostconditions
case a @ Ensuring(body, post) => (a, VCAssert, Application(post, Seq(body))) case a @ Ensuring(body, post) => (a, VCAssert, application(post, Seq(body)))
}(body) }(body)
calls.map { calls.map {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment