mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-05 06:45:45 +00:00
Code Activity

added support for named assertions

Browse source
This commit is contained in:
Leonardo de Moura 2012-11-02 14:00:15 -07:00
parent e1eb3ee8ee
commit e2f6a65aa2
12 changed files with 62 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/cmd_context/cmd_context.cpp
View file

@ -1076,7 +1076,6 @@ void cmd_context::reset(bool finalize) {
reset_macros();
reset_func_decls();
restore_assertions(0);
restore_assumptions(0);
if (m_solver)
m_solver->reset();
m_pp_env = 0;
@ -1108,6 +1107,8 @@ void cmd_context::assert_expr(expr * t) {
m_check_sat_result = 0;
m().inc_ref(t);
m_assertions.push_back(t);
if (m_produce_unsat_cores)
m_assertion_names.push_back(0);
if (m_solver)
m_solver->assert_expr(t);
}
@ -1119,11 +1120,14 @@ void cmd_context::assert_expr(symbol const & name, expr * t) {
assert_expr(t);
return;
}
app * proxy = m().mk_const(name, m().mk_bool_sort());
expr * new_t = m().mk_implies(proxy, t);
m().inc_ref(proxy);
m_assumptions.push_back(proxy);
assert_expr(new_t);
m_check_sat_result = 0;
m().inc_ref(t);
m_assertions.push_back(t);
expr * ans = m().mk_const(name, m().mk_bool_sort());
m().inc_ref(ans);
m_assertion_names.push_back(ans);
if (m_solver)
m_solver->assert_expr(t, ans);
}
void cmd_context::push() {
@ -1137,7 +1141,6 @@ void cmd_context::push() {
s.m_macros_stack_lim = m_macros_stack.size();
s.m_aux_pdecls_lim = m_aux_pdecls.size();
s.m_assertions_lim = m_assertions.size();
s.m_assumptions_lim = m_assumptions.size();
if (m_solver)
m_solver->push();
}
@ -1200,29 +1203,25 @@ void cmd_context::restore_aux_pdecls(unsigned old_sz) {
m_aux_pdecls.shrink(old_sz);
}
static void restore(ast_manager & m, ptr_vector<expr> & c, unsigned old_sz) {
ptr_vector<expr>::iterator it = c.begin() + old_sz;
ptr_vector<expr>::iterator end = c.end();
for (; it != end; ++it) {
m.dec_ref(*it);
}
c.shrink(old_sz);
}
void cmd_context::restore_assertions(unsigned old_sz) {
SASSERT(old_sz <= m_assertions.size());
SASSERT(!m_interactive_mode || m_assertions.size() == m_assertion_strings.size());
ptr_vector<expr>::iterator it = m_assertions.begin() + old_sz;
ptr_vector<expr>::iterator end = m_assertions.end();
for (; it != end; ++it) {
m().dec_ref(*it);
}
m_assertions.shrink(old_sz);
restore(m(), m_assertions, old_sz);
if (m_produce_unsat_cores)
restore(m(), m_assertion_names, old_sz);
if (m_interactive_mode)
m_assertion_strings.shrink(old_sz);
}
void cmd_context::restore_assumptions(unsigned old_sz) {
SASSERT(old_sz <= m_assumptions.size());
ptr_vector<expr>::iterator it = m_assumptions.begin() + old_sz;
ptr_vector<expr>::iterator end = m_assumptions.end();
for (; it != end; ++it) {
m().dec_ref(*it);
}
m_assumptions.shrink(old_sz);
}
void cmd_context::pop(unsigned n) {
m_check_sat_result = 0;
if (n == 0)
@ -1240,7 +1239,6 @@ void cmd_context::pop(unsigned n) {
restore_macros(s.m_macros_stack_lim);
restore_aux_pdecls(s.m_aux_pdecls_lim);
restore_assertions(s.m_assertions_lim);
restore_assumptions(s.m_assumptions_lim);
m_scopes.shrink(new_lvl);
}
@ -1266,11 +1264,9 @@ void cmd_context::check_sat(unsigned num_assumptions, expr * const * assumptions
scoped_watch sw(*this);
cancel_eh<solver> eh(*m_solver);
scoped_ctrl_c ctrlc(eh);
unsigned old_sz = m_assumptions.size();
m_assumptions.append(num_assumptions, assumptions);
lbool r;
try {
r = m_solver->check_sat(m_assumptions.size(), m_assumptions.c_ptr());
r = m_solver->check_sat(num_assumptions, assumptions);
}
catch (z3_error & ex) {
throw ex;
@ -1278,7 +1274,6 @@ void cmd_context::check_sat(unsigned num_assumptions, expr * const * assumptions
catch (z3_exception & ex) {
throw cmd_exception(ex.msg());
}
m_assumptions.shrink(old_sz);
m_solver->set_status(r);
display_sat_result(r);
validate_check_sat_result(r);

11
src/cmd_context/cmd_context.h
View file

@ -175,16 +175,15 @@ protected:
ptr_vector<pdecl> m_aux_pdecls;
ptr_vector<expr> m_assertions;
vector<std::string> m_assertion_strings;
ptr_vector<expr> m_assumptions; // for unsat-core extraction
ptr_vector<expr> m_assertion_names; // named assertions are represented using boolean variables.
struct scope {
unsigned m_func_decls_stack_lim;
unsigned m_psort_decls_stack_lim;
unsigned m_macros_stack_lim;
unsigned m_aux_pdecls_lim;
// only m_assertions_lim and m_assumptions_lim are relevant when m_global_decls = true
// only m_assertions_lim is relevant when m_global_decls = true
unsigned m_assertions_lim;
unsigned m_assumptions_lim;
};
svector<scope> m_scopes;
@ -225,7 +224,6 @@ protected:
void restore_macros(unsigned old_sz);
void restore_aux_pdecls(unsigned old_sz);
void restore_assertions(unsigned old_sz);
void restore_assumptions(unsigned old_sz);
void erase_func_decl_core(symbol const & s, func_decl * f);
void erase_psort_decl_core(symbol const & s);
@ -369,8 +367,8 @@ public:
ptr_vector<expr>::const_iterator begin_assertions() const { return m_assertions.begin(); }
ptr_vector<expr>::const_iterator end_assertions() const { return m_assertions.end(); }
ptr_vector<expr>::const_iterator begin_assumptions() const { return m_assumptions.begin(); }
ptr_vector<expr>::const_iterator end_assumptions() const { return m_assumptions.end(); }
ptr_vector<expr>::const_iterator begin_assertion_names() const { return m_assertion_names.begin(); }
ptr_vector<expr>::const_iterator end_assertion_names() const { return m_assertion_names.end(); }
/**
\brief Hack: consume assertions if there are no scopes.
@ -380,7 +378,6 @@ public:
if (num_scopes() > 0)
return false;
restore_assertions(0);
restore_assumptions(0);
return true;
}

24
src/cmd_context/cmd_context_to_goal.cpp
View file

@ -27,20 +27,22 @@ void assert_exprs_from(cmd_context const & ctx, goal & t) {
throw cmd_exception("Frontend does not support simultaneous generation of proofs and unsat cores");
ast_manager & m = t.m();
bool proofs_enabled = t.proofs_enabled();
ptr_vector<expr>::const_iterator it = ctx.begin_assertions();
ptr_vector<expr>::const_iterator end = ctx.end_assertions();
for (; it != end; ++it) {
t.assert_expr(*it, proofs_enabled ? m.mk_asserted(*it) : 0, 0);
}
if (ctx.produce_unsat_cores()) {
SASSERT(!ctx.produce_proofs());
it = ctx.begin_assumptions();
end = ctx.end_assumptions();
for (; it != end; ++it) {
t.assert_expr(*it, 0, m.mk_leaf(*it));
ptr_vector<expr>::const_iterator it = ctx.begin_assertions();
ptr_vector<expr>::const_iterator end = ctx.end_assertions();
ptr_vector<expr>::const_iterator it2 = ctx.begin_assertion_names();
ptr_vector<expr>::const_iterator end2 = ctx.end_assertion_names();
SASSERT(end - it == end2 - it2);
for (; it != end; ++it, ++it2) {
t.assert_expr(*it, proofs_enabled ? m.mk_asserted(*it) : 0, m.mk_leaf(*it2));
}
}
else {
SASSERT(ctx.begin_assumptions() == ctx.end_assumptions());
ptr_vector<expr>::const_iterator it = ctx.begin_assertions();
ptr_vector<expr>::const_iterator end = ctx.end_assertions();
for (; it != end; ++it) {
t.assert_expr(*it, proofs_enabled ? m.mk_asserted(*it) : 0, 0);
}
SASSERT(ctx.begin_assertion_names() == ctx.end_assertion_names());
}
}