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

consolidate freeze functionality into dependent_expr_state

Browse source 
rename size() to qtail() and introduce shortcuts
ensure tactic goals are not updated if they are in inconsistent state (because indices could be invalidated)
This commit is contained in:
Nikolaj Bjorner 2022-11-30 08:35:29 +07:00
parent 73a652cf4b
commit bec3acd146
21 changed files with 223 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ast/simplifiers/model_reconstruction_trail.cpp
View file

@ -26,7 +26,7 @@ Author:
void model_reconstruction_trail::replay(unsigned qhead, dependent_expr_state& st) {
ast_mark free_vars;
scoped_ptr<expr_replacer> rp = mk_default_expr_replacer(m, false);
for (unsigned i = qhead; i < st.size(); ++i)
for (unsigned i = qhead; i < st.qtail(); ++i)
add_vars(st[i], free_vars);
for (auto& t : m_trail) {
@ -64,7 +64,7 @@ void model_reconstruction_trail::replay(unsigned qhead, dependent_expr_state& st
dependent_expr de(m, t->m_def, t->m_dep);
add_vars(de, free_vars);
for (unsigned i = qhead; i < st.size(); ++i) {
for (unsigned i = qhead; i < st.qtail(); ++i) {
auto [f, dep1] = st[i]();
expr_ref g(m);
expr_dependency_ref dep2(m);
@ -77,7 +77,7 @@ void model_reconstruction_trail::replay(unsigned qhead, dependent_expr_state& st
rp->set_substitution(t->m_subst.get());
// rigid entries:
// apply substitution to added in case of rigid model convertions
for (unsigned i = qhead; i < st.size(); ++i) {
for (unsigned i = qhead; i < st.qtail(); ++i) {
auto [f, dep1] = st[i]();
auto [g, dep2] = rp->replace_with_dep(f);
dependent_expr d(m, g, m.mk_join(dep1, dep2));