mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-03-16 10:10:02 +00:00
Code Activity

Standardize for-loop increments to prefix form (++i) (#8199)

Browse source 
* Initial plan

* Convert postfix to prefix increment in for loops

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Fix member variable increment conversion bug

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Update API generator to produce prefix increments

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
Copilot 2026-01-14 19:55:31 -08:00 • committed by GitHub
parent 1bf463d77a
commit 2436943794
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
475 changed files with 3237 additions and 3237 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/model/func_interp.cpp
View file

@ -28,7 +28,7 @@ func_entry::func_entry(ast_manager & m, unsigned arity, expr * const * args, exp
m_result(result) {
//SASSERT(is_ground(result));
m.inc_ref(result);
for (unsigned i = 0; i < arity; i++) {
for (unsigned i = 0; i < arity; ++i) {
expr * arg = args[i];
//SASSERT(is_ground(arg));
if (arg && !m.is_value(arg))
@ -53,7 +53,7 @@ void func_entry::set_result(ast_manager & m, expr * r) {
bool func_entry::eq_args(ast_manager & m, unsigned arity, expr * const * args) const {
unsigned i = 0;
for (; i < arity; i++) {
for (; i < arity; ++i) {
if (!m.are_equal(m_args[i], args[i]))
return false;
}
@ -61,7 +61,7 @@ bool func_entry::eq_args(ast_manager & m, unsigned arity, expr * const * args) c
}
void func_entry::deallocate(ast_manager & m, unsigned arity) {
for (unsigned i = 0; i < arity; i++) {
for (unsigned i = 0; i < arity; ++i) {
m.dec_ref(m_args[i]);
}
m.dec_ref(m_result);
@ -123,7 +123,7 @@ bool func_interp::is_fi_entry_expr(expr * e, ptr_vector<expr> & args) {
return false;
args.resize(m_arity);
for (unsigned i = 0; i < m_arity; i++) {
for (unsigned i = 0; i < m_arity; ++i) {
expr * ci = (m_arity == 1 && i == 0) ? c : to_app(c)->get_arg(i);
if (!m().is_eq(ci, a0, a1))
@ -215,12 +215,12 @@ void func_interp::insert_new_entry(expr * const * args, expr * r) {
CTRACE(func_interp_bug, get_entry(args) != 0,
tout << "Old: " << mk_ismt2_pp(get_entry(args)->m_result, m()) << "\n";
tout << "Args:";
for (unsigned i = 0; i < m_arity; i++) {
for (unsigned i = 0; i < m_arity; ++i) {
tout << mk_ismt2_pp(get_entry(args)->get_arg(i), m()) << "\n";
}
tout << "New: " << mk_ismt2_pp(r, m()) << "\n";
tout << "Args:";
for (unsigned i = 0; i < m_arity; i++) {
for (unsigned i = 0; i < m_arity; ++i) {
tout << mk_ismt2_pp(args[i], m()) << "\n";
}
tout << "Old: " << mk_ismt2_pp(get_entry(args)->get_result(), m()) << "\n";
@ -373,10 +373,10 @@ expr * func_interp::get_interp_core() const {
if (m_else == curr->get_result())
continue;
if (vars.empty())
for (unsigned i = 0; i < m_arity; i++)
for (unsigned i = 0; i < m_arity; ++i)
vars.push_back(m().mk_var(i, curr->get_arg(i)->get_sort()));
ptr_buffer<expr> eqs;
for (unsigned i = 0; i < m_arity; i++) {
for (unsigned i = 0; i < m_arity; ++i) {
eqs.push_back(m().mk_eq(vars[i], curr->get_arg(i)));
}
SASSERT(eqs.size() == m_arity);
@ -407,7 +407,7 @@ expr_ref func_interp::get_array_interp_core(func_decl * f) const {
bool ground = is_ground(m_else);
for (func_entry * curr : m_entries) {
ground &= is_ground(curr->get_result());
for (unsigned i = 0; i < m_arity; i++)
for (unsigned i = 0; i < m_arity; ++i)
ground &= is_ground(curr->get_arg(i));
}
if (!ground) {
@ -439,7 +439,7 @@ expr_ref func_interp::get_array_interp_core(func_decl * f) const {
}
args.reset();
args.push_back(r);
for (unsigned i = 0; i < m_arity; i++) {
for (unsigned i = 0; i < m_arity; ++i) {
args.push_back(curr->get_arg(i));
}
args.push_back(res);
@ -476,7 +476,7 @@ func_interp * func_interp::translate(ast_translation & translator) const {
for (func_entry * curr : m_entries) {
ptr_buffer<expr> new_args;
for (unsigned i = 0; i < m_arity; i++)
for (unsigned i = 0; i < m_arity; ++i)
new_args.push_back(translator(curr->get_arg(i)));
new_fi->insert_new_entry(new_args.data(), translator(curr->get_result()));
}