mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

fix #2581

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-09-24 15:56:53 -07:00
parent 38ad66ce17
commit d0fc463a0c
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qe/nlqsat.cpp
View file

@ -609,7 +609,7 @@ namespace qe {
if (a.is_power(n, n1, n2) && a.is_numeral(n2, r) && r.is_unsigned()) { if (a.is_power(n, n1, n2) && a.is_numeral(n2, r) && r.is_unsigned()) {
return; return;
} }
if (a.is_div(n) && s.m_mode == qsat_t) { if (a.is_div(n) && s.m_mode == qsat_t && is_ground(n)) {
m_has_divs = true; m_has_divs = true;
return; return;
} }

20
src/smt/theory_arith_core.h
View file

@ -339,22 +339,32 @@ namespace smt {
template<typename Ext> template<typename Ext>
theory_var theory_arith<Ext>::internalize_mul(app * m) { theory_var theory_arith<Ext>::internalize_mul(app * m) {
rational _val; rational _val;
TRACE("arith", tout << mk_pp(m, get_manager()) << "\n";);
SASSERT(m_util.is_mul(m)); SASSERT(m_util.is_mul(m));
SASSERT(!m_util.is_numeral(m->get_arg(1))); expr* arg0 = m->get_arg(0);
if (m_util.is_numeral(m->get_arg(0), _val)) { expr* arg1 = m->get_arg(1);
if (m_util.is_numeral(arg1)) {
std::swap(arg0, arg1);
}
SASSERT(!m_util.is_numeral(arg1));
if (m_util.is_numeral(arg0, _val)) {
SASSERT(m->get_num_args() == 2); SASSERT(m->get_num_args() == 2);
numeral val(_val); numeral val(_val);
if (_val.is_zero()) {
return internalize_numeral(m, val);
}
SASSERT(!val.is_zero());
SASSERT(!val.is_one()); SASSERT(!val.is_one());
unsigned r_id = mk_row(); unsigned r_id = mk_row();
scoped_row_vars _sc(m_row_vars, m_row_vars_top); scoped_row_vars _sc(m_row_vars, m_row_vars_top);
if (is_var(m->get_arg(1))) { if (is_var(arg1)) {
std::ostringstream strm; std::ostringstream strm;
strm << mk_pp(m, get_manager()) << " contains a free variable"; strm << mk_pp(m, get_manager()) << " contains a free variable";
throw default_exception(strm.str()); throw default_exception(strm.str());
} }
if (reflection_enabled()) if (reflection_enabled())
internalize_term_core(to_app(m->get_arg(0))); internalize_term_core(to_app(arg0));
theory_var v = internalize_mul_core(to_app(m->get_arg(1))); theory_var v = internalize_mul_core(to_app(arg1));
add_row_entry<true>(r_id, val, v); add_row_entry<true>(r_id, val, v);
enode * e = mk_enode(m); enode * e = mk_enode(m);
theory_var s = mk_var(e); theory_var s = mk_var(e);