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

fix #4266

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-05-11 16:53:59 -07:00
parent 754bafc95e
commit 884a68251b
6 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/model/func_interp.cpp
View file

@ -357,14 +357,14 @@ expr * func_interp::get_interp_core() const {
return r;
}
expr* func_interp::get_array_interp_core(func_decl * f) const {
expr_ref func_interp::get_array_interp_core_(func_decl * f) const {
if (m_else == nullptr)
return nullptr;
return expr_ref(m_manager);
ptr_vector<sort> domain;
for (sort* s : *f) {
domain.push_back(s);
}
expr* r;
expr_ref r(m_manager);
bool ground = is_ground(m_else);
for (func_entry * curr : m_entries) {
@ -376,13 +376,17 @@ expr* func_interp::get_array_interp_core(func_decl * f) const {
if (!ground) {
r = get_interp();
if (!r) return r;
sort_ref_vector vars(m_manager);
sort_ref_vector sorts(m_manager);
expr_ref_vector vars(m_manager);
svector<symbol> var_names;
var_subst sub(m_manager, false);
for (unsigned i = 0; i < m_arity; ++i) {
var_names.push_back(symbol(i));
vars.push_back(domain.get(m_arity - i - 1));
sorts.push_back(domain.get(i));
vars.push_back(m_manager.mk_var(m_arity - i - 1, sorts.back()));
}
r = m_manager.mk_lambda(vars.size(), vars.c_ptr(), var_names.c_ptr(), r);
r = sub(r, vars);
r = m_manager.mk_lambda(sorts.size(), sorts.c_ptr(), var_names.c_ptr(), r);
return r;
}
@ -419,11 +423,11 @@ expr * func_interp::get_interp() const {
return r;
}
expr * func_interp::get_array_interp(func_decl * f) const {
expr_ref func_interp::get_array_interp_(func_decl * f) const {
if (m_array_interp != nullptr)
return m_array_interp;
expr* r = get_array_interp_core(f);
if (r != nullptr) {
return expr_ref(m_array_interp, m_manager);
expr_ref r = get_array_interp_core_(f);
if (r) {
const_cast<func_interp*>(this)->m_array_interp = r;
m_manager.inc_ref(m_array_interp);
}

4
src/model/func_interp.h
View file

@ -79,7 +79,7 @@ class func_interp {
expr * get_interp_core() const;
expr * get_array_interp_core(func_decl * f) const;
expr_ref get_array_interp_core_(func_decl * f) const;
public:
func_interp(ast_manager & m, unsigned arity);
@ -116,7 +116,7 @@ public:
expr * get_interp() const;
expr * get_array_interp(func_decl* f) const;
expr_ref get_array_interp_(func_decl* f) const;
func_interp * translate(ast_translation & translator) const;

2
src/model/model.cpp
View file

@ -448,7 +448,7 @@ expr_ref model::cleanup_expr(top_sort& ts, expr* e, unsigned current_partition)
// only expand auxiliary definitions that occur once.
if (can_inline_def(ts, f)) {
fi = get_func_interp(f);
new_t = fi->get_array_interp(f);
new_t = fi->get_array_interp_(f);
TRACE("model", tout << "array interpretation:" << new_t << "\n";);
}
}

2
src/model/model_evaluator.cpp
View file

@ -253,7 +253,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
return BR_DONE;
}
func_interp * fi = m_model.get_func_interp(g);
if (fi && (result = fi->get_array_interp(g))) {
if (fi && (result = fi->get_array_interp_(g))) {
model_evaluator ev(m_model, m_params);
result = ev(result);
m_pinned.push_back(result);