3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-16 13:51:44 +00:00

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

* 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

View file

@ -33,7 +33,7 @@ expr_ref var_subst::operator()(expr * n, unsigned num_args, expr * const * args)
//There is no need to print the bindings here?
SCTRACE(bindings, is_trace_enabled(TraceTag::coming_from_quant),
tout << "(ground)\n";
for (unsigned i = 0; i < num_args; i++) {
for (unsigned i = 0; i < num_args; ++i) {
if (args[i]) {
tout << i << ": " << mk_ismt2_pp(args[i], result.m()) << ";\n";
}
@ -80,7 +80,7 @@ expr_ref var_subst::operator()(expr * n, unsigned num_args, expr * const * args)
SASSERT(is_well_sorted(m, result));
TRACE(var_subst_bug,
tout << "m_std_order: " << m_std_order << "\n" << mk_ismt2_pp(n, m) << "\nusing\n";
for (unsigned i = 0; i < num_args; i++) tout << mk_ismt2_pp(args[i], m) << "\n";
for (unsigned i = 0; i < num_args; ++i) tout << mk_ismt2_pp(args[i], m) << "\n";
tout << "\n------>\n";
tout << result << "\n";);
return result;
@ -114,10 +114,10 @@ expr_ref unused_vars_eliminator::operator()(quantifier* q) {
m_used.set_num_decls(num_decls);
m_used.process(q->get_expr());
unsigned num_patterns = q->get_num_patterns();
for (unsigned i = 0; i < num_patterns; i++)
for (unsigned i = 0; i < num_patterns; ++i)
m_used.process(q->get_pattern(i));
unsigned num_no_patterns = q->get_num_no_patterns();
for (unsigned i = 0; i < num_no_patterns; i++)
for (unsigned i = 0; i < num_no_patterns; ++i)
m_used.process(q->get_no_pattern(i));
@ -154,7 +154,7 @@ expr_ref unused_vars_eliminator::operator()(quantifier* q) {
}
// (VAR 0) is in the first position of var_mapping.
for (unsigned i = num_decls; i < sz; i++) {
for (unsigned i = num_decls; i < sz; ++i) {
sort * s = m_used.contains(i);
if (s)
var_mapping.push_back(m.mk_var(i - num_removed, s));
@ -180,10 +180,10 @@ expr_ref unused_vars_eliminator::operator()(quantifier* q) {
expr_ref_buffer new_patterns(m);
expr_ref_buffer new_no_patterns(m);
for (unsigned i = 0; i < num_patterns; i++) {
for (unsigned i = 0; i < num_patterns; ++i) {
new_patterns.push_back(m_subst(q->get_pattern(i), var_mapping.size(), var_mapping.data()));
}
for (unsigned i = 0; i < num_no_patterns; i++) {
for (unsigned i = 0; i < num_no_patterns; ++i) {
new_no_patterns.push_back(m_subst(q->get_no_pattern(i), var_mapping.size(), var_mapping.data()));
}
@ -220,7 +220,7 @@ expr_ref instantiate(ast_manager & m, quantifier * q, expr * const * exprs) {
shift(new_expr, q->get_num_decls(), result);
SASSERT(is_well_sorted(m, result));
TRACE(instantiate_bug, tout << mk_ismt2_pp(q, m) << "\nusing\n";
for (unsigned i = 0; i < q->get_num_decls(); i++) tout << mk_ismt2_pp(exprs[i], m) << "\n";
for (unsigned i = 0; i < q->get_num_decls(); ++i) tout << mk_ismt2_pp(exprs[i], m) << "\n";
tout << "\n----->\n" << mk_ismt2_pp(result, m) << "\n";);
return result;
}