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

separate rewriter used by smt context from asserted formulas to avoid term substitution, exposed by #2370

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-07-02 15:28:21 +07:00
parent e5dffeace4
commit db87f2aab0
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/asserted_formulas.h
View file

@ -244,7 +244,7 @@ public:
expr * get_formula(unsigned idx) const { return m_formulas[idx].get_fml(); } expr * get_formula(unsigned idx) const { return m_formulas[idx].get_fml(); }
proof * get_formula_proof(unsigned idx) const { return m_formulas[idx].get_proof(); } proof * get_formula_proof(unsigned idx) const { return m_formulas[idx].get_proof(); }
th_rewriter & get_rewriter() { return m_rewriter; } params_ref const& get_params() const { return m_params; }
void get_assertions(ptr_vector<expr> & result) const; void get_assertions(ptr_vector<expr> & result) const;
bool empty() const { return m_formulas.empty(); } bool empty() const { return m_formulas.empty(); }
void display(std::ostream & out) const; void display(std::ostream & out) const;

2
src/smt/smt_context.cpp
View file

@ -47,6 +47,7 @@ namespace smt {
m_params(_p), m_params(_p),
m_setup(*this, p), m_setup(*this, p),
m_asserted_formulas(m, p, _p), m_asserted_formulas(m, p, _p),
m_rewriter(m),
m_qmanager(alloc(quantifier_manager, *this, p, _p)), m_qmanager(alloc(quantifier_manager, *this, p, _p)),
m_model_generator(alloc(model_generator, m)), m_model_generator(alloc(model_generator, m)),
m_relevancy_propagator(mk_relevancy_propagator(*this)), m_relevancy_propagator(mk_relevancy_propagator(*this)),
@ -94,6 +95,7 @@ namespace smt {
SASSERT(m_search_lvl == 0); SASSERT(m_search_lvl == 0);
m_case_split_queue = mk_case_split_queue(*this, p); m_case_split_queue = mk_case_split_queue(*this, p);
m_rewriter.updt_params(m_asserted_formulas.get_params());
init(); init();

3
src/smt/smt_context.h
View file

@ -85,6 +85,7 @@ namespace smt {
setup m_setup; setup m_setup;
timer m_timer; timer m_timer;
asserted_formulas m_asserted_formulas; asserted_formulas m_asserted_formulas;
th_rewriter m_rewriter;
scoped_ptr<quantifier_manager> m_qmanager; scoped_ptr<quantifier_manager> m_qmanager;
scoped_ptr<model_generator> m_model_generator; scoped_ptr<model_generator> m_model_generator;
scoped_ptr<relevancy_propagator> m_relevancy_propagator; scoped_ptr<relevancy_propagator> m_relevancy_propagator;
@ -261,7 +262,7 @@ namespace smt {
} }
th_rewriter & get_rewriter() { th_rewriter & get_rewriter() {
return m_asserted_formulas.get_rewriter(); return m_rewriter;
} }
smt_params & get_fparams() { smt_params & get_fparams() {

1
src/smt/theory_arith_core.h
View file

@ -426,6 +426,7 @@ namespace smt {
bool negated; bool negated;
s(ante, s_ante); s(ante, s_ante);
if (ctx.get_cancel_flag()) return; if (ctx.get_cancel_flag()) return;
negated = m.is_not(s_ante, s_ante_n); negated = m.is_not(s_ante, s_ante_n);
if (negated) s_ante = s_ante_n; if (negated) s_ante = s_ante_n;