mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-14 09:56:15 +00:00
Code Activity

detect nested as-array in model values

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-09-01 23:25:14 -07:00
parent eb2b95e5fe
commit eb1ea9482e
1 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/model/model_evaluator.cpp
View file

@ -158,6 +158,35 @@ struct evaluator_cfg : public default_rewriter_cfg {
return st; return st;
} }
bool contains_as_array(expr* e) {
if (m_ar.is_as_array(e))
return true;
if (is_var(e))
return false;
if (is_app(e) && to_app(e)->get_num_args() == 0)
return false;
struct has_as_array {};
struct has_as_array_finder {
array_util& au;
has_as_array_finder(array_util& au): au(au) {}
void operator()(var* v) {}
void operator()(quantifier* q) {}
void operator()(app* a) {
if (au.is_as_array(a->get_decl()))
throw has_as_array();
}
};
has_as_array_finder ha(m_ar);
try {
for_each_expr(ha, e);
}
catch (has_as_array) {
return true;
}
return false;
}
br_status reduce_app_core(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) { br_status reduce_app_core(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) {
result_pr = nullptr; result_pr = nullptr;
family_id fid = f->get_family_id(); family_id fid = f->get_family_id();
@ -174,11 +203,17 @@ struct evaluator_cfg : public default_rewriter_cfg {
#endif #endif
if (num == 0 && (fid == null_family_id || _is_uninterp || m_ar.is_as_array(f))) { func_decl* g = nullptr;
expr * val = m_model.get_const_interp(f); if (num == 0 && m_ar.is_as_array(f, g)) {
auto* fi = m_model.get_func_interp(g);
if (fi && (result = fi->get_array_interp(g)))
return BR_REWRITE1;
}
if (num == 0 && (fid == null_family_id || _is_uninterp)) {
expr* val = m_model.get_const_interp(f);
if (val != nullptr) { if (val != nullptr) {
result = val; result = val;
st = m_ar.is_as_array(val) ? BR_REWRITE1 : BR_DONE; st = contains_as_array(val) ? BR_REWRITE_FULL : BR_DONE;
TRACE("model_evaluator", tout << result << "\n";); TRACE("model_evaluator", tout << result << "\n";);
return st; return st;
} }
@ -192,6 +227,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
result = val; result = val;
return BR_DONE; return BR_DONE;
} }
// fall through // fall through
} }