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

#5215

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-05-19 10:33:23 -07:00
parent d450fd4227
commit abe3ef2382
3 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/sat/tactic/goal2sat.cpp
View file

@ -75,7 +75,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
expr_ref_vector m_trail;
func_decl_ref_vector m_unhandled_funs;
bool m_default_external;
bool m_xor_solver { false };
bool m_euf { false };
bool m_drat { false };
bool m_is_redundant { false };
@ -108,7 +107,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
sat_params sp(p);
m_ite_extra = p.get_bool("ite_extra", true);
m_max_memory = megabytes_to_bytes(p.get_uint("max_memory", UINT_MAX));
m_xor_solver = p.get_bool("xor_solver", false);
m_euf = sp.euf();
m_drat = sp.drat_file().is_non_empty_string();
}
@ -576,7 +574,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
}
}
void convert_iff2(app * t, bool root, bool sign) {
void convert_iff(app * t, bool root, bool sign) {
if (t->get_num_args() != 2)
throw default_exception("unexpected number of arguments to xor");
SASSERT(t->get_num_args() == 2);
@ -611,13 +609,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
}
}
void convert_iff(app * t, bool root, bool sign) {
if (!m_euf && is_xor(t))
convert_ba(t, root, sign);
else
convert_iff2(t, root, sign);
}
func_decl_ref_vector const& interpreted_funs() {
auto* ext = dynamic_cast<euf::solver*>(m_solver.get_extension());
if (ext)
@ -723,10 +714,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
}
}
bool is_xor(app* t) const {
return m_xor_solver && m.is_iff(t) && m.is_iff(t->get_arg(1));
}
struct scoped_stack {
imp& i;
sat::literal_vector& r;
@ -784,11 +771,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
visit(t->get_arg(0), root, !sign);
continue;
}
if (!m_euf && is_xor(t)) {
convert_ba(t, root, sign);
m_frame_stack.pop_back();
continue;
}
unsigned num = t->get_num_args();
while (m_frame_stack[fsz-1].m_idx < num) {
expr * arg = t->get_arg(m_frame_stack[fsz-1].m_idx);