mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +00:00
Code Activity

fix #3679

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-02 15:04:05 -07:00
parent f98b94bdbc
commit 896a1b2048
17 changed files with 59 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qe/nlarith_util.cpp
View file

@ -546,7 +546,7 @@ namespace nlarith {
sqrt_form e0(*this, mk_uminus(c), 0, z(), b);
// a_i = 0 /\ b_i != 0 /\ phi[e_i/x]
TRACE("nlarith", display(tout << "a_i != 0 & b_i != 0 & hi[e_i / x]", p);tout<<"\n";);
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m());
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m(), false);
expr_substitution sub(m());
sub.insert(a, z());
rp->set_substitution(&sub);
@ -610,7 +610,7 @@ namespace nlarith {
sqrt_form e0(*this, mk_uminus(c), 0, z(), b);
es.reset();
subst.reset();
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m());
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m(), false);
expr_substitution sub(m());
sub.insert(a, z());
rp->set_substitution(&sub);

6
src/qe/qe.cpp
View file

@ -351,7 +351,7 @@ namespace qe {
scoped_ptr<expr_replacer> m_replace;
public:
lift_ite(ast_manager& m, i_expr_pred& is_relevant) :
m(m), m_is_relevant(is_relevant), m_rewriter(m), m_replace(mk_default_expr_replacer(m)) {}
m(m), m_is_relevant(is_relevant), m_rewriter(m), m_replace(mk_default_expr_replacer(m, false)) {}
bool operator()(expr* fml, expr_ref& result) {
if (m.is_ite(fml)) {
@ -1465,7 +1465,7 @@ namespace qe {
if (!is_sat) {
fml = m.mk_false();
if (m_fml.get() != m_subfml.get()) {
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m);
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m, false);
rp->apply_substitution(to_app(m_subfml.get()), fml, m_fml);
fml = m_fml;
}
@ -1497,7 +1497,7 @@ namespace qe {
if (!m_free_vars.empty() || m_solver.inconsistent()) {
if (m_fml.get() != m_subfml.get()) {
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m);
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m, false);
rp->apply_substitution(to_app(m_subfml.get()), fml, m_fml);
fml = m_fml;
}