mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-25 11:26:21 +00:00
Code Activity

allow parsing declared arrays without requiring explicit select

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-12-06 18:02:07 -08:00
parent 52949f2d79
commit 20d1357c17
1 changed files with 48 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/cmd_context/cmd_context.cpp
View file

@ -1220,32 +1220,65 @@ bool cmd_context::try_mk_builtin_app(symbol const & s, unsigned num_args, expr *
return nullptr != result.get(); return nullptr != result.get();
} }
bool cmd_context::try_mk_declared_app(symbol const & s, unsigned num_args, expr * const * args, bool cmd_context::try_mk_declared_app(symbol const &s, unsigned num_args, expr *const *args, unsigned num_indices,
unsigned num_indices, parameter const * indices, sort * range, parameter const *indices, sort *range, expr_ref &result) {
expr_ref & result) {
if (!m_func_decls.contains(s)) if (!m_func_decls.contains(s))
return false; return false;
func_decls& fs = m_func_decls.find(s); func_decls &fs = m_func_decls.find(s);
if (num_args == 0 && !range) { if (num_args == 0 && !range) {
if (fs.more_than_one()) if (fs.more_than_one())
throw cmd_exception("ambiguous constant reference, more than one constant with the same sort, use a qualified expression (as <symbol> <sort>) to disambiguate ", s); throw cmd_exception("ambiguous constant reference, more than one constant with the same sort, use a "
func_decl * f = fs.first(); "qualified expression (as <symbol> <sort>) to disambiguate ",
s);
func_decl *f = fs.first();
if (!f) if (!f)
return false; return false;
if (f->get_arity() != 0) if (f->get_arity() != 0)
result = array_util(m()).mk_as_array(f); result = array_util(m()).mk_as_array(f);
else else
result = m().mk_const(f); result = m().mk_const(f);
return true; return true;
} }
func_decl * f = fs.find(m(), num_args, args, range); func_decl *f = fs.find(m(), num_args, args, range);
if (!f)
return false; if (f) {
if (well_sorted_check_enabled()) if (f && well_sorted_check_enabled())
m().check_sort(f, num_args, args); m().check_sort(f, num_args, args);
result = m().mk_app(f, num_args, args); result = m().mk_app(f, num_args, args);
return true; return true;
}
// f could be declared as an array and applied without explicit select
if (num_args > 0 && !range) {
if (fs.more_than_one())
throw cmd_exception("ambiguous constant reference, more than one constant with the same sort, use a "
"qualified expression (as <symbol> <sort>) to disambiguate ",
s);
func_decl *f = fs.first();
if (!f)
return false;
if (f->get_arity() != 0)
return false;
array_util au(m());
auto s = f->get_range();
if (!au.is_array(s))
return false;
unsigned sz = get_array_arity(s);
if (sz != num_args)
return false;
for (unsigned i = 0; i < sz; i++)
if (args[i]->get_sort() != get_array_domain(s, i))
return false;
expr_ref_vector new_args(m());
new_args.push_back(m().mk_const(f));
for (unsigned i = 0; i < num_args; i++)
new_args.push_back(args[i]);
result = au.mk_select(new_args.size(), new_args.data());
return true;
}
return false;
} }
bool cmd_context::try_mk_macro_app(symbol const & s, unsigned num_args, expr * const * args, bool cmd_context::try_mk_macro_app(symbol const & s, unsigned num_args, expr * const * args,