mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

checking cancel flag to refine the behavior around issue #595

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-07-03 10:38:54 -07:00
parent 654780bb4b
commit e9e10f1d5c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/interp/iz3base.cpp
View file

@ -267,12 +267,15 @@ bool iz3base::is_sat(const std::vector<ast> &q, ast &_proof, std::vector<ast> &v
p.set_bool("model", true); p.set_bool("model", true);
p.set_bool("unsat_core", true); p.set_bool("unsat_core", true);
scoped_ptr<solver_factory> sf = mk_smt_solver_factory(); scoped_ptr<solver_factory> sf = mk_smt_solver_factory();
::solver *m_solver = (*sf)(m(), p, true, true, true, ::symbol::null); scoped_ptr<::solver> solver = (*sf)(m(), p, true, true, true, ::symbol::null);
::solver &s = *m_solver; ::solver &s = *solver.get();
for(unsigned i = 0; i < q.size(); i++) for(unsigned i = 0; i < q.size(); i++)
s.assert_expr(to_expr(q[i].raw())); s.assert_expr(to_expr(q[i].raw()));
lbool res = s.check_sat(0,0); lbool res = s.check_sat(0,0);
if (m().canceled()) {
throw iz3_exception(Z3_CANCELED_MSG);
}
if(res == l_false){ if(res == l_false){
::ast *proof = s.get_proof(); ::ast *proof = s.get_proof();
_proof = cook(proof); _proof = cook(proof);
@ -290,7 +293,7 @@ bool iz3base::is_sat(const std::vector<ast> &q, ast &_proof, std::vector<ast> &v
vars[i] = cook(r.get()); vars[i] = cook(r.get());
} }
} }
dealloc(m_solver); solver = 0;
return res != l_false; return res != l_false;
} }