From 243694379475d983605f87578452a330f3e3b28f Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 14 Jan 2026 19:55:31 -0800 Subject: [PATCH] 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> --- scripts/update_api.py | 12 +- .../ackermannize_bv_tactic.cpp | 2 +- src/ackermannization/ackr_bound_probe.cpp | 2 +- src/ackermannization/ackr_model_converter.cpp | 2 +- .../lackr_model_constructor.cpp | 6 +- src/api/api_algebraic.cpp | 4 +- src/api/api_ast.cpp | 6 +- src/api/api_ast_vector.cpp | 4 +- src/api/api_datatype.cpp | 2 +- src/api/api_opt.cpp | 4 +- src/api/api_params.cpp | 2 +- src/api/api_polynomial.cpp | 2 +- src/api/api_quant.cpp | 2 +- src/api/api_rcf.cpp | 4 +- src/api/api_solver.cpp | 4 +- src/api/api_tactic.cpp | 4 +- src/api/c++/z3++.h | 34 +- src/api/julia/z3jl.cpp | 6 +- src/api/z3_replayer.cpp | 16 +- src/ast/act_cache.cpp | 2 +- src/ast/arith_decl_plugin.cpp | 4 +- src/ast/array_decl_plugin.cpp | 10 +- src/ast/ast.cpp | 94 ++-- src/ast/ast.h | 6 +- src/ast/ast_ll_pp.cpp | 8 +- src/ast/ast_lt.cpp | 16 +- src/ast/ast_smt2_pp.cpp | 26 +- src/ast/ast_translation.cpp | 6 +- src/ast/ast_util.cpp | 4 +- src/ast/ast_util.h | 6 +- src/ast/bv_decl_plugin.cpp | 6 +- src/ast/converters/converter.h | 2 +- src/ast/converters/expr_inverter.cpp | 26 +- src/ast/converters/proof_converter.cpp | 2 +- src/ast/datatype_decl_plugin.cpp | 10 +- src/ast/decl_collector.cpp | 4 +- src/ast/display_dimacs.cpp | 6 +- src/ast/euf/euf_etable.cpp | 2 +- src/ast/euf/euf_mam.cpp | 82 ++-- src/ast/expr2polynomial.cpp | 16 +- src/ast/for_each_ast.cpp | 2 +- src/ast/for_each_ast.h | 2 +- src/ast/for_each_expr.h | 2 +- src/ast/fpa/bv2fpa_converter.cpp | 10 +- src/ast/fpa/fpa2bv_converter.cpp | 22 +- src/ast/fpa/fpa2bv_rewriter.cpp | 8 +- src/ast/fpa_decl_plugin.cpp | 12 +- src/ast/macros/macro_finder.cpp | 4 +- src/ast/macros/macro_manager.cpp | 14 +- src/ast/macros/macro_util.cpp | 28 +- src/ast/macros/quantifier_macro_info.cpp | 2 +- src/ast/macros/quasi_macros.cpp | 24 +- src/ast/normal_forms/defined_names.cpp | 2 +- src/ast/normal_forms/nnf.cpp | 14 +- src/ast/normal_forms/pull_quant.cpp | 4 +- src/ast/num_occurs.cpp | 2 +- src/ast/pattern/pattern_inference.cpp | 22 +- src/ast/pattern/pattern_inference.h | 2 +- src/ast/pp.cpp | 4 +- src/ast/proofs/proof_checker.cpp | 10 +- src/ast/recurse_expr_def.h | 12 +- src/ast/rewriter/arith_rewriter.cpp | 14 +- src/ast/rewriter/array_rewriter.cpp | 10 +- src/ast/rewriter/ast_counter.cpp | 4 +- .../bit_blaster/bit_blaster_rewriter.cpp | 16 +- .../bit_blaster/bit_blaster_tpl_def.h | 68 +-- src/ast/rewriter/bool_rewriter.cpp | 24 +- src/ast/rewriter/bv_elim.cpp | 4 +- src/ast/rewriter/bv_rewriter.cpp | 50 +-- src/ast/rewriter/cached_var_subst.cpp | 6 +- src/ast/rewriter/der.cpp | 14 +- src/ast/rewriter/distribute_forall.cpp | 2 +- src/ast/rewriter/elim_bounds.cpp | 4 +- src/ast/rewriter/inj_axiom.cpp | 4 +- src/ast/rewriter/macro_replacer.cpp | 6 +- src/ast/rewriter/maximize_ac_sharing.cpp | 12 +- src/ast/rewriter/poly_rewriter_def.h | 54 +-- src/ast/rewriter/push_app_ite.cpp | 8 +- src/ast/rewriter/rewriter.cpp | 6 +- src/ast/rewriter/rewriter_def.h | 12 +- src/ast/rewriter/seq_rewriter.cpp | 2 +- src/ast/rewriter/th_rewriter.cpp | 12 +- src/ast/rewriter/var_subst.cpp | 16 +- src/ast/seq_decl_plugin.cpp | 2 +- src/ast/simplifiers/bound_propagator.cpp | 20 +- src/ast/simplifiers/bound_simplifier.cpp | 4 +- src/ast/simplifiers/dependent_expr_state.cpp | 2 +- src/ast/simplifiers/eliminate_predicates.cpp | 2 +- src/ast/simplifiers/linear_equation.cpp | 32 +- .../simplifiers/reduce_args_simplifier.cpp | 10 +- src/ast/sls/bvsls_opt_engine.cpp | 10 +- src/ast/sls/bvsls_opt_engine.h | 2 +- src/ast/sls/sls_bv_engine.cpp | 16 +- src/ast/sls/sls_bv_evaluator.h | 50 +-- src/ast/sls/sls_bv_tracker.h | 42 +- src/ast/sls/sls_powers.h | 2 +- src/ast/sls/sls_seq_plugin.cpp | 4 +- src/ast/static_features.cpp | 12 +- src/ast/substitution/demodulator_rewriter.cpp | 6 +- src/ast/substitution/substitution.cpp | 18 +- src/ast/substitution/substitution_tree.cpp | 16 +- src/ast/substitution/unifier.cpp | 2 +- src/ast/used_symbols.h | 6 +- src/ast/used_vars.cpp | 6 +- src/ast/well_sorted.cpp | 2 +- src/cmd_context/basic_cmds.cpp | 4 +- src/cmd_context/cmd_context.cpp | 32 +- src/cmd_context/extra_cmds/dbg_cmds.cpp | 2 +- .../extra_cmds/polynomial_cmds.cpp | 6 +- src/cmd_context/pdecl.cpp | 16 +- src/cmd_context/pdecl.h | 4 +- src/cmd_context/simplifier_cmds.cpp | 2 +- src/cmd_context/tactic_cmds.cpp | 16 +- src/math/grobner/grobner.cpp | 24 +- src/math/interval/interval_def.h | 8 +- src/math/lp/core_solver_pretty_printer_def.h | 22 +- src/math/lp/cross_nested.h | 4 +- src/math/lp/dense_matrix.h | 6 +- src/math/lp/dense_matrix_def.h | 34 +- src/math/lp/dioph_eq.cpp | 20 +- src/math/lp/emonics.cpp | 2 +- src/math/lp/factorization.cpp | 2 +- src/math/lp/general_matrix.h | 30 +- src/math/lp/hnf.h | 70 +-- src/math/lp/hnf_cutter.cpp | 16 +- src/math/lp/horner.cpp | 2 +- src/math/lp/indexed_vector_def.h | 4 +- src/math/lp/int_branch.cpp | 4 +- src/math/lp/int_cube.cpp | 2 +- src/math/lp/int_gcd_test.cpp | 2 +- src/math/lp/int_solver.cpp | 6 +- src/math/lp/lar_constraints.h | 4 +- src/math/lp/lar_core_solver.h | 6 +- src/math/lp/lar_core_solver_def.h | 2 +- src/math/lp/lar_solver.cpp | 34 +- src/math/lp/lar_solver.h | 4 +- src/math/lp/lar_term.h | 2 +- src/math/lp/lp_core_solver_base.h | 12 +- src/math/lp/lp_core_solver_base_def.h | 20 +- src/math/lp/lp_primal_core_solver.h | 2 +- src/math/lp/lp_primal_core_solver_def.h | 4 +- .../lp/lp_primal_core_solver_tableau_def.h | 6 +- src/math/lp/lp_settings.h | 2 +- src/math/lp/lp_utils.h | 4 +- src/math/lp/matrix.h | 2 +- src/math/lp/matrix_def.h | 24 +- src/math/lp/monic.h | 2 +- src/math/lp/nex_creator.cpp | 14 +- src/math/lp/nex_creator.h | 2 +- src/math/lp/nla_core.cpp | 14 +- src/math/lp/nla_defs.h | 2 +- src/math/lp/nla_grobner.cpp | 8 +- src/math/lp/nla_intervals.cpp | 4 +- src/math/lp/nla_monotone_lemmas.cpp | 2 +- src/math/lp/nla_order_lemmas.cpp | 4 +- src/math/lp/nla_pp.cpp | 8 +- src/math/lp/nla_throttle.h | 2 +- src/math/lp/permutation_matrix.h | 2 +- src/math/lp/permutation_matrix_def.h | 8 +- src/math/lp/static_matrix.h | 2 +- src/math/lp/static_matrix_def.h | 26 +- src/math/lp/test_bound_analyzer.h | 6 +- src/math/lp/var_eqs.h | 2 +- src/math/polynomial/algebraic_numbers.cpp | 54 +-- src/math/polynomial/linear_eq_solver.h | 30 +- src/math/polynomial/polynomial.cpp | 400 +++++++++--------- src/math/polynomial/polynomial_cache.cpp | 8 +- src/math/polynomial/polynomial_var2value.h | 2 +- src/math/polynomial/rpolynomial.cpp | 32 +- src/math/polynomial/sexpr2upolynomial.cpp | 6 +- src/math/polynomial/upolynomial.cpp | 146 +++---- src/math/polynomial/upolynomial.h | 8 +- .../polynomial/upolynomial_factorization.cpp | 2 +- src/math/realclosure/mpz_matrix.cpp | 68 +-- src/math/realclosure/realclosure.cpp | 150 +++---- src/math/simplex/sparse_matrix_def.h | 4 +- src/math/subpaving/subpaving.cpp | 8 +- src/math/subpaving/subpaving_t_def.h | 68 +-- src/math/subpaving/tactic/expr2subpaving.cpp | 8 +- .../subpaving/tactic/subpaving_tactic.cpp | 4 +- src/model/array_factory.cpp | 6 +- src/model/datatype_factory.cpp | 8 +- src/model/func_interp.cpp | 22 +- src/model/model_evaluator.cpp | 4 +- src/model/model_implicant.cpp | 4 +- src/model/model_pp.cpp | 14 +- src/model/model_smt2_pp.cpp | 22 +- src/model/model_v2_pp.cpp | 8 +- src/muz/base/dl_context.cpp | 2 +- src/muz/base/dl_rule.cpp | 36 +- src/muz/base/dl_rule_set.cpp | 12 +- src/muz/base/dl_util.cpp | 30 +- src/muz/base/dl_util.h | 24 +- src/muz/fp/datalog_parser.cpp | 2 +- src/muz/fp/horn_tactic.cpp | 2 +- src/muz/rel/dl_base.cpp | 32 +- src/muz/rel/dl_base.h | 20 +- src/muz/rel/dl_compiler.cpp | 38 +- src/muz/rel/dl_finite_product_relation.cpp | 78 ++-- src/muz/rel/dl_instruction.cpp | 4 +- src/muz/rel/dl_mk_explanations.cpp | 22 +- src/muz/rel/dl_mk_similarity_compressor.cpp | 44 +- src/muz/rel/dl_mk_simple_joins.cpp | 28 +- src/muz/rel/dl_product_relation.cpp | 18 +- src/muz/rel/dl_relation_manager.cpp | 24 +- src/muz/rel/dl_sieve_relation.cpp | 16 +- src/muz/rel/dl_sparse_table.cpp | 24 +- src/muz/rel/dl_table.cpp | 2 +- src/muz/rel/dl_table_relation.cpp | 2 +- src/muz/rel/rel_context.cpp | 2 +- src/muz/spacer/spacer_cluster.cpp | 4 +- src/muz/spacer/spacer_context.cpp | 40 +- src/muz/spacer/spacer_convex_closure.cpp | 16 +- .../spacer/spacer_expand_bnd_generalizer.cpp | 2 +- src/muz/spacer/spacer_global_generalizer.cpp | 14 +- src/muz/spacer/spacer_legacy_mbp.cpp | 2 +- src/muz/spacer/spacer_legacy_mev.cpp | 2 +- src/muz/spacer/spacer_matrix.cpp | 6 +- src/muz/spacer/spacer_prop_solver.cpp | 2 +- src/muz/spacer/spacer_qe_project.cpp | 54 +-- src/muz/spacer/spacer_quant_generalizer.cpp | 8 +- src/muz/spacer/spacer_sat_answer.cpp | 4 +- src/muz/transforms/dl_mk_array_eq_rewrite.cpp | 6 +- .../transforms/dl_mk_array_instantiation.cpp | 36 +- src/muz/transforms/dl_mk_filter_rules.cpp | 8 +- .../dl_mk_interp_tail_simplifier.cpp | 10 +- src/muz/transforms/dl_mk_magic_sets.cpp | 24 +- src/muz/transforms/dl_mk_rule_inliner.cpp | 6 +- .../transforms/dl_mk_subsumption_checker.cpp | 14 +- .../transforms/dl_mk_unbound_compressor.cpp | 16 +- src/nlsat/nlsat_clause.cpp | 6 +- src/nlsat/nlsat_evaluator.cpp | 34 +- src/nlsat/nlsat_explain.cpp | 66 +-- src/nlsat/nlsat_interval_set.cpp | 22 +- src/nlsat/nlsat_scoped_literal_vector.h | 4 +- src/nlsat/nlsat_solver.cpp | 152 +++---- src/nlsat/nlsat_types.cpp | 4 +- .../nlsat_variable_ordering_strategy.cpp | 16 +- src/nlsat/tactic/goal2nlsat.cpp | 6 +- src/nlsat/tactic/nlsat_tactic.cpp | 10 +- src/opt/opt_context.cpp | 2 +- src/opt/opt_solver.cpp | 2 +- src/params/context_params.cpp | 2 +- src/parsers/smt2/smt2parser.cpp | 6 +- src/parsers/smt2/smt2scanner.cpp | 2 +- src/qe/lite/qe_lite_tactic.cpp | 102 ++--- src/qe/mbp/mbp_arrays.cpp | 14 +- src/qe/mbp/mbp_arrays_tg.cpp | 4 +- src/qe/mbp/mbp_dt_tg.cpp | 8 +- src/qe/qe_tactic.cpp | 2 +- src/sat/sat_asymm_branch.cpp | 6 +- src/sat/sat_big.cpp | 4 +- src/sat/sat_clause.cpp | 14 +- src/sat/sat_cleaner.cpp | 4 +- src/sat/sat_elim_eqs.cpp | 6 +- src/sat/sat_gc.cpp | 6 +- src/sat/sat_integrity_checker.cpp | 10 +- src/sat/sat_probing.cpp | 8 +- src/sat/sat_scc.cpp | 4 +- src/sat/sat_simplifier.cpp | 16 +- src/sat/sat_solver.cpp | 62 +-- src/sat/sat_types.h | 2 +- src/sat/smt/array_axioms.cpp | 14 +- src/sat/smt/array_internalize.cpp | 4 +- src/sat/smt/array_model.cpp | 6 +- src/sat/smt/atom2bool_var.cpp | 10 +- src/sat/smt/bv_internalize.cpp | 4 +- src/sat/smt/bv_invariant.cpp | 2 +- src/sat/smt/bv_solver.cpp | 8 +- src/sat/smt/dt_solver.cpp | 4 +- src/sat/smt/fpa_solver.cpp | 4 +- src/sat/smt/pb_solver.cpp | 6 +- src/sat/smt/q_ematch.cpp | 6 +- src/sat/smt/q_queue.cpp | 2 +- src/sat/tactic/goal2sat.cpp | 12 +- src/sat/tactic/sat_tactic.cpp | 2 +- src/shell/dimacs_frontend.cpp | 4 +- src/shell/main.cpp | 2 +- src/smt/diff_logic.h | 16 +- src/smt/dyn_ack.cpp | 4 +- src/smt/fingerprints.cpp | 10 +- src/smt/mam.cpp | 104 ++--- src/smt/proto_model/proto_model.cpp | 2 +- src/smt/qi_queue.cpp | 16 +- src/smt/smt_almost_cg_table.cpp | 2 +- src/smt/smt_case_split_queue.cpp | 18 +- src/smt/smt_cg_table.cpp | 2 +- src/smt/smt_checker.cpp | 2 +- src/smt/smt_clause.cpp | 14 +- src/smt/smt_conflict_resolution.cpp | 32 +- src/smt/smt_conflict_resolution.h | 2 +- src/smt/smt_context.cpp | 70 +-- src/smt/smt_context.h | 2 +- src/smt/smt_context_inv.cpp | 4 +- src/smt/smt_context_pp.cpp | 18 +- src/smt/smt_context_stat.cpp | 10 +- src/smt/smt_enode.cpp | 14 +- src/smt/smt_for_each_relevant_expr.cpp | 6 +- src/smt/smt_internalizer.cpp | 18 +- src/smt/smt_justification.cpp | 24 +- src/smt/smt_kernel.cpp | 2 +- src/smt/smt_literal.cpp | 8 +- src/smt/smt_model_checker.cpp | 6 +- src/smt/smt_model_finder.cpp | 18 +- src/smt/smt_model_generator.cpp | 10 +- src/smt/smt_quantifier.cpp | 6 +- src/smt/smt_quick_checker.cpp | 32 +- src/smt/smt_relevancy.cpp | 10 +- src/smt/smt_solver.cpp | 8 +- src/smt/smt_theory.cpp | 6 +- src/smt/smt_theory.h | 2 +- src/smt/tactic/smt_tactic_core.cpp | 6 +- src/smt/theory_arith_aux.h | 22 +- src/smt/theory_arith_core.h | 12 +- src/smt/theory_arith_int.h | 24 +- src/smt/theory_arith_inv.h | 8 +- src/smt/theory_arith_nl.h | 40 +- src/smt/theory_arith_pp.h | 20 +- src/smt/theory_array.cpp | 6 +- src/smt/theory_array_base.cpp | 40 +- src/smt/theory_array_full.cpp | 2 +- src/smt/theory_bv.cpp | 34 +- src/smt/theory_datatype.cpp | 8 +- src/smt/theory_dense_diff_logic_def.h | 14 +- src/smt/theory_dl.cpp | 2 +- src/smt/theory_fpa.cpp | 8 +- src/smt/theory_seq.cpp | 2 +- src/smt/theory_seq.h | 2 +- src/solver/assertions/asserted_formulas.cpp | 10 +- src/solver/check_logic.cpp | 10 +- src/solver/combined_solver.cpp | 2 +- src/solver/solver2tactic.cpp | 2 +- src/solver/tactic2solver.cpp | 2 +- src/tactic/aig/aig.cpp | 20 +- src/tactic/aig/aig_tactic.cpp | 2 +- src/tactic/arith/add_bounds_tactic.cpp | 2 +- src/tactic/arith/diff_neq_tactic.cpp | 18 +- src/tactic/arith/eq2bv_tactic.cpp | 4 +- src/tactic/arith/factor_tactic.cpp | 10 +- src/tactic/arith/fm_tactic.cpp | 96 ++--- src/tactic/arith/lia2card_tactic.cpp | 2 +- src/tactic/arith/lia2pb_tactic.cpp | 6 +- src/tactic/arith/normalize_bounds_tactic.cpp | 2 +- src/tactic/arith/pb2bv_tactic.cpp | 44 +- src/tactic/arith/probe_arith.cpp | 2 +- src/tactic/arith/purify_arith_tactic.cpp | 10 +- src/tactic/arith/recover_01_tactic.cpp | 16 +- src/tactic/bv/bit_blaster_model_converter.cpp | 14 +- src/tactic/bv/bit_blaster_tactic.cpp | 2 +- src/tactic/bv/bv1_blaster_tactic.cpp | 24 +- src/tactic/bv/bv_bound_chk_tactic.cpp | 4 +- src/tactic/bv/bv_size_reduction_tactic.cpp | 8 +- src/tactic/bv/bvarray2uf_rewriter.cpp | 12 +- src/tactic/bv/bvarray2uf_tactic.cpp | 2 +- src/tactic/bv/dt2bv_tactic.cpp | 2 +- src/tactic/bv/elim_small_bv_tactic.cpp | 10 +- src/tactic/core/cofactor_elim_term_ite.cpp | 2 +- src/tactic/core/collect_occs.cpp | 2 +- src/tactic/core/collect_statistics_tactic.cpp | 4 +- src/tactic/core/ctx_simplify_tactic.cpp | 10 +- src/tactic/core/elim_term_ite_tactic.cpp | 2 +- src/tactic/core/elim_uncnstr_tactic.cpp | 24 +- src/tactic/core/nnf_tactic.cpp | 6 +- src/tactic/core/occf_tactic.cpp | 6 +- src/tactic/core/propagate_values_tactic.cpp | 2 +- src/tactic/core/reduce_args_tactic.cpp | 16 +- src/tactic/core/simplify_tactic.cpp | 2 +- src/tactic/core/special_relations_tactic.cpp | 4 +- src/tactic/core/split_clause_tactic.cpp | 4 +- src/tactic/core/tseitin_cnf_tactic.cpp | 20 +- src/tactic/fpa/fpa2bv_model_converter.cpp | 14 +- src/tactic/fpa/fpa2bv_tactic.cpp | 2 +- src/tactic/goal.cpp | 46 +- src/tactic/goal.h | 2 +- src/tactic/goal_num_occurs.cpp | 2 +- src/tactic/goal_shared_occs.cpp | 2 +- .../portfolio/solver_subsumption_tactic.cpp | 2 +- src/tactic/probe.cpp | 6 +- src/tactic/sls/sls_tactic.cpp | 6 +- src/tactic/smtlogics/qfufbv_tactic.cpp | 2 +- src/tactic/tactic.cpp | 2 +- src/tactic/tactical.cpp | 22 +- src/tactic/ufbv/macro_finder_tactic.cpp | 6 +- src/tactic/ufbv/quasi_macros_tactic.cpp | 6 +- src/tactic/ufbv/ufbv_rewriter_tactic.cpp | 2 +- src/test/algebraic.cpp | 14 +- src/test/api_ast_map.cpp | 2 +- src/test/bit_blaster.cpp | 4 +- src/test/bit_vector.cpp | 6 +- src/test/bits.cpp | 24 +- src/test/chashtable.cpp | 2 +- src/test/cnf_backbones.cpp | 4 +- src/test/dl_context.cpp | 2 +- src/test/dl_query.cpp | 12 +- src/test/dl_util.cpp | 6 +- src/test/euf_arith_plugin.cpp | 2 +- src/test/euf_bv_plugin.cpp | 2 +- src/test/hashtable.cpp | 4 +- src/test/heap.cpp | 6 +- src/test/horner.cpp | 2 +- src/test/interval.cpp | 16 +- src/test/lp/argument_parser.h | 4 +- src/test/lp/gomory_test.h | 4 +- src/test/lp/lp.cpp | 46 +- src/test/lp/nla_solver_test.cpp | 12 +- src/test/main.cpp | 4 +- src/test/matcher.cpp | 2 +- src/test/mpff.cpp | 12 +- src/test/mpq.cpp | 2 +- src/test/mpz.cpp | 16 +- src/test/nlsat.cpp | 8 +- src/test/object_allocator.cpp | 2 +- src/test/parray.cpp | 20 +- src/test/pdd.cpp | 2 +- src/test/permutation.cpp | 8 +- src/test/polynomial.cpp | 12 +- src/test/polynomial_factorization.cpp | 4 +- src/test/prime_generator.cpp | 4 +- src/test/random.cpp | 2 +- src/test/rational.cpp | 20 +- src/test/rcf.cpp | 14 +- src/test/sat_lookahead.cpp | 2 +- src/test/stack.cpp | 2 +- src/test/string_buffer.cpp | 2 +- src/test/total_order.cpp | 20 +- src/test/trigo.cpp | 10 +- src/test/uint_set.cpp | 12 +- src/test/upolynomial.cpp | 16 +- src/test/var_subst.cpp | 2 +- src/test/vector.cpp | 6 +- src/test/zstring.cpp | 2 +- src/util/approx_set.cpp | 2 +- src/util/approx_set.h | 2 +- src/util/bit_util.cpp | 44 +- src/util/bit_vector.cpp | 20 +- src/util/buffer.h | 12 +- src/util/chashtable.h | 4 +- src/util/container_util.h | 2 +- src/util/dependency.h | 6 +- src/util/fixed_bit_vector.cpp | 8 +- src/util/gparams.cpp | 4 +- src/util/mpbq.cpp | 4 +- src/util/mpf.cpp | 6 +- src/util/mpff.cpp | 44 +- src/util/mpfx.cpp | 44 +- src/util/mpn.cpp | 32 +- src/util/mpq.cpp | 4 +- src/util/mpz.cpp | 38 +- src/util/object_allocator.h | 8 +- src/util/params.cpp | 6 +- src/util/parray.h | 6 +- src/util/permutation.cpp | 8 +- src/util/permutation.h | 4 +- src/util/prime_generator.cpp | 10 +- src/util/rational.cpp | 2 +- src/util/ref_buffer.h | 2 +- src/util/ref_pair_vector.h | 2 +- src/util/ref_vector.h | 6 +- src/util/region.h | 4 +- src/util/s_integer.h | 2 +- src/util/sat_literal.h | 2 +- src/util/scoped_numeral_buffer.h | 4 +- src/util/scoped_numeral_vector.h | 4 +- src/util/scoped_ptr_vector.h | 2 +- src/util/sexpr.cpp | 4 +- src/util/small_object_allocator.cpp | 14 +- src/util/smt2_util.cpp | 4 +- src/util/statistics.cpp | 10 +- src/util/symbol_table.h | 2 +- src/util/total_order.h | 2 +- src/util/uint_set.h | 14 +- src/util/union_find.h | 4 +- src/util/util.cpp | 4 +- src/util/util.h | 6 +- src/util/vector.h | 4 +- 475 files changed, 3237 insertions(+), 3237 deletions(-) diff --git a/scripts/update_api.py b/scripts/update_api.py index c92d57698..b74203e3f 100755 --- a/scripts/update_api.py +++ b/scripts/update_api.py @@ -981,9 +981,9 @@ def mk_log_result_macro(file, name, result, params): cap = param_array_capacity_pos(p) sz = param_array_size_pos(p) if cap == sz: - file.write("for (unsigned i = 0; i < Z3ARG%s; i++) { SetAO(Z3ARG%s[i], %s, i); } " % (sz, i, i)) + file.write("for (unsigned i = 0; i < Z3ARG%s; ++i) { SetAO(Z3ARG%s[i], %s, i); } " % (sz, i, i)) else: - file.write("for (unsigned i = 0; Z3ARG%s && i < *Z3ARG%s; i++) { SetAO(Z3ARG%s[i], %s, i); } " % (sz, sz, i, i)) + file.write("for (unsigned i = 0; Z3ARG%s && i < *Z3ARG%s; ++i) { SetAO(Z3ARG%s[i], %s, i); } " % (sz, sz, i, i)) if kind == OUT or kind == INOUT: file.write("SetO((Z3ARG%s == 0 ? 0 : *Z3ARG%s), %s); " % (i, i, i)) i = i + 1 @@ -1099,7 +1099,7 @@ def def_API(name, result, params): error("unsupported parameter for %s, %s" % (name, p)) elif kind == IN_ARRAY or kind == INOUT_ARRAY: sz = param_array_capacity_pos(p) - log_c.write(" for (unsigned i = 0; i < a%s; i++) { " % sz) + log_c.write(" for (unsigned i = 0; i < a%s; ++i) { " % sz) if is_obj(ty): log_c.write("P(a%s[i]);" % i) log_c.write(" }\n") @@ -1136,7 +1136,7 @@ def def_API(name, result, params): sz_e = ("(*a%s)" % sz) else: sz_e = ("a%s" % sz) - log_c.write(" for (unsigned i = 0; i < %s; i++) { " % sz_e) + log_c.write(" for (unsigned i = 0; i < %s; ++i) { " % sz_e) if is_obj(ty): log_c.write("P(0);") log_c.write(" }\n") @@ -1158,7 +1158,7 @@ def def_API(name, result, params): sz_e = ("(*a%s)" % sz) else: sz_e = ("a%s" % sz) - log_c.write(" for (unsigned i = 0; i < %s; i++) { " % sz_e) + log_c.write(" for (unsigned i = 0; i < %s; ++i) { " % sz_e) log_c.write("P(0);") log_c.write(" }\n") log_c.write(" Ap(%s);\n" % sz_e) @@ -1629,7 +1629,7 @@ def mk_z3native_stubs_c(ml_src_dir, ml_output_dir): # C interface t = param_type(param) ts = type2str(t) ml_wrapper.write(' _iter = a' + str(i) + ';\n') - ml_wrapper.write(' for (_i = 0; _i < _a%s; _i++) {\n' % param_array_capacity_pos(param)) + ml_wrapper.write(' for (_i = 0; _i < _a%s; ++_i) {\n' % param_array_capacity_pos(param)) ml_wrapper.write(' assert(_iter != Val_emptylist);\n') ml_wrapper.write(' _a%s[_i] = %s;\n' % (i, ml_unwrap(t, ts, 'Field(_iter, 0)'))) ml_wrapper.write(' _iter = Field(_iter, 1);\n') diff --git a/src/ackermannization/ackermannize_bv_tactic.cpp b/src/ackermannization/ackermannize_bv_tactic.cpp index 088133f8e..4a79f1dc6 100644 --- a/src/ackermannization/ackermannize_bv_tactic.cpp +++ b/src/ackermannization/ackermannize_bv_tactic.cpp @@ -39,7 +39,7 @@ public: ptr_vector flas; const unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) flas.push_back(g->form(i)); + for (unsigned i = 0; i < sz; ++i) flas.push_back(g->form(i)); lackr lackr(m, m_p, m_st, flas, nullptr); // mk result diff --git a/src/ackermannization/ackr_bound_probe.cpp b/src/ackermannization/ackr_bound_probe.cpp index 5abb046c4..0c7433761 100644 --- a/src/ackermannization/ackr_bound_probe.cpp +++ b/src/ackermannization/ackr_bound_probe.cpp @@ -64,7 +64,7 @@ public: proc p(g.m()); unsigned sz = g.size(); expr_fast_mark1 visited; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { for_each_expr_core(p, visited, g.form(i)); } p.prune_non_select(); diff --git a/src/ackermannization/ackr_model_converter.cpp b/src/ackermannization/ackr_model_converter.cpp index a5d05fcb8..47308e7c2 100644 --- a/src/ackermannization/ackr_model_converter.cpp +++ b/src/ackermannization/ackr_model_converter.cpp @@ -103,7 +103,7 @@ void ackr_model_converter::convert_constants(model * source, model * destination evaluator.set_model_completion(true); array_util autil(m); - for (unsigned i = 0; i < source->get_num_constants(); i++) { + for (unsigned i = 0; i < source->get_num_constants(); ++i) { func_decl * const c = source->get_constant(i); app * const term = info->find_term(c); expr * value = source->get_const_interp(c); diff --git a/src/ackermannization/lackr_model_constructor.cpp b/src/ackermannization/lackr_model_constructor.cpp index 0e2d21134..63639766f 100644 --- a/src/ackermannization/lackr_model_constructor.cpp +++ b/src/ackermannization/lackr_model_constructor.cpp @@ -47,7 +47,7 @@ public: // bool check() { bool retv = true; - for (unsigned i = 0; i < m_abstr_model->get_num_constants(); i++) { + for (unsigned i = 0; i < m_abstr_model->get_num_constants(); ++i) { func_decl * const c = m_abstr_model->get_constant(i); app * const _term = m_info->find_term(c); expr * const term = _term ? _term : m.mk_const(c); @@ -58,13 +58,13 @@ public: void make_model(model_ref& destination) { - for (unsigned i = 0; i < m_abstr_model->get_num_uninterpreted_sorts(); i++) { + for (unsigned i = 0; i < m_abstr_model->get_num_uninterpreted_sorts(); ++i) { sort * const s = m_abstr_model->get_uninterpreted_sort(i); ptr_vector u = m_abstr_model->get_universe(s); destination->register_usort(s, u.size(), u.data()); } - for (unsigned i = 0; i < m_abstr_model->get_num_functions(); i++) { + for (unsigned i = 0; i < m_abstr_model->get_num_functions(); ++i) { func_decl * const fd = m_abstr_model->get_function(i); func_interp * const fi = m_abstr_model->get_func_interp(fd); destination->register_decl(fd, fi); diff --git a/src/api/api_algebraic.cpp b/src/api/api_algebraic.cpp index ab87c4e26..c35d3aa5b 100644 --- a/src/api/api_algebraic.cpp +++ b/src/api/api_algebraic.cpp @@ -325,7 +325,7 @@ extern "C" { static bool to_anum_vector(Z3_context c, unsigned n, Z3_ast a[], scoped_anum_vector & as) { algebraic_numbers::manager & _am = am(c); scoped_anum tmp(_am); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (is_rational(c, a[i])) { _am.set(tmp, get_rational(c, a[i]).to_mpq()); as.push_back(tmp); @@ -378,7 +378,7 @@ extern "C" { } Z3_ast_vector_ref* result = alloc(Z3_ast_vector_ref, *mk_c(c), mk_c(c)->m()); mk_c(c)->save_object(result); - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { result->m_ast_vector.push_back(au(c).mk_numeral(_am, roots.get(i), false)); } RETURN_Z3(of_ast_vector(result)); diff --git a/src/api/api_ast.cpp b/src/api/api_ast.cpp index ff36e87d5..ded8b7089 100644 --- a/src/api/api_ast.cpp +++ b/src/api/api_ast.cpp @@ -901,7 +901,7 @@ extern "C" { expr * const * from = to_exprs(num_exprs, _from); expr * const * to = to_exprs(num_exprs, _to); expr * r = nullptr; - for (unsigned i = 0; i < num_exprs; i++) { + for (unsigned i = 0; i < num_exprs; ++i) { if (from[i]->get_sort() != to[i]->get_sort()) { SET_ERROR_CODE(Z3_SORT_ERROR, nullptr); RETURN_Z3(of_expr(nullptr)); @@ -910,7 +910,7 @@ extern "C" { SASSERT(to[i]->get_ref_count() > 0); } expr_safe_replace subst(m); - for (unsigned i = 0; i < num_exprs; i++) { + for (unsigned i = 0; i < num_exprs; ++i) { subst.insert(from[i], to[i]); } expr_ref new_a(m); @@ -940,7 +940,7 @@ extern "C" { obj_map rep; obj_map cache; - for (unsigned i = 0; i < num_funs; i++) { + for (unsigned i = 0; i < num_funs; ++i) { if (from[i]->get_range() != to[i]->get_sort()) { SET_ERROR_CODE(Z3_SORT_ERROR, nullptr); RETURN_Z3(of_expr(nullptr)); diff --git a/src/api/api_ast_vector.cpp b/src/api/api_ast_vector.cpp index 028b971d3..9eecd95cc 100644 --- a/src/api/api_ast_vector.cpp +++ b/src/api/api_ast_vector.cpp @@ -112,7 +112,7 @@ extern "C" { Z3_ast_vector_ref * new_v = alloc(Z3_ast_vector_ref, *mk_c(t), mk_c(t)->m()); mk_c(t)->save_object(new_v); unsigned sz = to_ast_vector_ref(v).size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ast * new_ast = translator(to_ast_vector_ref(v).get(i)); new_v->m_ast_vector.push_back(new_ast); } @@ -127,7 +127,7 @@ extern "C" { std::ostringstream buffer; buffer << "(ast-vector"; unsigned sz = to_ast_vector_ref(v).size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { buffer << "\n " << mk_ismt2_pp(to_ast_vector_ref(v).get(i), mk_c(c)->m(), 2); } buffer << ")"; diff --git a/src/api/api_datatype.cpp b/src/api/api_datatype.cpp index 886165455..ee381e3e7 100644 --- a/src/api/api_datatype.cpp +++ b/src/api/api_datatype.cpp @@ -77,7 +77,7 @@ extern "C" { // Create projections ptr_vector const & _accs = *dt_util.get_constructor_accessors(decl); SASSERT(_accs.size() == num_fields); - for (unsigned i = 0; i < _accs.size(); i++) { + for (unsigned i = 0; i < _accs.size(); ++i) { mk_c(c)->save_multiple_ast_trail(_accs[i]); proj_decls[i] = of_func_decl(_accs[i]); } diff --git a/src/api/api_opt.cpp b/src/api/api_opt.cpp index 7da23cd6e..68c4844c3 100644 --- a/src/api/api_opt.cpp +++ b/src/api/api_opt.cpp @@ -141,7 +141,7 @@ extern "C" { Z3_TRY; LOG_Z3_optimize_check(c, o, num_assumptions, assumptions); RESET_ERROR_CODE(); - for (unsigned i = 0; i < num_assumptions; i++) { + for (unsigned i = 0; i < num_assumptions; ++i) { if (!is_expr(to_ast(assumptions[i]))) { SET_ERROR_CODE(Z3_INVALID_ARG, "assumption is not an expression"); return Z3_L_UNDEF; @@ -432,7 +432,7 @@ extern "C" { unsigned n = to_optimize_ptr(o)->num_objectives(); Z3_ast_vector_ref * v = alloc(Z3_ast_vector_ref, *mk_c(c), mk_c(c)->m()); mk_c(c)->save_object(v); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { v->m_ast_vector.push_back(to_optimize_ptr(o)->get_objective(i)); } RETURN_Z3(of_ast_vector(v)); diff --git a/src/api/api_params.cpp b/src/api/api_params.cpp index aa44e56ee..d07aec16a 100644 --- a/src/api/api_params.cpp +++ b/src/api/api_params.cpp @@ -202,7 +202,7 @@ extern "C" { std::ostringstream buffer; buffer << "("; unsigned sz = to_param_descrs_ptr(p)->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) buffer << ", "; buffer << to_param_descrs_ptr(p)->get_param_name(i); diff --git a/src/api/api_polynomial.cpp b/src/api/api_polynomial.cpp index 93a23cb04..9fca36321 100644 --- a/src/api/api_polynomial.cpp +++ b/src/api/api_polynomial.cpp @@ -56,7 +56,7 @@ extern "C" { scoped_timer timer(mk_c(c)->params().m_timeout, &eh); pm.psc_chain(_p, _q, v_x, rs); } - for (unsigned i = 0; i < rs.size(); i++) { + for (unsigned i = 0; i < rs.size(); ++i) { r = rs.get(i); converter.to_expr(r, true, _r); result->m_ast_vector.push_back(_r); diff --git a/src/api/api_quant.cpp b/src/api/api_quant.cpp index cf5f099fa..c495f253e 100644 --- a/src/api/api_quant.cpp +++ b/src/api/api_quant.cpp @@ -73,7 +73,7 @@ extern "C" { expr * const* no_ps = reinterpret_cast(no_patterns); symbol qid = to_symbol(quantifier_id); pattern_validator v(mk_c(c)->m()); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { if (!v(num_decls, ps[i], 0, 0)) { SET_ERROR_CODE(Z3_INVALID_PATTERN, nullptr); return nullptr; diff --git a/src/api/api_rcf.cpp b/src/api/api_rcf.cpp index 3bef38f0e..efbeea2e6 100644 --- a/src/api/api_rcf.cpp +++ b/src/api/api_rcf.cpp @@ -115,7 +115,7 @@ extern "C" { reset_rcf_cancel(c); rcnumeral_vector av; unsigned rz = 0; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (!rcfm(c).is_zero(to_rcnumeral(a[i]))) rz = i + 1; av.push_back(to_rcnumeral(a[i])); @@ -129,7 +129,7 @@ extern "C" { rcnumeral_vector rs; rcfm(c).isolate_roots(av.size(), av.data(), rs); unsigned num_roots = rs.size(); - for (unsigned i = 0; i < num_roots; i++) { + for (unsigned i = 0; i < num_roots; ++i) { roots[i] = from_rcnumeral(rs[i]); } RETURN_Z3_rcf_mk_roots num_roots; diff --git a/src/api/api_solver.cpp b/src/api/api_solver.cpp index 05b93d38b..1eb194b71 100644 --- a/src/api/api_solver.cpp +++ b/src/api/api_solver.cpp @@ -558,7 +558,7 @@ extern "C" { Z3_ast_vector_ref * v = alloc(Z3_ast_vector_ref, *mk_c(c), mk_c(c)->m()); mk_c(c)->save_object(v); unsigned sz = to_solver_ref(s)->get_num_assertions(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { v->m_ast_vector.push_back(to_solver_ref(s)->get_assertion(i)); } RETURN_Z3(of_ast_vector(v)); @@ -638,7 +638,7 @@ extern "C" { #define TOSTRING(x) STRINGIFY(x) static Z3_lbool _solver_check(Z3_context c, Z3_solver s, unsigned num_assumptions, Z3_ast const assumptions[]) { - for (unsigned i = 0; i < num_assumptions; i++) { + for (unsigned i = 0; i < num_assumptions; ++i) { if (!is_expr(to_ast(assumptions[i]))) { SET_ERROR_CODE(Z3_INVALID_ARG, "assumption is not an expression"); return Z3_L_UNDEF; diff --git a/src/api/api_tactic.cpp b/src/api/api_tactic.cpp index 67476060d..e0038d8b7 100644 --- a/src/api/api_tactic.cpp +++ b/src/api/api_tactic.cpp @@ -140,7 +140,7 @@ extern "C" { LOG_Z3_tactic_par_or(c, num, ts); RESET_ERROR_CODE(); ptr_buffer _ts; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { _ts.push_back(to_tactic_ref(ts[i])); } tactic * new_t = par(num, _ts.data()); @@ -496,7 +496,7 @@ extern "C" { std::ostringstream buffer; buffer << "(goals\n"; unsigned sz = to_apply_result(r)->m_subgoals.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { to_apply_result(r)->m_subgoals[i]->display(buffer); } buffer << ')'; diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h index 60857dc8d..b4c8ddbf8 100644 --- a/src/api/c++/z3++.h +++ b/src/api/c++/z3++.h @@ -1263,7 +1263,7 @@ namespace z3 { expr_vector args() const { expr_vector vec(ctx()); unsigned argCnt = num_args(); - for (unsigned i = 0; i < argCnt; i++) + for (unsigned i = 0; i < argCnt; ++i) vec.push_back(arg(i)); return vec; } @@ -2394,7 +2394,7 @@ namespace z3 { template template array::array(ast_vector_tpl const & v):m_array(new T[v.size()]), m_size(v.size()) { - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { m_array[i] = v[i]; } } @@ -2925,7 +2925,7 @@ namespace z3 { check_result check() { Z3_lbool r = Z3_solver_check(ctx(), m_solver); check_error(); return to_check_result(r); } check_result check(unsigned n, expr * const assumptions) { array _assumptions(n); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { check_context(*this, assumptions[i]); _assumptions[i] = assumptions[i]; } @@ -2936,7 +2936,7 @@ namespace z3 { check_result check(expr_vector const& assumptions) { unsigned n = assumptions.size(); array _assumptions(n); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { check_context(*this, assumptions[i]); _assumptions[i] = assumptions[i]; } @@ -3167,7 +3167,7 @@ namespace z3 { return operator[](0u); else { array args(n); - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) args[i] = operator[](i); return expr(ctx(), Z3_mk_and(ctx(), n, args.ptr())); } @@ -3496,7 +3496,7 @@ namespace z3 { check_result check(expr_vector const& asms) { unsigned n = asms.size(); array _asms(n); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { check_context(*this, asms[i]); _asms[i] = asms[i]; } @@ -3637,25 +3637,25 @@ namespace z3 { } inline sort context::enumeration_sort(char const * name, unsigned n, char const * const * enum_names, func_decl_vector & cs, func_decl_vector & ts) { array _enum_names(n); - for (unsigned i = 0; i < n; i++) { _enum_names[i] = Z3_mk_string_symbol(*this, enum_names[i]); } + for (unsigned i = 0; i < n; ++i) { _enum_names[i] = Z3_mk_string_symbol(*this, enum_names[i]); } array _cs(n); array _ts(n); Z3_symbol _name = Z3_mk_string_symbol(*this, name); sort s = to_sort(*this, Z3_mk_enumeration_sort(*this, _name, n, _enum_names.ptr(), _cs.ptr(), _ts.ptr())); check_error(); - for (unsigned i = 0; i < n; i++) { cs.push_back(func_decl(*this, _cs[i])); ts.push_back(func_decl(*this, _ts[i])); } + for (unsigned i = 0; i < n; ++i) { cs.push_back(func_decl(*this, _cs[i])); ts.push_back(func_decl(*this, _ts[i])); } return s; } inline func_decl context::tuple_sort(char const * name, unsigned n, char const * const * names, sort const* sorts, func_decl_vector & projs) { array _names(n); array _sorts(n); - for (unsigned i = 0; i < n; i++) { _names[i] = Z3_mk_string_symbol(*this, names[i]); _sorts[i] = sorts[i]; } + for (unsigned i = 0; i < n; ++i) { _names[i] = Z3_mk_string_symbol(*this, names[i]); _sorts[i] = sorts[i]; } array _projs(n); Z3_symbol _name = Z3_mk_string_symbol(*this, name); Z3_func_decl tuple; sort _ignore_s = to_sort(*this, Z3_mk_tuple_sort(*this, _name, n, _names.ptr(), _sorts.ptr(), &tuple, _projs.ptr())); check_error(); - for (unsigned i = 0; i < n; i++) { projs.push_back(func_decl(*this, _projs[i])); } + for (unsigned i = 0; i < n; ++i) { projs.push_back(func_decl(*this, _projs[i])); } return func_decl(*this, tuple); } @@ -3778,7 +3778,7 @@ namespace z3 { inline func_decl context::function(symbol const & name, unsigned arity, sort const * domain, sort const & range) { array args(arity); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { check_context(domain[i], range); args[i] = domain[i]; } @@ -3793,7 +3793,7 @@ namespace z3 { inline func_decl context::function(symbol const& name, sort_vector const& domain, sort const& range) { array args(domain.size()); - for (unsigned i = 0; i < domain.size(); i++) { + for (unsigned i = 0; i < domain.size(); ++i) { check_context(domain[i], range); args[i] = domain[i]; } @@ -3849,7 +3849,7 @@ namespace z3 { inline func_decl context::recfun(symbol const & name, unsigned arity, sort const * domain, sort const & range) { array args(arity); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { check_context(domain[i], range); args[i] = domain[i]; } @@ -3973,7 +3973,7 @@ namespace z3 { inline expr func_decl::operator()(unsigned n, expr const * args) const { array _args(n); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { check_context(*this, args[i]); _args[i] = args[i]; } @@ -3984,7 +3984,7 @@ namespace z3 { } inline expr func_decl::operator()(expr_vector const& args) const { array _args(args.size()); - for (unsigned i = 0; i < args.size(); i++) { + for (unsigned i = 0; i < args.size(); ++i) { check_context(*this, args[i]); _args[i] = args[i]; } @@ -4963,7 +4963,7 @@ namespace z3 { std::vector a(n); std::vector roots(n); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { a[i] = coeffs[i]; } @@ -4971,7 +4971,7 @@ namespace z3 { std::vector result; result.reserve(num_roots); - for (unsigned i = 0; i < num_roots; i++) { + for (unsigned i = 0; i < num_roots; ++i) { result.push_back(rcf_num(c, roots[i])); } diff --git a/src/api/julia/z3jl.cpp b/src/api/julia/z3jl.cpp index 336a73976..0470e5a6d 100644 --- a/src/api/julia/z3jl.cpp +++ b/src/api/julia/z3jl.cpp @@ -402,7 +402,7 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) .method("trail", [](solver &s, jlcxx::ArrayRef levels) { int sz = levels.size(); z3::array _levels(sz); - for (int i = 0; i < sz; i++) { + for (int i = 0; i < sz; ++i) { _levels[i] = levels[i]; } return s.trail(_levels); @@ -631,7 +631,7 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) [](context& c, char const * name, jlcxx::ArrayRef names, func_decl_vector &cs, func_decl_vector &ts) { int sz = names.size(); std::vector _names; - for (int i = 0; i < sz; i++) { + for (int i = 0; i < sz; ++i) { const char *x = jl_string_data(names[i]); _names.push_back(x); } @@ -642,7 +642,7 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) int sz = names.size(); std::vector _sorts; std::vector _names; - for (int i = 0; i < sz; i++) { + for (int i = 0; i < sz; ++i) { const sort &x = jlcxx::unbox(sorts[i]); const char *y = jl_string_data(names[i]); _sorts.push_back(x); diff --git a/src/api/z3_replayer.cpp b/src/api/z3_replayer.cpp index 79488f6d1..be2026b55 100644 --- a/src/api/z3_replayer.cpp +++ b/src/api/z3_replayer.cpp @@ -155,7 +155,7 @@ struct z3_replayer::imp { } void display_args(std::ostream & out) const { - for (unsigned i = 0; i < m_args.size(); i++) { + for (unsigned i = 0; i < m_args.size(); ++i) { if (i > 0) out << " "; display_arg(out, m_args[i]); } @@ -348,7 +348,7 @@ struct z3_replayer::imp { throw z3_replayer_exception("invalid array size"); uint64_t aidx; value_kind nk; - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { if (m_args[i].m_kind != k) throw z3_replayer_exception("invalid array: mixed value types"); } @@ -357,7 +357,7 @@ struct z3_replayer::imp { nk = UINT_ARRAY; m_unsigned_arrays.push_back(unsigned_vector()); unsigned_vector & v = m_unsigned_arrays.back(); - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { v.push_back(static_cast(m_args[i].m_uint)); } } @@ -366,7 +366,7 @@ struct z3_replayer::imp { nk = INT_ARRAY; m_int_arrays.push_back(svector()); svector & v = m_int_arrays.back(); - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { v.push_back(static_cast(m_args[i].m_int)); } } @@ -375,7 +375,7 @@ struct z3_replayer::imp { nk = SYMBOL_ARRAY; m_sym_arrays.push_back(svector()); svector & v = m_sym_arrays.back(); - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { v.push_back(reinterpret_cast(const_cast(m_args[i].m_str))); } } @@ -383,14 +383,14 @@ struct z3_replayer::imp { TRACE(z3_replayer_bug, tout << "args: "; display_args(tout); tout << "\n"; tout << "push_back, sz: " << sz << ", m_obj_arrays.size(): " << m_obj_arrays.size() << "\n"; - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { tout << "pushing: " << m_args[i].m_obj << "\n"; }); aidx = m_obj_arrays.size(); nk = OBJECT_ARRAY; m_obj_arrays.push_back(ptr_vector()); ptr_vector & v = m_obj_arrays.back(); - for (unsigned i = asz - sz; i < asz; i++) { + for (unsigned i = asz - sz; i < asz; ++i) { v.push_back(m_args[i].m_obj); } } @@ -658,7 +658,7 @@ struct z3_replayer::imp { unsigned idx = static_cast(m_args[pos].m_uint); ptr_vector const & v = m_obj_arrays[idx]; TRACE(z3_replayer_bug, tout << "pos: " << pos << ", idx: " << idx << " size(): " << v.size() << "\n"; - for (unsigned i = 0; i < v.size(); i++) tout << v[i] << " "; tout << "\n";); + for (unsigned i = 0; i < v.size(); ++i) tout << v[i] << " "; tout << "\n";); return v.data(); } diff --git a/src/ast/act_cache.cpp b/src/ast/act_cache.cpp index db3f0f12b..223ad2406 100644 --- a/src/ast/act_cache.cpp +++ b/src/ast/act_cache.cpp @@ -58,7 +58,7 @@ void act_cache::compress_queue() { SASSERT(m_qhead > 0); unsigned sz = m_queue.size(); unsigned j = 0; - for (unsigned i = m_qhead; i < sz; i++, j++) { + for (unsigned i = m_qhead; i < sz; ++i, ++j) { m_queue[j] = m_queue[i]; } m_queue.shrink(j); diff --git a/src/ast/arith_decl_plugin.cpp b/src/ast/arith_decl_plugin.cpp index 3d2bbec17..625a8dc87 100644 --- a/src/ast/arith_decl_plugin.cpp +++ b/src/ast/arith_decl_plugin.cpp @@ -490,14 +490,14 @@ static bool use_coercion(decl_kind k) { } static bool has_real_arg(unsigned arity, sort * const * domain, sort * real_sort) { - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) if (domain[i] == real_sort) return true; return false; } static bool has_real_arg(ast_manager * m, unsigned num_args, expr * const * args, sort * real_sort) { - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (args[i]->get_sort() == real_sort) return true; return false; diff --git a/src/ast/array_decl_plugin.cpp b/src/ast/array_decl_plugin.cpp index 198514671..5d79bb97d 100644 --- a/src/ast/array_decl_plugin.cpp +++ b/src/ast/array_decl_plugin.cpp @@ -56,7 +56,7 @@ sort * array_decl_plugin::mk_sort(decl_kind k, unsigned num_parameters, paramete return nullptr; } - for (unsigned i = 0; i < num_parameters; i++) { + for (unsigned i = 0; i < num_parameters; ++i) { if (!parameters[i].is_ast() || !is_sort(parameters[i].get_ast())) { m_manager->raise_exception("invalid array sort definition, parameter is not a sort"); return nullptr; @@ -70,7 +70,7 @@ sort * array_decl_plugin::mk_sort(decl_kind k, unsigned num_parameters, paramete } bool is_infinite = false; bool is_very_big = false; - for (unsigned i = 0; i < num_parameters; i++) { + for (unsigned i = 0; i < num_parameters; ++i) { sort * s = to_sort(parameters[i].get_ast()); if (s->is_infinite()) { is_infinite = true; @@ -89,7 +89,7 @@ sort * array_decl_plugin::mk_sort(decl_kind k, unsigned num_parameters, paramete else { rational domain_sz(1); rational num_elements; - for (unsigned i = 0; i < num_parameters - 1; i++) { + for (unsigned i = 0; i < num_parameters - 1; ++i) { domain_sz *= rational(to_sort(parameters[i].get_ast())->get_num_elements().size(),rational::ui64()); } if (domain_sz <= rational(128)) { @@ -443,7 +443,7 @@ func_decl * array_decl_plugin::mk_set_subset(unsigned arity, sort * const * doma func_decl * array_decl_plugin::mk_as_array(func_decl * f) { vector parameters; - for (unsigned i = 0; i < f->get_arity(); i++) { + for (unsigned i = 0; i < f->get_arity(); ++i) { parameters.push_back(parameter(f->get_domain(i))); } parameters.push_back(parameter(f->get_range())); @@ -570,7 +570,7 @@ expr * array_decl_plugin::get_some_value(sort * s) { bool array_decl_plugin::is_fully_interp(sort * s) const { SASSERT(s->is_sort_of(m_family_id, ARRAY_SORT)); unsigned sz = get_array_arity(s); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!m_manager->is_fully_interp(get_array_domain(s, i))) return false; } diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp index 6e2f2e6af..be5ac7a58 100644 --- a/src/ast/ast.cpp +++ b/src/ast/ast.cpp @@ -199,7 +199,7 @@ bool decl_info::operator==(decl_info const & info) const { std::ostream & operator<<(std::ostream & out, decl_info const & info) { out << ":fid " << info.get_family_id() << " :decl-kind " << info.get_decl_kind() << " :parameters ("; - for (unsigned i = 0; i < info.get_num_parameters(); i++) { + for (unsigned i = 0; i < info.get_num_parameters(); ++i) { if (i > 0) out << " "; out << info.get_parameter(i); } @@ -315,7 +315,7 @@ app::app(func_decl * decl, unsigned num_args, expr * const * args): expr(AST_APP), m_decl(decl), m_num_args(num_args) { - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) m_args[i] = args[i]; } @@ -634,7 +634,7 @@ bool decl_plugin::log_constant_meaning_prelude(app * a) { func_decl * decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, parameter const * parameters, unsigned num_args, expr * const * args, sort * range) { ptr_buffer sorts; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sorts.push_back(args[i]->get_sort()); } return mk_func_decl(k, num_parameters, parameters, num_args, sorts.data(), range); @@ -652,7 +652,7 @@ bool basic_decl_plugin::check_proof_sorts(basic_op_kind k, unsigned arity, sort if (arity == 0) return false; else { - for (unsigned i = 0; i < arity - 1; i++) + for (unsigned i = 0; i < arity - 1; ++i) if (domain[i] != m_proof_sort) return false; #define is_array(_x_) true @@ -666,7 +666,7 @@ bool basic_decl_plugin::check_proof_args(basic_op_kind k, unsigned num_args, exp if (num_args == 0) return false; else { - for (unsigned i = 0; i < num_args - 1; i++) + for (unsigned i = 0; i < num_args - 1; ++i) if (args[i]->get_sort() != m_proof_sort) return false; return @@ -679,7 +679,7 @@ bool basic_decl_plugin::check_proof_args(basic_op_kind k, unsigned num_args, exp func_decl * basic_decl_plugin::mk_bool_op_decl(char const * name, basic_op_kind k, unsigned num_args, bool assoc, bool comm, bool idempotent, bool flat_associative, bool chainable) { ptr_buffer domain; - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) domain.push_back(m_bool_sort); func_decl_info info(m_family_id, k); info.set_associative(assoc); @@ -705,7 +705,7 @@ func_decl * basic_decl_plugin::mk_proof_decl( char const * name, basic_op_kind k, unsigned num_parameters, parameter const* params, unsigned num_parents) { ptr_buffer domain; - for (unsigned i = 0; i < num_parents; i++) + for (unsigned i = 0; i < num_parents; ++i) domain.push_back(m_proof_sort); domain.push_back(m_bool_sort); func_decl_info info(m_family_id, k, num_parameters, params); @@ -714,7 +714,7 @@ func_decl * basic_decl_plugin::mk_proof_decl( func_decl * basic_decl_plugin::mk_proof_decl(char const * name, basic_op_kind k, unsigned num_parents, bool inc_ref) { ptr_buffer domain; - for (unsigned i = 0; i < num_parents; i++) + for (unsigned i = 0; i < num_parents; ++i) domain.push_back(m_proof_sort); domain.push_back(m_bool_sort); func_decl * d = m_manager->mk_func_decl(symbol(name), num_parents+1, domain.data(), m_proof_sort, func_decl_info(m_family_id, k)); @@ -724,7 +724,7 @@ func_decl * basic_decl_plugin::mk_proof_decl(char const * name, basic_op_kind k, func_decl * basic_decl_plugin::mk_compressed_proof_decl(char const * name, basic_op_kind k, unsigned num_parents) { ptr_buffer domain; - for (unsigned i = 0; i < num_parents; i++) + for (unsigned i = 0; i < num_parents; ++i) domain.push_back(m_proof_sort); func_decl * d = m_manager->mk_func_decl(symbol(name), num_parents, domain.data(), m_proof_sort, func_decl_info(m_family_id, k)); m_manager->inc_ref(d); @@ -1049,7 +1049,7 @@ func_decl * basic_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters func_decl_info info(m_family_id, OP_DISTINCT); info.set_pairwise(); ptr_buffer sorts; - for (unsigned i = 1; i < arity; i++) { + for (unsigned i = 1; i < arity; ++i) { if (domain[i] != domain[0]) { sort* srt = join(arity, domain); for (unsigned j = 0; j < arity; ++j) @@ -1144,7 +1144,7 @@ func_decl * label_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters m_manager->raise_exception("invalid label declaration"); return nullptr; } - for (unsigned i = 2; i < num_parameters; i++) { + for (unsigned i = 2; i < num_parameters; ++i) { if (!parameters[i].is_symbol()) { m_manager->raise_exception("invalid label declaration"); return nullptr; @@ -1159,7 +1159,7 @@ func_decl * label_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters m_manager->raise_exception("invalid label literal declaration"); return nullptr; } - for (unsigned i = 0; i < num_parameters; i++) { + for (unsigned i = 0; i < num_parameters; ++i) { if (!parameters[i].is_symbol()) { m_manager->raise_exception("invalid label literal declaration"); return nullptr; @@ -1355,13 +1355,13 @@ void ast_manager::init() { template static void mark_array_ref(ast_mark& mark, unsigned sz, T * const * a) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { mark.mark(a[i], true); } } static void mark_array_ref(ast_mark& mark, unsigned sz, parameter const * a) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { if (a[i].is_ast()) { mark.mark(a[i].get_ast(), true); } @@ -1508,14 +1508,14 @@ std::ostream& ast_manager::display(std::ostream& out, parameter const& p) { void ast_manager::copy_families_plugins(ast_manager const & from) { TRACE(copy_families_plugins, tout << "target:\n"; - for (family_id fid = 0; m_family_manager.has_family(fid); fid++) { + for (family_id fid = 0; m_family_manager.has_family(fid); ++fid) { tout << "fid: " << fid << " fidname: " << get_family_name(fid) << "\n"; }); ast_translation trans(const_cast(from), *this, false); // Inheriting plugins can create new family ids. Since new family ids are // assigned in the order that they are created, this can result in differing // family ids. To avoid this, we first assign all family ids and only then inherit plugins. - for (family_id fid = 0; from.m_family_manager.has_family(fid); fid++) { + for (family_id fid = 0; from.m_family_manager.has_family(fid); ++fid) { symbol fid_name = from.get_family_name(fid); if (!m_family_manager.has_family(fid)) { family_id new_fid = mk_family_id(fid_name); @@ -1523,7 +1523,7 @@ void ast_manager::copy_families_plugins(ast_manager const & from) { TRACE(copy_families_plugins, tout << "new target fid created: " << new_fid << " fid_name: " << fid_name << "\n";); } } - for (family_id fid = 0; from.m_family_manager.has_family(fid); fid++) { + for (family_id fid = 0; from.m_family_manager.has_family(fid); ++fid) { SASSERT(from.is_builtin_family_id(fid) == is_builtin_family_id(fid)); SASSERT(!from.is_builtin_family_id(fid) || m_family_manager.has_family(fid)); symbol fid_name = from.get_family_name(fid); @@ -1747,7 +1747,7 @@ ast * ast_manager::register_node_core(ast * n) { if (is_label(t)) f->m_has_labels = true; unsigned depth = 0; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = t->get_arg(i); inc_ref(arg); unsigned arg_depth = 0; @@ -2019,7 +2019,7 @@ void ast_manager::check_sort(func_decl const * decl, unsigned num_args, expr * c if (decl->is_associative()) { sort * expected = decl->get_domain(0); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sort * given = args[i]->get_sort(); if (!compatible_sorts(expected, given)) { std::ostringstream buff; @@ -2034,7 +2034,7 @@ void ast_manager::check_sort(func_decl const * decl, unsigned num_args, expr * c if (decl->get_arity() != num_args) { throw ast_exception("invalid function application, wrong number of arguments"); } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sort * expected = decl->get_domain(i); sort * given = args[i]->get_sort(); if (!compatible_sorts(expected, given)) { @@ -2099,7 +2099,7 @@ bool ast_manager::coercion_needed(func_decl * decl, unsigned num_args, expr * co if (decl->is_associative()) { sort * d = decl->get_domain(0); if (d->get_family_id() == arith_family_id) { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (d != args[i]->get_sort()) return true; } @@ -2111,7 +2111,7 @@ bool ast_manager::coercion_needed(func_decl * decl, unsigned num_args, expr * co // So, there is no point in coercing the input arguments. return false; } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sort * d = decl->get_domain(i); if (d->get_family_id() == arith_family_id && d != args[i]->get_sort()) return true; @@ -2148,7 +2148,7 @@ app * ast_manager::mk_app_core(func_decl * decl, unsigned num_args, expr * const try { if (m_int_real_coercions && coercion_needed(decl, num_args, args)) { expr_ref_buffer new_args(*this); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sort * d = decl->is_associative() ? decl->get_domain(0) : decl->get_domain(i); new_args.push_back(coerce_to(args[i], d)); } @@ -2178,7 +2178,7 @@ app * ast_manager::mk_app_core(func_decl * decl, unsigned num_args, expr * const ast_ll_pp(*m_trace_stream, *this, r); else { *m_trace_stream << r->get_decl()->get_name(); - for (unsigned i = 0; i < r->get_num_args(); i++) + for (unsigned i = 0; i < r->get_num_args(); ++i) *m_trace_stream << " #" << r->get_arg(i)->get_id(); *m_trace_stream << "\n"; } @@ -2193,7 +2193,7 @@ app * ast_manager::mk_app_core(func_decl * decl, unsigned num_args, expr * const } void ast_manager::check_args(func_decl* f, unsigned n, expr* const* es) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { sort * actual_sort = es[i]->get_sort(); sort * expected_sort = f->is_associative() ? f->get_domain(0) : f->get_domain(i); if (expected_sort != actual_sort) { @@ -2246,14 +2246,14 @@ app * ast_manager::mk_app(func_decl * decl, unsigned num_args, expr * const * ar } else if (decl->is_left_associative()) { r = mk_app_core(decl, args[0], args[1]); - for (unsigned i = 2; i < num_args; i++) { + for (unsigned i = 2; i < num_args; ++i) { r = mk_app_core(decl, r, args[i]); } } else if (decl->is_chainable()) { TRACE(chainable, tout << "chainable...\n";); ptr_buffer new_args; - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { new_args.push_back(mk_app_core(decl, args[i-1], args[i])); } r = mk_and(new_args.size(), new_args.data()); @@ -2336,7 +2336,7 @@ app * ast_manager::mk_label(bool pos, unsigned num_names, symbol const * names, SASSERT(n->get_sort() == m_bool_sort); buffer p; p.push_back(parameter(static_cast(pos))); - for (unsigned i = 0; i < num_names; i++) + for (unsigned i = 0; i < num_names; ++i) p.push_back(parameter(names[i])); return mk_app(label_family_id, OP_LABEL, p.size(), p.data(), 1, &n); } @@ -2351,7 +2351,7 @@ bool ast_manager::is_label(expr const * n, bool & pos, buffer & names) c } func_decl const * decl = to_app(n)->get_decl(); pos = decl->get_parameter(0).get_int() != 0; - for (unsigned i = 1; i < decl->get_num_parameters(); i++) + for (unsigned i = 1; i < decl->get_num_parameters(); ++i) names.push_back(decl->get_parameter(i).get_symbol()); return true; } @@ -2359,7 +2359,7 @@ bool ast_manager::is_label(expr const * n, bool & pos, buffer & names) c app * ast_manager::mk_label_lit(unsigned num_names, symbol const * names) { SASSERT(num_names > 0); buffer p; - for (unsigned i = 0; i < num_names; i++) + for (unsigned i = 0; i < num_names; ++i) p.push_back(parameter(names[i])); return mk_app(label_family_id, OP_LABEL_LIT, p.size(), p.data(), 0, nullptr); } @@ -2473,7 +2473,7 @@ quantifier * ast_manager::mk_lambda(unsigned num_decls, sort * const * decl_sort static bool same_patterns(quantifier * q, unsigned num_patterns, expr * const * patterns) { if (num_patterns != q->get_num_patterns()) return false; - for (unsigned i = 0; i < num_patterns; i++) + for (unsigned i = 0; i < num_patterns; ++i) if (q->get_pattern(i) != patterns[i]) return false; return true; @@ -2483,7 +2483,7 @@ static bool same_patterns(quantifier * q, unsigned num_patterns, expr * const * static bool same_no_patterns(quantifier * q, unsigned num_no_patterns, expr * const * no_patterns) { if (num_no_patterns != q->get_num_no_patterns()) return false; - for (unsigned i = 0; i < num_no_patterns; i++) + for (unsigned i = 0; i < num_no_patterns; ++i) if (q->get_no_pattern(i) != no_patterns[i]) return false; return true; @@ -2602,9 +2602,9 @@ app * ast_manager::mk_distinct_expanded(unsigned num_args, expr * const * args) if (num_args == 2) return mk_not(mk_eq(args[0], args[1])); ptr_buffer new_args; - for (unsigned i = 0; i < num_args - 1; i++) { + for (unsigned i = 0; i < num_args - 1; ++i) { expr * a1 = args[i]; - for (unsigned j = i + 1; j < num_args; j++) { + for (unsigned j = i + 1; j < num_args; ++j) { expr * a2 = args[j]; new_args.push_back(mk_not(mk_eq(a1, a2))); } @@ -2629,7 +2629,7 @@ expr_dependency * ast_manager::mk_leaf(expr * t) { expr_dependency * ast_manager::mk_join(unsigned n, expr * const * ts) { expr_dependency * d = nullptr; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) d = mk_join(d, mk_leaf(ts[i])); return d; } @@ -2897,7 +2897,7 @@ proof * ast_manager::mk_transitivity(proof * p1, proof * p2, proof * p3, proof * proof * ast_manager::mk_transitivity(unsigned num_proofs, proof * const * proofs) { SASSERT(num_proofs > 0); proof * r = proofs[0]; - for (unsigned i = 1; i < num_proofs; i++) + for (unsigned i = 1; i < num_proofs; ++i) r = mk_transitivity(r, proofs[i]); return r; } @@ -2908,7 +2908,7 @@ proof * ast_manager::mk_transitivity(unsigned num_proofs, proof * const * proofs if (num_proofs == 1) return proofs[0]; DEBUG_CODE({ - for (unsigned i = 0; i < num_proofs; i++) { + for (unsigned i = 0; i < num_proofs; ++i) { SASSERT(proofs[i]); SASSERT(!is_reflexivity(proofs[i])); } @@ -3050,7 +3050,7 @@ proof * ast_manager::mk_def_axiom(expr * ax) { proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * proofs) { SASSERT(num_proofs >= 2); - DEBUG_CODE(for (unsigned i = 0; i < num_proofs; i++) SASSERT(has_fact(proofs[i]));); + DEBUG_CODE(for (unsigned i = 0; i < num_proofs; ++i) SASSERT(has_fact(proofs[i]));); ptr_buffer args; expr * fact; expr * f1 = get_fact(proofs[0]); @@ -3091,10 +3091,10 @@ proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * pro bool_vector found; #endif ast_mark mark; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { bool found_complement = false; expr * lit = cls->get_arg(i); - for (unsigned j = 1; j < num_proofs; j++) { + for (unsigned j = 1; j < num_proofs; ++j) { expr const * _fact = get_fact(proofs[j]); if (is_complement(lit, _fact)) { found_complement = true; @@ -3110,9 +3110,9 @@ proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * pro } } DEBUG_CODE({ - for (unsigned i = 1; proofs_enabled() && i < num_proofs; i++) { + for (unsigned i = 1; proofs_enabled() && i < num_proofs; ++i) { CTRACE(mk_unit_resolution_bug, !found.get(i, false), - for (unsigned j = 0; j < num_proofs; j++) { + for (unsigned j = 0; j < num_proofs; ++j) { if (j == i) tout << "Index " << i << " was not found:\n"; tout << mk_ll_pp(get_fact(proofs[j]), *this); }); @@ -3140,7 +3140,7 @@ proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * pro proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * proofs, expr * new_fact) { TRACE(unit_bug, - for (unsigned i = 0; i < num_proofs; i++) tout << mk_pp(get_fact(proofs[i]), *this) << "\n"; + for (unsigned i = 0; i < num_proofs; ++i) tout << mk_pp(get_fact(proofs[i]), *this) << "\n"; tout << "===>\n"; tout << mk_pp(new_fact, *this) << "\n";); @@ -3158,7 +3158,7 @@ proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * pro app * cls = to_app(f1); unsigned cls_sz = cls->get_num_args(); CTRACE(unit_bug, !(num_proofs == cls_sz || (num_proofs == cls_sz + 1 && is_false(new_fact))), - for (unsigned i = 0; i < num_proofs; i++) tout << mk_pp(get_fact(proofs[i]), *this) << "\n"; + for (unsigned i = 0; i < num_proofs; ++i) tout << mk_pp(get_fact(proofs[i]), *this) << "\n"; tout << "===>\n"; tout << mk_pp(new_fact, *this) << "\n";); // @@ -3166,10 +3166,10 @@ proof * ast_manager::mk_unit_resolution(unsigned num_proofs, proof * const * pro // but formula could have repeated literals that are merged in the clausal representation. // unsigned num_matches = 0, num_occ = 0; - for (unsigned i = 0; i < cls_sz; i++) { + for (unsigned i = 0; i < cls_sz; ++i) { expr * lit = cls->get_arg(i); unsigned j = 1; - for (; j < num_proofs; j++) { + for (; j < num_proofs; ++j) { if (is_complement(lit, get_fact(proofs[j]))) { num_matches++; break; @@ -3231,7 +3231,7 @@ proof * ast_manager::mk_iff_oeq(proof * p) { } bool ast_manager::check_nnf_proof_parents(unsigned num_proofs, proof * const * proofs) const { - for (unsigned i = 0; i < num_proofs; i++) { + for (unsigned i = 0; i < num_proofs; ++i) { if (!has_fact(proofs[i])) return false; if (!is_oeq(get_fact(proofs[i]))) diff --git a/src/ast/ast.h b/src/ast/ast.h index 81a6850fb..f92b51e6b 100644 --- a/src/ast/ast.h +++ b/src/ast/ast.h @@ -1668,14 +1668,14 @@ public: template void inc_array_ref(unsigned sz, T * const * a) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { inc_ref(a[i]); } } template void dec_array_ref(unsigned sz, T * const * a) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { dec_ref(a[i]); } } @@ -2406,7 +2406,7 @@ private: template void push_dec_array_ref(unsigned sz, T * const * a) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { push_dec_ref(a[i]); } } diff --git a/src/ast/ast_ll_pp.cpp b/src/ast/ast_ll_pp.cpp index d04777eb7..301d23b05 100644 --- a/src/ast/ast_ll_pp.cpp +++ b/src/ast/ast_ll_pp.cpp @@ -91,7 +91,7 @@ class ll_printer { template void display_children(unsigned num_children, T * const * children) { - for (unsigned i = 0; i < num_children; i++) { + for (unsigned i = 0; i < num_children; ++i) { if (i > 0) { m_out << " "; } @@ -213,7 +213,7 @@ public: m_out << n->get_decl()->get_parameter(i); } unsigned num_parents = m_manager.get_num_parents(n); - for (unsigned i = 0; i < num_parents; i++) { + for (unsigned i = 0; i < num_parents; ++i) { m_out << " "; display_child(m_manager.get_parent(n, i)); } @@ -256,7 +256,7 @@ public: m_out << "(" << (n->get_kind() == forall_k ? "forall" : (n->get_kind() == exists_k ? "exists" : "lambda")) << " "; unsigned num_decls = n->get_num_decls(); m_out << "(vars "; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { if (i > 0) { m_out << " "; } @@ -307,7 +307,7 @@ public: m_out << "("; display_name(to_app(n)->get_decl()); display_params(to_app(n)->get_decl()); - for (unsigned i = 0; i < num_args && i < 16; i++) { + for (unsigned i = 0; i < num_args && i < 16; ++i) { m_out << " "; display(to_app(n)->get_arg(i), depth-1); } diff --git a/src/ast/ast_lt.cpp b/src/ast/ast_lt.cpp index 869c7bff8..cab7c5b53 100644 --- a/src/ast/ast_lt.cpp +++ b/src/ast/ast_lt.cpp @@ -67,7 +67,7 @@ bool lt(ast * n1, ast * n2) { check_value(to_sort(n1)->get_num_parameters(), to_sort(n2)->get_num_parameters()); num = to_sort(n1)->get_num_parameters(); SASSERT(num > 0); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { const parameter &p1 = to_sort(n1)->get_parameter(i); const parameter &p2 = to_sort(n2)->get_parameter(i); check_parameter(p1, p2); @@ -79,13 +79,13 @@ bool lt(ast * n1, ast * n2) { check_value(to_func_decl(n1)->get_arity(), to_func_decl(n2)->get_arity()); check_value(to_func_decl(n1)->get_num_parameters(), to_func_decl(n2)->get_num_parameters()); num = to_func_decl(n1)->get_num_parameters(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { const parameter &p1 = to_func_decl(n1)->get_parameter(i); const parameter &p2 = to_func_decl(n2)->get_parameter(i); check_parameter(p1, p2); } num = to_func_decl(n1)->get_arity(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { ast * d1 = to_func_decl(n1)->get_domain(i); ast * d2 = to_func_decl(n2)->get_domain(i); check_ast(d1, d2); @@ -98,7 +98,7 @@ bool lt(ast * n1, ast * n2) { check_value(to_app(n1)->get_depth(), to_app(n2)->get_depth()); check_ast(to_app(n1)->get_decl(), to_app(n2)->get_decl()); num = to_app(n1)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg1 = to_app(n1)->get_arg(i); expr * arg2 = to_app(n2)->get_arg(i); check_ast(arg1, arg2); @@ -112,16 +112,16 @@ bool lt(ast * n1, ast * n2) { check_value(to_quantifier(n1)->get_num_no_patterns(), to_quantifier(n2)->get_num_no_patterns()); check_value(to_quantifier(n1)->get_weight(), to_quantifier(n2)->get_weight()); num = to_quantifier(n1)->get_num_decls(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { check_symbol(to_quantifier(n1)->get_decl_name(i), to_quantifier(n2)->get_decl_name(i)); check_ast(to_quantifier(n1)->get_decl_sort(i), to_quantifier(n2)->get_decl_sort(i)); } num = to_quantifier(n1)->get_num_patterns(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { check_ast(to_quantifier(n1)->get_pattern(i), to_quantifier(n2)->get_pattern(i)); } num = to_quantifier(n1)->get_num_no_patterns(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { check_ast(to_quantifier(n1)->get_no_pattern(i), to_quantifier(n2)->get_no_pattern(i)); } n1 = to_quantifier(n1)->get_expr(); @@ -139,7 +139,7 @@ bool lt(ast * n1, ast * n2) { } bool is_sorted(unsigned num, expr * const * ns) { - for (unsigned i = 1; i < num; i++) { + for (unsigned i = 1; i < num; ++i) { ast * prev = ns[i-1]; ast * curr = ns[i]; if (lt(curr, prev)) diff --git a/src/ast/ast_smt2_pp.cpp b/src/ast/ast_smt2_pp.cpp index 72382e366..d601635be 100644 --- a/src/ast/ast_smt2_pp.cpp +++ b/src/ast/ast_smt2_pp.cpp @@ -79,7 +79,7 @@ bool smt2_pp_environment::is_indexed_fdecl(func_decl * f) const { return false; unsigned num = f->get_num_parameters(); unsigned i; - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { if (f->get_parameter(i).is_int()) continue; if (f->get_parameter(i).is_rational()) @@ -111,7 +111,7 @@ format * smt2_pp_environment::pp_fdecl_params(format * fname, func_decl * f) { unsigned num = f->get_num_parameters(); ptr_buffer fs; fs.push_back(fname); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { SASSERT(f->get_parameter(i).is_int() || f->get_parameter(i).is_rational() || (f->get_parameter(i).is_ast() && is_func_decl(f->get_parameter(i).get_ast()))); @@ -149,7 +149,7 @@ format * smt2_pp_environment::pp_signature(format * f_name, func_decl * f) { f_name = pp_fdecl_params(f_name, f); } ptr_buffer f_domain; - for (unsigned i = 0; i < f->get_arity(); i++) + for (unsigned i = 0; i < f->get_arity(); ++i) f_domain.push_back(pp_sort(f->get_domain(i))); ptr_buffer args; args.push_back(f_name); @@ -417,7 +417,7 @@ format_ns::format * smt2_pp_environment::pp_sort(sort * s) { if (get_arutil().is_array(s)) { ptr_buffer fs; unsigned sz = get_array_arity(s); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { fs.push_back(pp_sort(get_array_domain(s, i))); } fs.push_back(pp_sort(get_array_range(s))); @@ -443,7 +443,7 @@ format_ns::format * smt2_pp_environment::pp_sort(sort * s) { unsigned sz = get_dtutil().get_datatype_num_parameter_sorts(s); if (sz > 0) { ptr_buffer fs; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { fs.push_back(pp_sort(get_dtutil().get_datatype_parameter_sort(s, i))); } return mk_seq1(m, fs.begin(), fs.end(), f2f(), name); @@ -804,7 +804,7 @@ class smt2_printer { if (old_sz == sz) return f; vector > decls; - for (unsigned i = old_sz; i < sz; i++) { + for (unsigned i = old_sz; i < sz; ++i) { unsigned lvl = m_aliased_lvls_names[i].first; symbol f_name = m_aliased_lvls_names[i].second; format * f_def[1] = { m_aliased_pps.get(i) }; @@ -828,7 +828,7 @@ class smt2_printer { if (num_op == 0) return f; buf.push_back(mk_indent(m(), SMALL_INDENT, mk_compose(m(), mk_line_break(m()), f))); - for (unsigned i = 0; i < num_op; i++) + for (unsigned i = 0; i < num_op; ++i) buf.push_back(mk_string(m(), ")")); return mk_compose(m(), buf.size(), buf.data()); } @@ -869,7 +869,7 @@ class smt2_printer { void register_var_names(quantifier * q) { unsigned num_decls = q->get_num_decls(); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { symbol name = ensure_quote_sym(q->get_decl_name(i)); if (name.is_numerical()) { unsigned idx = 1; @@ -887,7 +887,7 @@ class smt2_printer { void register_var_names(unsigned n) { unsigned idx = 1; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { symbol name = next_name("x", idx); SASSERT(!m_var_names_set.contains(name)); m_var_names.push_back(name); @@ -900,7 +900,7 @@ class smt2_printer { } void unregister_var_names(unsigned num_decls) { - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { symbol s = m_var_names.back(); m_var_names.pop_back(); m_var_names_set.erase(s); @@ -911,7 +911,7 @@ class smt2_printer { ptr_buffer buf; SASSERT(num_decls <= m_var_names.size()); symbol * it = m_var_names.end() - num_decls; - for (unsigned i = 0; i < num_decls; i++, it++) { + for (unsigned i = 0; i < num_decls; ++i, ++it) { format * fs[1] = { m_env.pp_sort(srts[i]) }; std::string var_name; if (is_smt2_quoted_symbol (*it)) { @@ -1110,7 +1110,7 @@ public: var_prefix = "_a"; } unsigned idx = 0; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { symbol name = next_name(var_prefix, idx); name = ensure_quote_sym(name); var_names.push_back(name); @@ -1136,7 +1136,7 @@ public: format * args[3]; args[0] = fname; ptr_buffer buf; - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { buf.push_back(m_env.pp_sort(f->get_domain(i))); } args[1] = mk_seq5(m(), buf.begin(), buf.end(), f2f()); diff --git a/src/ast/ast_translation.cpp b/src/ast/ast_translation.cpp index 12184cb03..affe9d49d 100644 --- a/src/ast/ast_translation.cpp +++ b/src/ast/ast_translation.cpp @@ -57,7 +57,7 @@ void ast_translation::cache(ast * s, ast * t) { void ast_translation::collect_decl_extra_children(decl * d) { unsigned num_params = d->get_num_parameters(); - for (unsigned i = 0; i < num_params; i++) { + for (unsigned i = 0; i < num_params; ++i) { parameter const & p = d->get_parameter(i); if (p.is_ast()) m_extra_children_stack.push_back(p.get_ast()); @@ -102,7 +102,7 @@ bool ast_translation::visit(ast * n) { void ast_translation::copy_params(decl * d, unsigned rpos, buffer & ps) { unsigned num = d->get_num_parameters(); unsigned j = rpos; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { parameter const & p = d->get_parameter(i); if (p.is_ast()) { ps.push_back(parameter(m_result_stack[j])); @@ -365,7 +365,7 @@ expr_dependency * expr_dependency_translation::operator()(expr_dependency * d) { m_translation.from().linearize(d, m_buffer); unsigned sz = m_buffer.size(); SASSERT(sz >= 1); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_buffer[i] = m_translation(m_buffer[i]); } return m_translation.to().mk_join(sz, m_buffer.data()); diff --git a/src/ast/ast_util.cpp b/src/ast/ast_util.cpp index 090a2ff9d..3f8080490 100644 --- a/src/ast/ast_util.cpp +++ b/src/ast/ast_util.cpp @@ -232,8 +232,8 @@ expr_ref push_not(const expr_ref& e, unsigned limit) { expr * expand_distinct(ast_manager & m, unsigned num_args, expr * const * args) { expr_ref_buffer new_diseqs(m); - for (unsigned i = 0; i < num_args; i++) { - for (unsigned j = i + 1; j < num_args; j++) + for (unsigned i = 0; i < num_args; ++i) { + for (unsigned j = i + 1; j < num_args; ++j) new_diseqs.push_back(m.mk_not(m.mk_eq(args[i], args[j]))); } return mk_and(m, new_diseqs.size(), new_diseqs.data()); diff --git a/src/ast/ast_util.h b/src/ast/ast_util.h index 8e07ccd27..3bddac833 100644 --- a/src/ast/ast_util.h +++ b/src/ast/ast_util.h @@ -27,7 +27,7 @@ void remove_duplicates(C & v) { if (!v.empty()) { unsigned sz = v.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { auto curr = v.get(i); if (!visited.is_marked(curr)) { visited.mark(curr); @@ -47,7 +47,7 @@ bool is_well_formed_vars(ptr_vector& bound, expr* n); inline bool args_are_vars(app const * n) { unsigned sz = n->get_num_args(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!is_var(n->get_arg(i))) return false; } @@ -56,7 +56,7 @@ inline bool args_are_vars(app const * n) { inline bool depth_leq_one(app * n) { unsigned sz = n->get_num_args(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = n->get_arg(i); if (is_app(arg) && to_app(arg)->get_num_args() > 0) return false; diff --git a/src/ast/bv_decl_plugin.cpp b/src/ast/bv_decl_plugin.cpp index 83c0e2772..8ec2bfb90 100644 --- a/src/ast/bv_decl_plugin.cpp +++ b/src/ast/bv_decl_plugin.cpp @@ -44,7 +44,7 @@ bv_decl_plugin::bv_decl_plugin(): void bv_decl_plugin::set_manager(ast_manager * m, family_id id) { decl_plugin::set_manager(m, id); - for (unsigned i = 1; i <= 64; i++) + for (unsigned i = 1; i <= 64; ++i) mk_bv_sort(i); m_bit0 = m->mk_const_decl(symbol("bit0"), get_bv_sort(1), func_decl_info(m_family_id, OP_BIT0)); @@ -407,7 +407,7 @@ inline bool bv_decl_plugin::get_bv_size(expr * t, int & result) { bool bv_decl_plugin::get_concat_size(unsigned arity, sort * const * domain, int & result) { result = 0; - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { int sz; if (!get_bv_size(domain[i], sz)) { return false; @@ -500,7 +500,7 @@ func_decl * bv_decl_plugin::mk_bit2bool(unsigned bv_size, unsigned num_parameter } func_decl * bv_decl_plugin::mk_mkbv(unsigned arity, sort * const * domain) { - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { if (!m_manager->is_bool(domain[i])) { m_manager->raise_exception("invalid mkbv operator"); return nullptr; diff --git a/src/ast/converters/converter.h b/src/ast/converters/converter.h index bbd30c351..3e572855b 100644 --- a/src/ast/converters/converter.h +++ b/src/ast/converters/converter.h @@ -90,7 +90,7 @@ protected: public: concat_star_converter(T * c1, unsigned num, T * const * c2s, unsigned * szs): m_c1(c1) { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { T * c2 = c2s[i]; if (c2) c2->inc_ref(); diff --git a/src/ast/converters/expr_inverter.cpp b/src/ast/converters/expr_inverter.cpp index 63578487e..bc4a279c7 100644 --- a/src/ast/converters/expr_inverter.cpp +++ b/src/ast/converters/expr_inverter.cpp @@ -183,7 +183,7 @@ public: return false; unsigned i; expr* v = nullptr; - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { expr* arg = args[i]; if (uncnstr(arg)) { v = arg; @@ -196,7 +196,7 @@ public: if (!m_mc) return true; ptr_buffer new_args; - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) if (j != i) new_args.push_back(args[j]); @@ -270,7 +270,7 @@ class bv_expr_inverter : public iexpr_inverter { return false; unsigned i; expr* v = nullptr; - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { expr* arg = args[i]; if (uncnstr(arg)) { v = arg; @@ -283,7 +283,7 @@ class bv_expr_inverter : public iexpr_inverter { if (!m_mc) return true; ptr_buffer new_args; - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) if (j != i) new_args.push_back(args[j]); @@ -648,7 +648,7 @@ public: if (m.is_uninterp(get_array_range(s))) return false; unsigned arity = get_array_arity(s); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) if (m.is_uninterp(get_array_domain(s, i))) return false; // building @@ -657,7 +657,7 @@ public: // and d is a term different from (select t i1 ... in) expr_ref_vector new_args(m); new_args.push_back(t); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) new_args.push_back(m.get_some_value(get_array_domain(s, i))); expr_ref sel(m); sel = a.mk_select(new_args); @@ -692,13 +692,13 @@ public: return true; } func_decl* c = dt.get_accessor_constructor(f); - for (unsigned i = 0; i < c->get_arity(); i++) + for (unsigned i = 0; i < c->get_arity(); ++i) if (!m.is_fully_interp(c->get_domain(i))) return false; mk_fresh_uncnstr_var_for(f, r); ptr_vector const& accs = *dt.get_constructor_accessors(c); ptr_buffer new_args; - for (unsigned i = 0; i < accs.size(); i++) { + for (unsigned i = 0; i < accs.size(); ++i) { if (accs[i] == f) new_args.push_back(r); else @@ -719,7 +719,7 @@ public: for (func_decl* constructor : constructors) { unsigned num = constructor->get_arity(); unsigned target = UINT_MAX; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort* s_arg = constructor->get_domain(i); if (s == s_arg) { target = i; @@ -732,7 +732,7 @@ public: continue; // use the constructor the distinct term constructor(...,t,...) ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i == target) new_args.push_back(t); else @@ -924,7 +924,7 @@ expr_inverter::~expr_inverter() { bool iexpr_inverter::uncnstr(unsigned num, expr * const * args) const { - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) if (!m_is_var(args[i])) return false; return true; @@ -956,7 +956,7 @@ void iexpr_inverter::add_defs(unsigned num, expr* const* args, expr* u, expr* id if (!m_mc) return; add_def(args[0], u); - for (unsigned i = 1; i < num; i++) + for (unsigned i = 1; i < num; ++i) add_def(args[i], identity); } @@ -979,7 +979,7 @@ bool expr_inverter::operator()(func_decl* f, unsigned num, expr* const* args, ex if (num == 0) return false; - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) if (!is_ground(args[i])) return false; diff --git a/src/ast/converters/proof_converter.cpp b/src/ast/converters/proof_converter.cpp index 88358b7c3..7e1d195fc 100644 --- a/src/ast/converters/proof_converter.cpp +++ b/src/ast/converters/proof_converter.cpp @@ -90,7 +90,7 @@ proof_ref apply(ast_manager & m, proof_converter_ref & pc1, proof_converter_ref_ SASSERT(pc1); proof_ref_buffer prs(m); unsigned sz = pc2s.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { proof_ref pr(m); SASSERT(pc2s[i]); // proof production is enabled pr = pc2s[i]->operator()(m, 0, nullptr); diff --git a/src/ast/datatype_decl_plugin.cpp b/src/ast/datatype_decl_plugin.cpp index fc3ddfcab..bb5e0781e 100644 --- a/src/ast/datatype_decl_plugin.cpp +++ b/src/ast/datatype_decl_plugin.cpp @@ -710,7 +710,7 @@ namespace datatype { SASSERT(u().is_datatype(s)); func_decl * c = u().get_non_rec_constructor(s); ptr_buffer args; - for (unsigned i = 0; i < c->get_arity(); i++) { + for (unsigned i = 0; i < c->get_arity(); ++i) { args.push_back(m_manager->get_some_value(c->get_domain(i))); } return m_manager->mk_app(c, args); @@ -964,7 +964,7 @@ namespace datatype { ptr_vector subsorts; do { changed = false; - for (unsigned tid = 0; tid < num_types; tid++) { + for (unsigned tid = 0; tid < num_types; ++tid) { if (well_founded[tid]) continue; sort* s = sorts[tid]; @@ -1003,11 +1003,11 @@ namespace datatype { ast_mark mark; ptr_vector subsorts; - for (unsigned tid = 0; tid < num_types; tid++) { + for (unsigned tid = 0; tid < num_types; ++tid) { mark.mark(sorts[tid], true); } - for (unsigned tid = 0; tid < num_types; tid++) { + for (unsigned tid = 0; tid < num_types; ++tid) { sort* s = sorts[tid]; def const& d = get_def(s); for (constructor const* c : d) { @@ -1314,7 +1314,7 @@ namespace datatype { unsigned j = 0; unsigned max_depth = 0; unsigned start2 = rand(); - for (; j < num_args; j++) { + for (; j < num_args; ++j) { unsigned i = (start2 + j) % num_args; sort * T_i = autil.get_array_range_rec(c->get_domain(i)); TRACE(util_bug, tout << "c: " << i << " " << sort_ref(T_i, m) << "\n";); diff --git a/src/ast/decl_collector.cpp b/src/ast/decl_collector.cpp index 5619f546b..a1d472be2 100644 --- a/src/ast/decl_collector.cpp +++ b/src/ast/decl_collector.cpp @@ -32,7 +32,7 @@ void decl_collector::visit_sort(sort * n) { m_todo.push_back(cnstr); ptr_vector const & cnstr_acc = *m_dt_util.get_constructor_accessors(cnstr); unsigned num_cas = cnstr_acc.size(); - for (unsigned j = 0; j < num_cas; j++) + for (unsigned j = 0; j < num_cas; ++j) m_todo.push_back(cnstr_acc.get(j)); } } @@ -163,7 +163,7 @@ void decl_collector::collect_deps(sort* s, sort_set& set) { for (unsigned i = 0; i < num_sorts; ++i) set.insert(m_dt_util.get_datatype_parameter_sort(s, i)); unsigned num_cnstr = m_dt_util.get_datatype_num_constructors(s); - for (unsigned i = 0; i < num_cnstr; i++) { + for (unsigned i = 0; i < num_cnstr; ++i) { func_decl * cnstr = m_dt_util.get_datatype_constructors(s)->get(i); set.insert(cnstr->get_range()); for (unsigned j = 0; j < cnstr->get_arity(); ++j) { diff --git a/src/ast/display_dimacs.cpp b/src/ast/display_dimacs.cpp index 9440987ea..5c91ed5b7 100644 --- a/src/ast/display_dimacs.cpp +++ b/src/ast/display_dimacs.cpp @@ -45,7 +45,7 @@ struct dimacs_pp { num_lits = 1; lits = &f; } - for (unsigned j = 0; j < num_lits; j++) { + for (unsigned j = 0; j < num_lits; ++j) { expr * l = lits[j]; if (m.is_false(l)) continue; @@ -78,7 +78,7 @@ struct dimacs_pp { num_lits = 1; lits = &f; } - for (unsigned j = 0; j < num_lits; j++) { + for (unsigned j = 0; j < num_lits; ++j) { expr * l = lits[j]; if (m.is_not(l)) l = to_app(l)->get_arg(0); @@ -101,7 +101,7 @@ struct dimacs_pp { num_lits = 1; lits = &f; } - for (unsigned j = 0; j < num_lits; j++) { + for (unsigned j = 0; j < num_lits; ++j) { expr * l = lits[j]; if (m.is_false(l)) continue; diff --git a/src/ast/euf/euf_etable.cpp b/src/ast/euf/euf_etable.cpp index 49e5d1bdf..b308523a5 100644 --- a/src/ast/euf/euf_etable.cpp +++ b/src/ast/euf/euf_etable.cpp @@ -55,7 +55,7 @@ namespace euf { if (num != n2->num_args()) { return false; } - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) if (get_root(n1, i) != get_root(n2, i)) return false; return true; diff --git a/src/ast/euf/euf_mam.cpp b/src/ast/euf/euf_mam.cpp index ec2d03bdf..aba3036d7 100644 --- a/src/ast/euf/euf_mam.cpp +++ b/src/ast/euf/euf_mam.cpp @@ -115,7 +115,7 @@ namespace euf { void display(std::ostream & out) const { out << "lbl-hasher:\n"; bool first = true; - for (unsigned i = 0; i < m_lbl2hash.size(); i++) { + for (unsigned i = 0; i < m_lbl2hash.size(); ++i) { if (m_lbl2hash[i] != -1) { if (first) first = false; @@ -282,14 +282,14 @@ namespace euf { out << "(GET_CGR"; display_num_args(out, c.m_num_args); out << " " << c.m_label->get_name() << " " << c.m_oreg; - for (unsigned i = 0; i < c.m_num_args; i++) + for (unsigned i = 0; i < c.m_num_args; ++i) out << " " << c.m_iregs[i]; out << ")"; } void display_is_cgr(std::ostream & out, const is_cgr & c) { out << "(IS_CGR " << c.m_label->get_name() << " " << c.m_ireg; - for (unsigned i = 0; i < c.m_num_args; i++) + for (unsigned i = 0; i < c.m_num_args; ++i) out << " " << c.m_iregs[i]; out << ")"; } @@ -298,14 +298,14 @@ namespace euf { out << "(YIELD"; display_num_args(out, y.m_num_bindings); out << " #" << y.m_qa->get_id(); - for (unsigned i = 0; i < y.m_num_bindings; i++) { + for (unsigned i = 0; i < y.m_num_bindings; ++i) { out << " " << y.m_bindings[i]; } out << ")"; } void display_joints(std::ostream & out, unsigned num_joints, enode * const * joints) { - for (unsigned i = 0; i < num_joints; i++) { + for (unsigned i = 0; i < num_joints; ++i) { if (i > 0) out << " "; enode * bare = joints[i]; @@ -425,7 +425,7 @@ namespace euf { friend class code_tree_manager; void spaces(std::ostream& out, unsigned indent) const { - for (unsigned i = 0; i < indent; i++) + for (unsigned i = 0; i < indent; ++i) out << " "; } @@ -888,7 +888,7 @@ namespace euf { app * p = to_app(mp->get_arg(first_idx)); SASSERT(t->get_root_lbl() == p->get_decl()); unsigned num_args = p->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(i+1, p->get_arg(i)); m_todo.push_back(i+1); } @@ -896,7 +896,7 @@ namespace euf { if (num_decls > m_vars.size()) { m_vars.resize(num_decls, -1); } - for (unsigned j = 0; j < num_decls; j++) { + for (unsigned j = 0; j < num_decls; ++j) { m_vars[j] = -1; } } @@ -1044,7 +1044,7 @@ namespace euf { if (IS_CGR_SUPPORT && all_args_are_bound_vars(first_app)) { // use IS_CGR instead of BIND sbuffer iregs; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(first_app)->get_arg(i); SASSERT(is_var(arg)); SASSERT(m_vars[to_var(arg)->get_idx()] != -1); @@ -1056,7 +1056,7 @@ namespace euf { // Generate a BIND operation for this application. unsigned oreg = m_tree->m_num_regs; m_tree->m_num_regs += num_args; - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { set_register(oreg + j, first_app->get_arg(j)); m_aux.push_back(oreg + j); } @@ -1137,13 +1137,13 @@ namespace euf { void linearise_multi_pattern(unsigned first_idx) { unsigned num_args = m_mp->get_num_args(); // multi_pattern support - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { // select the pattern with the biggest number of bound variables app * best = nullptr; unsigned best_num_bvars = 0; unsigned best_j = 0; bool found_bounded_mp = false; - for (unsigned j = 0; j < m_mp->get_num_args(); j++) { + for (unsigned j = 0; j < m_mp->get_num_args(); ++j) { if (m_mp_already_processed[j]) continue; app * p = to_app(m_mp->get_arg(j)); @@ -1179,7 +1179,7 @@ namespace euf { m_tree->m_num_regs += num_args; ptr_buffer joints; bool has_depth1_joint = false; // VAR_TAG or GROUND_TERM_TAG - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * curr = p->get_arg(j); SASSERT(!is_quantifier(curr)); set_register(oreg + j, curr); @@ -1223,7 +1223,7 @@ namespace euf { } unsigned num_args2 = to_app(curr)->get_num_args(); unsigned k = 0; - for (; k < num_args2; k++) { + for (; k < num_args2; ++k) { expr * arg = to_app(curr)->get_arg(k); if (!is_var(arg)) continue; @@ -1262,7 +1262,7 @@ namespace euf { m_mp_already_processed[first_idx] = true; linearise_multi_pattern(first_idx); } - for (unsigned i = 0; i < m_qa->get_num_decls(); i++) + for (unsigned i = 0; i < m_qa->get_num_decls(); ++i) if (m_vars[i] == -1) return; @@ -1447,7 +1447,7 @@ namespace euf { bool is_compatible(cont * instr) const { unsigned oreg = instr->m_oreg; - for (unsigned i = 0; i < instr->m_num_args; i++) + for (unsigned i = 0; i < instr->m_num_args; ++i) if (m_registers[oreg + i] != 0) return false; return true; @@ -1481,7 +1481,7 @@ namespace euf { unsigned oreg = static_cast(curr)->m_oreg; unsigned num_args = static_cast(curr)->m_num_args; SASSERT(n->get_num_args() == num_args); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(oreg + i, n->get_arg(i)); m_to_reset.push_back(oreg + i); } @@ -1542,7 +1542,7 @@ namespace euf { app * app = to_app(m_registers[ireg]); unsigned oreg = bnd->m_oreg; unsigned num_args = bnd->m_num_args; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(oreg + i, app->get_arg(i)); m_todo.push_back(oreg + i); } @@ -1982,12 +1982,12 @@ namespace euf { return false; default: { m_args.reserve(num_args+1, 0); - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) m_args[i] = m_registers[pc->m_iregs[i]]->get_root(); for (enode* n : euf::enode_class(r)) { if (n->get_decl() == f && num_args == n->num_args()) { unsigned i = 0; - for (; i < num_args; i++) { + for (; i < num_args; ++i) { if (n->get_arg(i)->get_root() != m_args[i]) break; } @@ -2142,7 +2142,7 @@ namespace euf { unsigned short num_args = c->m_num_args; enode * r; // quick filter... check if any of the joint points have zero parents... - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { void * bare = c->m_joints[i]; enode * n = nullptr; switch (GET_TAG(bare)) { @@ -2167,7 +2167,7 @@ namespace euf { } // traverse each joint and select the best one. enode_vector * best_v = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * bare = c->m_joints[i]; enode_vector * curr_v = nullptr; switch (GET_TAG(bare)) { @@ -2264,7 +2264,7 @@ namespace euf { display_reg(out, static_cast(instr)->m_reg); break; case YIELD1: case YIELD2: case YIELD3: case YIELD4: case YIELD5: case YIELD6: case YIELDN: - for (unsigned i = 0; i < static_cast(instr)->m_num_bindings; i++) { + for (unsigned i = 0; i < static_cast(instr)->m_num_bindings; ++i) { display_reg(out, static_cast(instr)->m_bindings[i]); } break; @@ -2450,7 +2450,7 @@ namespace euf { m_num_args = m_app->num_args(); if (m_num_args != static_cast(m_pc)->m_num_args) goto backtrack; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[i+1] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2617,7 +2617,7 @@ namespace euf { case BINDN: BIND_COMMON(); m_num_args = static_cast(m_pc)->m_num_args; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2681,7 +2681,7 @@ namespace euf { case YIELDN: m_num_args = static_cast(m_pc)->m_num_bindings; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_bindings[i] = m_registers[static_cast(m_pc)->m_bindings[m_num_args - i - 1]]; ON_MATCH(m_num_args); goto backtrack; @@ -2740,7 +2740,7 @@ namespace euf { case GET_CGRN: m_num_args = static_cast(m_pc)->m_num_args; m_args.reserve(m_num_args, 0); - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_args[i] = m_registers[static_cast(m_pc)->m_iregs[i]]; goto cgr_common; @@ -2758,7 +2758,7 @@ namespace euf { goto backtrack; m_pattern_instances.push_back(m_app); TRACE(mam_int, tout << "continue candidate:\n" << mk_ll_pp(m_app->get_expr(), m);); - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2884,7 +2884,7 @@ namespace euf { case BINDN: BBIND_COMMON(); m_num_args = m_b->m_num_args; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_b->m_next; goto main_loop; @@ -2920,7 +2920,7 @@ namespace euf { TRACE(mam_int, tout << "continue next candidate:\n" << mk_ll_pp(m_app->get_expr(), m);); m_num_args = c->m_num_args; m_oreg = c->m_oreg; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = c->m_next; goto main_loop; @@ -3156,7 +3156,7 @@ namespace euf { void display(std::ostream & out, unsigned indent) { path_tree * curr = this; while (curr != nullptr) { - for (unsigned i = 0; i < indent; i++) out << " "; + for (unsigned i = 0; i < indent; ++i) out << " "; out << curr->m_label->get_name() << ":" << curr->m_arg_idx; if (curr->m_ground_arg) out << ":#" << curr->m_ground_arg->get_expr_id() << ":" << curr->m_ground_arg_idx; @@ -3290,7 +3290,7 @@ namespace euf { void update_children_plbls(enode * app, unsigned char elem) { unsigned num_args = app->num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * c = app->get_arg(i); approx_set & r_plbls = c->get_root()->get_plbls(); if (!r_plbls.may_contain(elem)) { @@ -3326,8 +3326,8 @@ namespace euf { } void reset_pp_pc() { - for (unsigned i = 0; i < APPROX_SET_CAPACITY; i++) { - for (unsigned j = 0; j < APPROX_SET_CAPACITY; j++) { + for (unsigned i = 0; i < APPROX_SET_CAPACITY; ++i) { + for (unsigned j = 0; j < APPROX_SET_CAPACITY; ++j) { m_pp[i][j].first = 0; m_pp[i][j].second = 0; m_pc[i][j] = nullptr; @@ -3494,7 +3494,7 @@ namespace euf { enode * get_ground_arg(app * pat, quantifier * qa, unsigned & pos) { pos = 0; unsigned num_args = pat->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = pat->get_arg(i); if (is_ground(arg)) { pos = i; @@ -3514,7 +3514,7 @@ namespace euf { unsigned ground_arg_pos = 0; enode * ground_arg = get_ground_arg(pat, qa, ground_arg_pos); func_decl * plbl = pat->get_decl(); - for (unsigned short i = 0; i < num_args; i++) { + for (unsigned short i = 0; i < num_args; ++i) { expr * child = pat->get_arg(i); path * new_path = new (m_tmp_region) path(plbl, i, ground_arg_pos, ground_arg, pat_idx, p); @@ -3556,7 +3556,7 @@ namespace euf { unsigned num_vars = qa->get_num_decls(); if (num_vars >= m_var_paths.size()) m_var_paths.resize(num_vars+1); - for (unsigned i = 0; i <= num_vars; i++) + for (unsigned i = 0; i <= num_vars; ++i) m_var_paths[i].reset(); m_tmp_region.reset(); // Given a multi-pattern (p_1, ..., p_n) @@ -3566,15 +3566,15 @@ namespace euf { // ... // (p_n, p_2, ..., p_1) unsigned num_patterns = mp->get_num_args(); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { app * pat = to_app(mp->get_arg(i)); update_filters(pat, nullptr, qa, mp, i); } } void display_filter_info(std::ostream & out) { - for (unsigned i = 0; i < APPROX_SET_CAPACITY; i++) { - for (unsigned j = 0; j < APPROX_SET_CAPACITY; j++) { + for (unsigned i = 0; i < APPROX_SET_CAPACITY; ++i) { + for (unsigned j = 0; j < APPROX_SET_CAPACITY; ++j) { if (m_pp[i][j].first) { out << "pp[" << i << "][" << j << "]:\n"; m_pp[i][j].first->display(out, 1); @@ -3902,7 +3902,7 @@ namespace euf { // e-matching. So, for a multi-pattern [ p_1, ..., p_n ], // we have to make n insertions. In the i-th insertion, // the pattern p_i is assumed to be the first one. - for (unsigned i = 0; i < mp->get_num_args(); i++) + for (unsigned i = 0; i < mp->get_num_args(); ++i) m_trees.add_pattern(qa, mp, i); } diff --git a/src/ast/expr2polynomial.cpp b/src/ast/expr2polynomial.cpp index 8f300d0cb..2ce7bed95 100644 --- a/src/ast/expr2polynomial.cpp +++ b/src/ast/expr2polynomial.cpp @@ -255,11 +255,11 @@ struct expr2polynomial::imp { polynomial::scoped_numeral d(nm()); polynomial::scoped_numeral d_aux(nm()); d = 1; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { nm().lcm(d, d_args[i], d); } p = pm().mk_zero(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { checkpoint(); nm().div(d, d_args[i], d_aux); p_aux = pm().mul(d_aux, p_args[i]); @@ -291,7 +291,7 @@ struct expr2polynomial::imp { polynomial::scoped_numeral d(nm()); p = pm().mk_const(rational(1)); d = 1; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { checkpoint(); p = pm().mul(p, p_args[i]); d = d * d_args[i]; @@ -388,10 +388,10 @@ struct expr2polynomial::imp { bool is_int_poly(polynomial::polynomial_ref const & p) { unsigned sz = size(p); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { polynomial::monomial * m = pm().get_monomial(p, i); unsigned msz = pm().size(m); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { polynomial::var x = pm().get_var(m, j); if (!m_wrapper.is_int(x)) return false; @@ -406,7 +406,7 @@ struct expr2polynomial::imp { unsigned sz = size(p); bool is_int = is_int_poly(p); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { margs.reset(); polynomial::monomial * _m = pm().get_monomial(p, i); polynomial::numeral const & a = pm().coeff(p, i); @@ -414,7 +414,7 @@ struct expr2polynomial::imp { margs.push_back(m_autil.mk_numeral(rational(a), is_int)); } unsigned msz = pm().size(_m); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { polynomial::var x = pm().get_var(_m, j); expr * t; if (m_use_var_idxs) { @@ -431,7 +431,7 @@ struct expr2polynomial::imp { margs.push_back(m_autil.mk_power(t, m_autil.mk_numeral(rational(d), is_int))); } else { - for (unsigned k = 0; k < d; k++) + for (unsigned k = 0; k < d; ++k) margs.push_back(t); } } diff --git a/src/ast/for_each_ast.cpp b/src/ast/for_each_ast.cpp index 77e975b98..4966795fb 100644 --- a/src/ast/for_each_ast.cpp +++ b/src/ast/for_each_ast.cpp @@ -34,7 +34,7 @@ unsigned get_num_nodes(ast * n) { bool for_each_parameter(ptr_vector & stack, ast_mark & visited, unsigned num_args, parameter const * params) { bool result = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { parameter const& p = params[i]; if (p.is_ast() && !visited.is_marked(p.get_ast())) { stack.push_back(p.get_ast()); diff --git a/src/ast/for_each_ast.h b/src/ast/for_each_ast.h index fbc26775b..cf8355891 100644 --- a/src/ast/for_each_ast.h +++ b/src/ast/for_each_ast.h @@ -25,7 +25,7 @@ Revision History: template bool for_each_ast_args(ptr_vector & stack, ast_mark & visited, unsigned num_args, T * const * args) { bool result = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { T * arg = args[i]; if (!visited.is_marked(arg)) { stack.push_back(arg); diff --git a/src/ast/for_each_expr.h b/src/ast/for_each_expr.h index 97a171755..30599cd80 100644 --- a/src/ast/for_each_expr.h +++ b/src/ast/for_each_expr.h @@ -106,7 +106,7 @@ void for_each_expr_core(ForEachProc & proc, ExprMark & visited, expr * n) { template bool for_each_expr_args(ptr_vector & stack, expr_mark & visited, unsigned num_args, T * const * args) { bool result = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { T * arg = args[i]; if (!visited.is_marked(arg)) { stack.push_back(arg); diff --git a/src/ast/fpa/bv2fpa_converter.cpp b/src/ast/fpa/bv2fpa_converter.cpp index fa801be14..6c10c2764 100644 --- a/src/ast/fpa/bv2fpa_converter.cpp +++ b/src/ast/fpa/bv2fpa_converter.cpp @@ -242,7 +242,7 @@ bv2fpa_converter::array_model bv2fpa_converter::convert_array_func_interp(model_ if (as_arr_mdl == 0) return am; TRACE(bv2fpa, tout << "arity=0 func_interp for " << mk_ismt2_pp(f, m) << " := " << mk_ismt2_pp(as_arr_mdl, m) << std::endl;); SASSERT(arr_util.is_as_array(as_arr_mdl)); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) array_domain.push_back(to_sort(f->get_range()->get_parameter(i).get_ast())); sort * rng = to_sort(f->get_range()->get_parameter(arity).get_ast()); @@ -268,12 +268,12 @@ func_interp * bv2fpa_converter::convert_func_interp(model_core * mc, func_decl * if (bv_fi) { fpa_rewriter rw(m); - for (unsigned i = 0; i < bv_fi->num_entries(); i++) { + for (unsigned i = 0; i < bv_fi->num_entries(); ++i) { func_entry const * bv_fe = bv_fi->get_entry(i); expr * const * bv_args = bv_fe->get_args(); expr_ref_buffer new_args(m); - for (unsigned j = 0; j < arity; j++) { + for (unsigned j = 0; j < arity; ++j) { sort * ft_dj = dmn[j]; expr * bv_aj = bv_args[j]; expr_ref ai = rebuild_floats(mc, ft_dj, to_app(bv_aj)); @@ -288,12 +288,12 @@ func_interp * bv2fpa_converter::convert_func_interp(model_core * mc, func_decl * TRACE(bv2fpa, tout << "func_interp entry #" << i << ":" << std::endl; tout << "(" << bv_f->get_name(); - for (unsigned i = 0; i < bv_f->get_arity(); i++) + for (unsigned i = 0; i < bv_f->get_arity(); ++i) tout << " " << mk_ismt2_pp(bv_args[i], m); tout << ") = " << mk_ismt2_pp(bv_fres, m) << std::endl; tout << " --> " << std::endl; tout << "(" << f->get_name(); - for (unsigned i = 0; i < new_args.size(); i++) + for (unsigned i = 0; i < new_args.size(); ++i) tout << " " << mk_ismt2_pp(new_args[i], m); tout << ") = " << mk_ismt2_pp(ft_fres, m) << std::endl;); func_entry * fe = result->get_entry(new_args.data()); diff --git a/src/ast/fpa/fpa2bv_converter.cpp b/src/ast/fpa/fpa2bv_converter.cpp index a6cbab500..afed97a7b 100644 --- a/src/ast/fpa/fpa2bv_converter.cpp +++ b/src/ast/fpa/fpa2bv_converter.cpp @@ -135,8 +135,8 @@ void fpa2bv_converter::mk_distinct(func_decl * f, unsigned num, expr * const * a // equal, thus (distinct NaN NaN) is false, even if the two NaNs have // different bitwise representations (see also mk_eq). result = m.mk_true(); - for (unsigned i = 0; i < num; i++) { - for (unsigned j = i+1; j < num; j++) { + for (unsigned i = 0; i < num; ++i) { + for (unsigned j = i+1; j < num; ++j) { expr_ref eq(m), neq(m); mk_eq(args[i], args[j], eq); neq = m.mk_not(eq); @@ -260,7 +260,7 @@ expr_ref fpa2bv_converter::extra_quantify(expr * e) { subst_map.resize(nv); unsigned j = 0; - for (unsigned i = 0; i < nv; i++) { + for (unsigned i = 0; i < nv; ++i) { if (uv.contains(i)) { TRACE(fpa2bv, tout << "uv[" << i << "] = " << mk_ismt2_pp(uv.get(i), m) << std::endl; ); sort * s = uv.get(i); @@ -1900,7 +1900,7 @@ void fpa2bv_converter::mk_sqrt(func_decl * f, unsigned num, expr * const * args, R = m_bv_util.mk_bv_sub(m_bv_util.mk_concat(sig_prime, m_bv_util.mk_numeral(0, 4)), Q); S = Q; - for (unsigned i = 0; i < sbits + 3; i++) { + for (unsigned i = 0; i < sbits + 3; ++i) { dbg_decouple("fpa2bv_sqrt_Q", Q); dbg_decouple("fpa2bv_sqrt_R", R); @@ -2437,7 +2437,7 @@ void fpa2bv_converter::mk_is_positive(func_decl * f, unsigned num, expr * const } void fpa2bv_converter::mk_to_fp(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_fp, for (unsigned i=0; i < num; i++) + TRACE(fpa2bv_to_fp, for (unsigned i=0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl; ); if (num == 1 && @@ -2910,7 +2910,7 @@ void fpa2bv_converter::mk_to_fp_real_int(func_decl * f, unsigned num, expr * con } void fpa2bv_converter::mk_to_real(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_real, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_real, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); SASSERT(num == 1); SASSERT(f->get_num_parameters() == 0); @@ -3003,7 +3003,7 @@ void fpa2bv_converter::mk_to_real(func_decl * f, unsigned num, expr * const * ar } void fpa2bv_converter::mk_to_fp_signed(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_fp_signed, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_fp_signed, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); // This is a conversion from signed bitvector to float: @@ -3146,7 +3146,7 @@ void fpa2bv_converter::mk_to_fp_signed(func_decl * f, unsigned num, expr * const } void fpa2bv_converter::mk_to_fp_unsigned(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_fp_unsigned, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_fp_unsigned, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); // This is a conversion from unsigned bitvector to float: @@ -3333,7 +3333,7 @@ void fpa2bv_converter::mk_to_ieee_bv_i(func_decl * f, unsigned num, expr * const } void fpa2bv_converter::mk_to_bv(func_decl * f, unsigned num, expr * const * args, bool is_signed, expr_ref & result) { - TRACE(fpa2bv_to_bv, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_bv, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); SASSERT(num == 2); @@ -3503,13 +3503,13 @@ void fpa2bv_converter::mk_to_bv(func_decl * f, unsigned num, expr * const * args } void fpa2bv_converter::mk_to_ubv(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_ubv, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_ubv, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); mk_to_bv(f, num, args, false, result); } void fpa2bv_converter::mk_to_sbv(func_decl * f, unsigned num, expr * const * args, expr_ref & result) { - TRACE(fpa2bv_to_sbv, for (unsigned i = 0; i < num; i++) + TRACE(fpa2bv_to_sbv, for (unsigned i = 0; i < num; ++i) tout << "arg" << i << " = " << mk_ismt2_pp(args[i], m) << std::endl;); mk_to_bv(f, num, args, true, result); } diff --git a/src/ast/fpa/fpa2bv_rewriter.cpp b/src/ast/fpa/fpa2bv_rewriter.cpp index bba7adb60..8a87fd90a 100644 --- a/src/ast/fpa/fpa2bv_rewriter.cpp +++ b/src/ast/fpa/fpa2bv_rewriter.cpp @@ -56,7 +56,7 @@ bool fpa2bv_rewriter_cfg::max_steps_exceeded(unsigned num_steps) const { br_status fpa2bv_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) { TRACE(fpa2bv_rw, tout << "func: " << f->get_name() << std::endl; tout << "args: " << std::endl; - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << std::endl;); if (num == 0 && f->get_family_id() == null_family_id && m_conv.is_float(f->get_range())) { @@ -159,7 +159,7 @@ br_status fpa2bv_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr * co default: TRACE(fpa2bv, tout << "unsupported operator: " << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << std::endl;); + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << std::endl;); NOT_IMPLEMENTED_YET(); } } @@ -183,7 +183,7 @@ bool fpa2bv_rewriter_cfg::pre_visit(expr * t) quantifier * q = to_quantifier(t); TRACE(fpa2bv, tout << "pre_visit quantifier [" << q->get_id() << "]: " << mk_ismt2_pp(q->get_expr(), m()) << std::endl;); sort_ref_vector new_bindings(m_manager); - for (unsigned i = 0 ; i < q->get_num_decls(); i++) + for (unsigned i = 0 ; i < q->get_num_decls(); ++i) new_bindings.push_back(q->get_decl_sort(i)); SASSERT(new_bindings.size() == q->get_num_decls()); m_bindings.append(new_bindings); @@ -209,7 +209,7 @@ bool fpa2bv_rewriter_cfg::reduce_quantifier( string_buffer<> name_buffer; ptr_buffer new_decl_sorts; sbuffer new_decl_names; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { symbol const & n = old_q->get_decl_name(i); sort * s = old_q->get_decl_sort(i); if (m_conv.is_float(s)) { diff --git a/src/ast/fpa_decl_plugin.cpp b/src/ast/fpa_decl_plugin.cpp index ac6e79f63..e255f4b10 100644 --- a/src/ast/fpa_decl_plugin.cpp +++ b/src/ast/fpa_decl_plugin.cpp @@ -1010,7 +1010,7 @@ bool fpa_util::contains_floats(ast * a) { if (contains_floats(aa->get_decl())) return true; else - for (unsigned i = 0; i < aa->get_num_args(); i++) + for (unsigned i = 0; i < aa->get_num_args(); ++i) if (contains_floats(aa->get_arg(i))) return true; break; @@ -1020,10 +1020,10 @@ bool fpa_util::contains_floats(ast * a) { break; case AST_QUANTIFIER: { quantifier * q = to_quantifier(a); - for (unsigned i = 0; i < q->get_num_children(); i++) + for (unsigned i = 0; i < q->get_num_children(); ++i) if (contains_floats(q->get_child(i))) return true; - for (unsigned i = 0; i < q->get_num_decls(); i++) + for (unsigned i = 0; i < q->get_num_decls(); ++i) if (contains_floats(q->get_decl_sort(i))) return true; if (contains_floats(q->get_expr())) @@ -1035,7 +1035,7 @@ bool fpa_util::contains_floats(ast * a) { if (is_float(s) || is_rm(s)) return true; else { - for (unsigned i = 0; i < s->get_num_parameters(); i++) { + for (unsigned i = 0; i < s->get_num_parameters(); ++i) { parameter const & pi = s->get_parameter(i); if (pi.is_ast() && contains_floats(pi.get_ast())) return true; @@ -1045,12 +1045,12 @@ bool fpa_util::contains_floats(ast * a) { } case AST_FUNC_DECL: { func_decl * f = to_func_decl(a); - for (unsigned i = 0; i < f->get_arity(); i++) + for (unsigned i = 0; i < f->get_arity(); ++i) if (contains_floats(f->get_domain(i))) return true; if (contains_floats(f->get_range())) return true; - for (unsigned i = 0; i < f->get_num_parameters(); i++) { + for (unsigned i = 0; i < f->get_num_parameters(); ++i) { parameter const & pi = f->get_parameter(i); if (pi.is_ast() && contains_floats(pi.get_ast())) return true; diff --git a/src/ast/macros/macro_finder.cpp b/src/ast/macros/macro_finder.cpp index 9bf1d91ea..f9b50a062 100644 --- a/src/ast/macros/macro_finder.cpp +++ b/src/ast/macros/macro_finder.cpp @@ -276,7 +276,7 @@ bool macro_finder::expand_macros(expr_ref_vector const& exprs, proof_ref_vector unsigned num = exprs.size(); bool deps_valid = deps.size() == exprs.size(); SASSERT(deps_valid || deps.empty()); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * n = exprs[i]; proof * pr = m.proofs_enabled() ? prs[i] : nullptr; expr_dependency * dep = deps.get(i, nullptr); @@ -345,7 +345,7 @@ bool macro_finder::expand_macros(unsigned num, justified_expr const * fmls, vect TRACE(macro_finder, tout << "starting expand_macros:\n"; m_macro_manager.display(tout);); bool found_new_macro = false; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * n = fmls[i].fml(); proof * pr = m.proofs_enabled() ? fmls[i].pr() : nullptr; expr_ref new_n(m), def(m); diff --git a/src/ast/macros/macro_manager.cpp b/src/ast/macros/macro_manager.cpp index 4c6d60275..a9a0c77fc 100644 --- a/src/ast/macros/macro_manager.cpp +++ b/src/ast/macros/macro_manager.cpp @@ -58,7 +58,7 @@ void macro_manager::pop_scope(unsigned num_scopes) { void macro_manager::restore_decls(unsigned old_sz) { unsigned sz = m_decls.size(); - for (unsigned i = old_sz; i < sz; i++) { + for (unsigned i = old_sz; i < sz; ++i) { m_decl2macro.erase(m_decls.get(i)); m_deps.erase(m_decls.get(i)); if (m.proofs_enabled()) @@ -74,7 +74,7 @@ void macro_manager::restore_decls(unsigned old_sz) { void macro_manager::restore_forbidden(unsigned old_sz) { unsigned sz = m_forbidden.size(); - for (unsigned i = old_sz; i < sz; i++) + for (unsigned i = old_sz; i < sz; ++i) m_forbidden_set.erase(m_forbidden.get(i)); m_forbidden.shrink(old_sz); } @@ -176,7 +176,7 @@ namespace macro_manager_ns { void macro_manager::mark_forbidden(unsigned n, justified_expr const * exprs) { expr_mark visited; macro_manager_ns::proc p(m_forbidden_set, m_forbidden); - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) for_each_expr(p, visited, exprs[i].fml()); } @@ -203,7 +203,7 @@ void macro_manager::get_head_def(quantifier * q, func_decl * d, app * & head, ex void macro_manager::display(std::ostream & out) { unsigned sz = m_decls.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * f = m_decls.get(i); quantifier * q = nullptr; m_decl2macro.find(f, q); @@ -267,11 +267,11 @@ struct macro_manager::macro_expander_cfg : public default_rewriter_cfg { // So, I'm just erasing them. bool erase_patterns = false; - for (unsigned i = 0; !erase_patterns && i < old_q->get_num_patterns(); i++) { + for (unsigned i = 0; !erase_patterns && i < old_q->get_num_patterns(); ++i) { if (old_q->get_pattern(i) != new_patterns[i]) erase_patterns = true; } - for (unsigned i = 0; !erase_patterns && i < old_q->get_num_no_patterns(); i++) { + for (unsigned i = 0; !erase_patterns && i < old_q->get_num_no_patterns(); ++i) { if (old_q->get_no_pattern(i) != new_no_patterns[i]) erase_patterns = true; } @@ -301,7 +301,7 @@ struct macro_manager::macro_expander_cfg : public default_rewriter_cfg { TRACE(macro_manager, tout << "expanding: " << mk_pp(n, m) << "\n" << mk_pp(head, m) << " " << mk_pp(def, m) << "\n";); ptr_buffer subst_args; subst_args.resize(num, 0); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { var * v = to_var(head->get_arg(i)); if (v->get_idx() >= num) return false; diff --git a/src/ast/macros/macro_util.cpp b/src/ast/macros/macro_util.cpp index cf4ac6dcf..632ffcfbb 100644 --- a/src/ast/macros/macro_util.cpp +++ b/src/ast/macros/macro_util.cpp @@ -143,7 +143,7 @@ bool macro_util::is_macro_head(expr * n, unsigned num_decls) const { to_app(n)->get_num_args() == num_decls) { sbuffer var2pos; var2pos.resize(num_decls, -1); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { expr * c = to_app(n)->get_arg(i); if (!is_var(c)) return false; @@ -252,7 +252,7 @@ bool macro_util::poly_contains_head(expr * n, func_decl * f, expr * exception) c num_args = 1; args = &n; } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (arg != exception && occurs(f, arg)) return true; @@ -283,7 +283,7 @@ bool macro_util::is_arith_macro(expr * n, unsigned num_decls, app_ref & head, ex lhs_num_args = 1; lhs_args = &lhs; } - for (unsigned i = 0; i < lhs_num_args; i++) { + for (unsigned i = 0; i < lhs_num_args; ++i) { expr * arg = lhs_args[i]; expr * neg_arg; if (h == nullptr && @@ -392,7 +392,7 @@ bool macro_util::is_quasi_macro_head(expr * n, unsigned num_decls) const { sbuffer found_vars; found_vars.resize(num_decls, false); unsigned num_found_vars = 0; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(n)->get_arg(i); if (is_var(arg)) { unsigned idx = to_var(arg)->get_idx(); @@ -429,7 +429,7 @@ bool macro_util::is_quasi_macro_ok(expr * n, unsigned num_decls, expr * def) con } if (def) fv.accumulate(def); - for (unsigned i = 0; i < fv.size(); i++) { + for (unsigned i = 0; i < fv.size(); ++i) { if (i >= num_decls || !fv.contains(i)) continue; // Quasi-macros may have new variables. if (found_vars[i] == false) { @@ -453,7 +453,7 @@ void macro_util::quasi_macro_head_to_macro_head(app * qhead, unsigned & num_decl ptr_buffer new_args; ptr_buffer new_conds; unsigned next_var_idx = num_decls; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = qhead->get_arg(i); if (is_var(arg)) { unsigned idx = to_var(arg)->get_idx(); @@ -508,7 +508,7 @@ void macro_util::normalize_expr(app * head, unsigned num_decls, expr * t, expr_r TRACE(macro_util, tout << "head: " << mk_pp(head, m) << "\n"; tout << "applying substitution to:\n" << mk_bounded_pp(t, m) << "\n";); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { var * v = to_var(head->get_arg(i)); unsigned vi = v->get_idx(); SASSERT(vi < num_decls); @@ -527,7 +527,7 @@ void macro_util::normalize_expr(app * head, unsigned num_decls, expr * t, expr_r TRACE(macro_util, tout << "head: " << mk_pp(head, m) << "\n"; tout << "applying substitution to:\n" << mk_ll_pp(t, m) << "\nsubstitution:\n"; - for (unsigned i = 0; i < var_mapping.size(); i++) { + for (unsigned i = 0; i < var_mapping.size(); ++i) { if (var_mapping[i] != 0) tout << "#" << i << " -> " << mk_ll_pp(var_mapping[i], m); }); @@ -652,7 +652,7 @@ bool macro_util::is_poly_hint(expr * n, app * head, expr * exception) { num_args = 1; args = &n; } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (arg != exception && (occurs(f, arg) || !vars_of_is_subset(arg, vars))) { TRACE(macro_util, tout << "failed because of:\n" << mk_pp(arg, m) << "\n";); @@ -744,7 +744,7 @@ bool macro_util::rest_contains_decl(func_decl * f, expr * except_lit) { return false; SASSERT(is_clause(m, m_curr_clause)); unsigned num_lits = get_clause_num_literals(m, m_curr_clause); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { expr * l = get_clause_literal(m, m_curr_clause, i); if (l != except_lit && occurs(f, l)) return true; @@ -758,7 +758,7 @@ void macro_util::get_rest_clause_as_cond(expr * except_lit, expr_ref & extra_con SASSERT(is_clause(m, m_curr_clause)); expr_ref_buffer neg_other_lits(m); unsigned num_lits = get_clause_num_literals(m, m_curr_clause); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { expr * l = get_clause_literal(m, m_curr_clause, i); if (l != except_lit) { expr_ref neg_l(m); @@ -783,7 +783,7 @@ void macro_util::collect_poly_args(expr * n, expr * exception, ptr_buffer num_args = 1; _args = &n; } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = _args[i]; if (arg != exception) args.push_back(arg); @@ -811,7 +811,7 @@ void macro_util::collect_arith_macro_candidates(expr * lhs, expr * rhs, expr * a lhs_num_args = 1; lhs_args = &lhs; } - for (unsigned i = 0; i < lhs_num_args; i++) { + for (unsigned i = 0; i < lhs_num_args; ++i) { expr * arg = lhs_args[i]; expr * neg_arg; if (!is_app(arg)) @@ -967,7 +967,7 @@ void macro_util::collect_macro_candidates(quantifier * q, macro_candidates & r) if (is_clause(m, n)) { m_curr_clause = n; unsigned num_lits = get_clause_num_literals(m, n); - for (unsigned i = 0; i < num_lits; i++) + for (unsigned i = 0; i < num_lits; ++i) collect_macro_candidates_core(get_clause_literal(m, n, i), num_decls, r); m_curr_clause = nullptr; } diff --git a/src/ast/macros/quantifier_macro_info.cpp b/src/ast/macros/quantifier_macro_info.cpp index 2647baf2f..b0bafc5d6 100644 --- a/src/ast/macros/quantifier_macro_info.cpp +++ b/src/ast/macros/quantifier_macro_info.cpp @@ -36,7 +36,7 @@ void quantifier_macro_info::collect_macro_candidates(quantifier* q) { qa = m.update_quantifier(q, quantifier_kind::forall_k, m.mk_not(q->get_expr())); mutil.collect_macro_candidates(qa, candidates); unsigned num_candidates = candidates.size(); - for (unsigned i = 0; i < num_candidates; i++) { + for (unsigned i = 0; i < num_candidates; ++i) { cond_macro* mc = alloc(cond_macro, m, candidates.get_f(i), candidates.get_def(i), candidates.get_cond(i), candidates.ineq(i), candidates.satisfy_atom(i), candidates.hint(i), q->get_weight()); insert_macro(mc); diff --git a/src/ast/macros/quasi_macros.cpp b/src/ast/macros/quasi_macros.cpp index 8a3d9a76a..915861213 100644 --- a/src/ast/macros/quasi_macros.cpp +++ b/src/ast/macros/quasi_macros.cpp @@ -89,7 +89,7 @@ public: void operator()(quantifier * n) {} void operator()(app * n) {} bool all_used() { - for (unsigned i = 0; i < m_bitset.size() ; i++) + for (unsigned i = 0; i < m_bitset.size() ; ++i) if (!m_bitset.get(i)) return false; return true; @@ -111,7 +111,7 @@ bool quasi_macros::fully_depends_on(app * a, quantifier * q) const { if (is_var(arg)) bitset.set(to_var(arg)->get_idx(), true); - for (unsigned i = 0; i < bitset.size() ; i++) + for (unsigned i = 0; i < bitset.size() ; ++i) if (!bitset.get(i)) return false; @@ -249,7 +249,7 @@ bool quasi_macros::quasi_macro_to_macro(quantifier * q, app * a, expr * t, quant } // We want to keep all the old variables [already reversed] - for (unsigned i = 0 ; i < q->get_num_decls() ; i++) { + for (unsigned i = 0 ; i < q->get_num_decls() ; ++i) { new_var_names_rev.push_back(q->get_decl_name(i)); new_qsorts_rev.push_back(q->get_decl_sort(i)); } @@ -274,14 +274,14 @@ bool quasi_macros::quasi_macro_to_macro(quantifier * q, app * a, expr * t, quant bool quasi_macros::find_macros(unsigned n, expr * const * exprs) { TRACE(quasi_macros, tout << "Finding quasi-macros in: " << std::endl; - for (unsigned i = 0 ; i < n ; i++) + for (unsigned i = 0 ; i < n ; ++i) tout << i << ": " << mk_pp(exprs[i], m) << std::endl; ); bool res = false; m_occurrences.reset(); // Find out how many non-ground appearances for each uninterpreted function there are - for (unsigned i = 0 ; i < n ; i++) + for (unsigned i = 0 ; i < n ; ++i) find_occurrences(exprs[i]); TRACE(quasi_macros, @@ -290,7 +290,7 @@ bool quasi_macros::find_macros(unsigned n, expr * const * exprs) { tout << kd.m_key->get_name() << ": " << kd.m_value << std::endl; ); // Find all macros - for (unsigned i = 0 ; i < n ; i++) { + for (unsigned i = 0 ; i < n ; ++i) { app_ref a(m); expr_ref t(m); quantifier_ref macro(m); @@ -312,14 +312,14 @@ bool quasi_macros::find_macros(unsigned n, expr * const * exprs) { bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) { TRACE(quasi_macros, tout << "Finding quasi-macros in: " << std::endl; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) tout << i << ": " << mk_pp(exprs[i].fml(), m) << std::endl; ); bool res = false; m_occurrences.reset(); // Find out how many non-ground appearances for each uninterpreted function there are - for (unsigned i = 0 ; i < n ; i++) + for (unsigned i = 0 ; i < n ; ++i) find_occurrences(exprs[i].fml()); TRACE(quasi_macros, tout << "Occurrences: " << std::endl; @@ -327,7 +327,7 @@ bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) { tout << kv.m_key->get_name() << ": " << kv.m_value << std::endl; ); // Find all macros - for (unsigned i = 0 ; i < n ; i++) { + for (unsigned i = 0 ; i < n ; ++i) { app_ref a(m); expr_ref t(m); quantifier_ref macro(m); @@ -348,7 +348,7 @@ bool quasi_macros::find_macros(unsigned n, justified_expr const * exprs) { void quasi_macros::apply_macros(expr_ref_vector & exprs, proof_ref_vector & prs, expr_dependency_ref_vector& deps) { unsigned n = exprs.size(); - for (unsigned i = 0 ; i < n ; i++ ) { + for (unsigned i = 0 ; i < n ; ++i ) { expr_ref r(m), rr(m); proof_ref pr(m), prr(m); expr_dependency_ref dep(m); @@ -374,7 +374,7 @@ bool quasi_macros::operator()(expr_ref_vector & exprs, proof_ref_vector & prs, e } void quasi_macros::apply_macros(unsigned n, justified_expr const* fmls, vector& new_fmls) { - for (unsigned i = 0 ; i < n ; i++) { + for (unsigned i = 0 ; i < n ; ++i) { expr_ref r(m), rr(m); proof_ref pr(m), prr(m); proof * p = m.proofs_enabled() ? fmls[i].pr() : nullptr; @@ -394,7 +394,7 @@ bool quasi_macros::operator()(unsigned n, justified_expr const* fmls, vector new_args; ptr_buffer domain; - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { sort * s = uv.get(i); if (s) { domain.push_back(s); diff --git a/src/ast/normal_forms/nnf.cpp b/src/ast/normal_forms/nnf.cpp index 746d48fa2..3aa1a919b 100644 --- a/src/ast/normal_forms/nnf.cpp +++ b/src/ast/normal_forms/nnf.cpp @@ -91,7 +91,7 @@ class skolemizer { unsigned sz = m_uv.get_max_found_var_idx_plus_1(); ptr_buffer sorts; expr_ref_vector args(m); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sort * s = m_uv.get(i); if (s != nullptr) { sorts.push_back(s); @@ -114,7 +114,7 @@ class skolemizer { // (VAR 0) is in the first position of substitution. // (VAR num_decls-1) is in the last position. // - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sort * s = m_uv.get(i); if (s != nullptr) substitution.push_back(m.mk_var(i, s)); @@ -272,7 +272,7 @@ struct nnf::imp { m_result_pr_stack(m), m_skolemizer(m) { updt_params(p); - for (unsigned i = 0; i < 4; i++) { + for (unsigned i = 0; i < 4; ++i) { if (proofs_enabled()) m_cache_pr[i] = alloc(act_cache, m); } @@ -283,7 +283,7 @@ struct nnf::imp { bool proofs_enabled() const { return m.proofs_enabled(); } ~imp() { - for (unsigned i = 0; i < 4; i++) { + for (unsigned i = 0; i < 4; ++i) { if (proofs_enabled()) dealloc(m_cache_pr[i]); } @@ -323,7 +323,7 @@ struct nnf::imp { } void reset_cache() { - for (unsigned i = 0; i < 4; i++) { + for (unsigned i = 0; i < 4; ++i) { m_cache[i].reset(); if (proofs_enabled()) m_cache_pr[i]->reset(); @@ -783,7 +783,7 @@ struct nnf::imp { if (is_forall(q) == fr.m_pol) { // collect non sk_hack patterns unsigned num_patterns = q->get_num_patterns(); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { expr * pat = q->get_pattern(i); if (!m_skolemizer.is_sk_hack(pat)) new_patterns.push_back(pat); @@ -899,7 +899,7 @@ struct nnf::imp { unsigned old_sz1 = new_defs.size(); unsigned old_sz2 = new_def_proofs.size(); - for (unsigned i = 0; i < m_todo_defs.size(); i++) { + for (unsigned i = 0; i < m_todo_defs.size(); ++i) { expr_ref dr(m); proof_ref dpr(m); process(m_todo_defs.get(i), dr, dpr); diff --git a/src/ast/normal_forms/pull_quant.cpp b/src/ast/normal_forms/pull_quant.cpp index 9f57f826a..a37580b86 100644 --- a/src/ast/normal_forms/pull_quant.cpp +++ b/src/ast/normal_forms/pull_quant.cpp @@ -62,7 +62,7 @@ struct pull_quant::imp { bool found_quantifier = false; bool forall_children = false; - for (unsigned i = 0; i < num_children; i++) { + for (unsigned i = 0; i < num_children; ++i) { expr * child = children[i]; if (is_quantifier(child) && !is_lambda(child)) { @@ -99,7 +99,7 @@ struct pull_quant::imp { unsigned num_decls = var_sorts.size(); unsigned shift_amount = 0; TRACE(pull_quant, tout << "Result num decls:" << num_decls << "\n";); - for (unsigned i = 0; i < num_children; i++) { + for (unsigned i = 0; i < num_children; ++i) { expr * child = children[i]; if (!is_quantifier(child)) { // increment the free variables in child by num_decls because diff --git a/src/ast/num_occurs.cpp b/src/ast/num_occurs.cpp index 458496da1..af967ac66 100644 --- a/src/ast/num_occurs.cpp +++ b/src/ast/num_occurs.cpp @@ -72,7 +72,7 @@ void num_occurs::operator()(expr * t) { void num_occurs::operator()(unsigned num, expr * const * ts) { expr_fast_mark1 visited; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { process(ts[i], visited); } } diff --git a/src/ast/pattern/pattern_inference.cpp b/src/ast/pattern/pattern_inference.cpp index 0b658b0ad..6d3518de0 100644 --- a/src/ast/pattern/pattern_inference.cpp +++ b/src/ast/pattern/pattern_inference.cpp @@ -56,7 +56,7 @@ bool smaller_pattern::process(expr * p1, expr * p2) { unsigned num1 = app1->get_num_args(); if (num1 != app2->get_num_args() || app1->get_decl() != app2->get_decl()) return false; - for (unsigned i = 0; i < num1; i++) + for (unsigned i = 0; i < num1; ++i) save(app1->get_arg(i), app2->get_arg(i)); break; } @@ -84,7 +84,7 @@ bool smaller_pattern::process(expr * p1, expr * p2) { bool smaller_pattern::operator()(unsigned num_bindings, expr * p1, expr * p2) { m_bindings.resize(num_bindings); - for (unsigned i = 0; i < num_bindings; i++) + for (unsigned i = 0; i < num_bindings; ++i) m_bindings[i] = 0; return process(p1, p2); } @@ -212,7 +212,7 @@ void pattern_inference_cfg::collect::save_candidate(expr * n, unsigned delta) { uint_set free_vars; unsigned size = 1; unsigned num = c->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * child = c->get_arg(i); info * child_info = nullptr; #ifdef Z3DEBUG @@ -269,7 +269,7 @@ void pattern_inference_cfg::collect::reset() { } void pattern_inference_cfg::add_candidate(app * n, uint_set const & free_vars, unsigned size) { - for (unsigned i = 0; i < m_num_no_patterns; i++) { + for (unsigned i = 0; i < m_num_no_patterns; ++i) { if (n == m_no_patterns[i]) return; } @@ -287,14 +287,14 @@ void pattern_inference_cfg::add_candidate(app * n, uint_set const & free_vars, u */ void pattern_inference_cfg::filter_looping_patterns(ptr_vector & result) { unsigned num = m_candidates.size(); - for (unsigned i1 = 0; i1 < num; i1++) { + for (unsigned i1 = 0; i1 < num; ++i1) { app * n1 = m_candidates.get(i1); expr2info::obj_map_entry * e1 = m_candidates_info.find_core(n1); SASSERT(e1); uint_set const & s1 = e1->get_data().m_value.m_free_vars; if (m_block_loop_patterns) { bool smaller = false; - for (unsigned i2 = 0; i2 < num; i2++) { + for (unsigned i2 = 0; i2 < num; ++i2) { if (i1 != i2) { app * n2 = m_candidates.get(i2); expr2info::obj_map_entry * e2 = m_candidates_info.find_core(n2); @@ -358,7 +358,7 @@ bool pattern_inference_cfg::contains_subpattern::operator()(expr * n) { } } num = to_app(curr)->get_num_args(); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) save(to_app(curr)->get_arg(i)); break; case AST_VAR: @@ -481,7 +481,7 @@ void pattern_inference_cfg::candidates2multi_patterns(unsigned max_num_patterns, m_pre_patterns.push_back(alloc(pre_pattern)); unsigned sz = candidate_patterns.size(); unsigned num_splits = 0; - for (unsigned j = 0; j < m_pre_patterns.size(); j++) { + for (unsigned j = 0; j < m_pre_patterns.size(); ++j) { pre_pattern * curr = m_pre_patterns[j]; if (curr->m_free_vars.num_elems() == m_num_bindings) { app * new_pattern = m.mk_pattern(curr->m_exprs.size(), curr->m_exprs.data()); @@ -574,7 +574,7 @@ void pattern_inference_cfg::mk_patterns(unsigned num_bindings, tout << mk_pp(n, m); tout << "\ncandidates:\n"; unsigned num = m_candidates.size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { tout << mk_pp(m_candidates.get(i), m) << "\n"; }); @@ -637,7 +637,7 @@ bool pattern_inference_cfg::reduce_quantifier( m_database.initialize(g_pattern_database); unsigned new_weight; if (m_database.match_quantifier(q, new_patterns, new_weight)) { - DEBUG_CODE(for (unsigned i = 0; i < new_patterns.size(); i++) { SASSERT(is_well_sorted(m, new_patterns.get(i))); }); + DEBUG_CODE(for (unsigned i = 0; i < new_patterns.size(); ++i) { SASSERT(is_well_sorted(m, new_patterns.get(i))); }); if (q->get_num_patterns() > 0) { // just update the weight... TRACE(pattern_inference, tout << "updating weight to: " << new_weight << "\n" << mk_pp(q, m) << "\n";); @@ -760,7 +760,7 @@ bool pattern_inference_cfg::reduce_quantifier( IF_VERBOSE(10, verbose_stream() << "(smt.inferred-patterns :qid " << q->get_qid() << "\n"; - for (unsigned i = 0; i < new_patterns.size(); i++) + for (unsigned i = 0; i < new_patterns.size(); ++i) verbose_stream() << " " << mk_ismt2_pp(new_patterns[i], m, 2) << "\n"; verbose_stream() << ")\n"; ); diff --git a/src/ast/pattern/pattern_inference.h b/src/ast/pattern/pattern_inference.h index d35aa3d28..d548acf3b 100644 --- a/src/ast/pattern/pattern_inference.h +++ b/src/ast/pattern/pattern_inference.h @@ -239,7 +239,7 @@ public: expr_ref & result, proof_ref & result_pr); - void register_preferred(unsigned num, func_decl * const * fs) { for (unsigned i = 0; i < num; i++) register_preferred(fs[i]); } + void register_preferred(unsigned num, func_decl * const * fs) { for (unsigned i = 0; i < num; ++i) register_preferred(fs[i]); } bool is_forbidden(func_decl const * decl) const { family_id fid = decl->get_family_id(); diff --git a/src/ast/pp.cpp b/src/ast/pp.cpp index 4d08b4286..9c4c10c69 100644 --- a/src/ast/pp.cpp +++ b/src/ast/pp.cpp @@ -33,7 +33,7 @@ static std::pair space_upto_line_break(ast_manager & m, format * return space_upto_line_break(m, to_app(f->get_arg(0))); case OP_COMPOSE: r = 0; - for (unsigned i = 0; i < f->get_num_args(); i++) { + for (unsigned i = 0; i < f->get_num_args(); ++i) { std::pair pair = space_upto_line_break(m, to_app(f->get_arg(i))); r += pair.first; if (pair.second) @@ -122,7 +122,7 @@ void pp(std::ostream & out, format * f, ast_manager & m, params_ref const & _p) line++; if (line < max_num_lines) { out << "\n"; - for (unsigned i = 0; i < indent; i++) + for (unsigned i = 0; i < indent; ++i) out << " "; } else diff --git a/src/ast/proofs/proof_checker.cpp b/src/ast/proofs/proof_checker.cpp index cc29defbb..48aa7586b 100644 --- a/src/ast/proofs/proof_checker.cpp +++ b/src/ast/proofs/proof_checker.cpp @@ -577,7 +577,7 @@ bool proof_checker::check1_basic(proof* p, expr_ref_vector& side_conditions) { if (!found) { TRACE(pr_unit_bug, tout << "Parents:\n"; - for (unsigned i = 0; i < proofs.size(); i++) { + for (unsigned i = 0; i < proofs.size(); ++i) { expr* p = nullptr; match_fact(proofs.get(i), p); tout << mk_pp(p, m) << "\n"; @@ -1236,7 +1236,7 @@ void proof_checker::dump_proof(proof const* pr) { expr * consequent = m.get_fact(pr); unsigned num = m.get_num_parents(pr); ptr_buffer antecedents; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { proof * a = m.get_parent(pr, i); SASSERT(m.has_fact(a)); antecedents.push_back(m.get_fact(a)); @@ -1252,7 +1252,7 @@ void proof_checker::dump_proof(unsigned num_antecedents, expr * const * antecede pp.set_benchmark_name("lemma"); pp.set_status("unsat"); pp.set_logic(symbol(m_logic.c_str())); - for (unsigned i = 0; i < num_antecedents; i++) + for (unsigned i = 0; i < num_antecedents; ++i) pp.add_assumption(antecedents[i]); expr_ref n(m); n = m.mk_not(consequent); @@ -1389,7 +1389,7 @@ bool proof_checker::check_arith_proof(proof* p) { } unsigned num_parents = m.get_num_parents(p); - for (unsigned i = 0; i < num_parents; i++) { + for (unsigned i = 0; i < num_parents; ++i) { proof * a = m.get_parent(p, i); SASSERT(m.has_fact(a)); if (!check_arith_literal(true, to_app(m.get_fact(a)), coeffs[offset++], sum, is_strict)) { @@ -1397,7 +1397,7 @@ bool proof_checker::check_arith_proof(proof* p) { } } TRACE(proof_checker, - for (unsigned i = 0; i < num_parents; i++) + for (unsigned i = 0; i < num_parents; ++i) tout << coeffs[i] << " * " << mk_bounded_pp(m.get_fact(m.get_parent(p, i)), m) << "\n"; tout << "fact:" << mk_bounded_pp(fact, m) << "\n";); diff --git a/src/ast/recurse_expr_def.h b/src/ast/recurse_expr_def.h index 8c5ebac87..9ac11015d 100644 --- a/src/ast/recurse_expr_def.h +++ b/src/ast/recurse_expr_def.h @@ -35,16 +35,16 @@ bool recurse_expr::visit_children(e switch (n->get_kind()) { case AST_APP: num = to_app(n)->get_num_args(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) visit(to_app(n)->get_arg(j), visited); break; case AST_QUANTIFIER: if (!IgnorePatterns) { num = to_quantifier(n)->get_num_patterns(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) visit(to_quantifier(n)->get_pattern(j), visited); num = to_quantifier(n)->get_num_no_patterns(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) visit(to_quantifier(n)->get_no_pattern(j), visited); } visit(to_quantifier(n)->get_expr(), visited); @@ -62,7 +62,7 @@ void recurse_expr::process(expr * n case AST_APP: m_results1.reset(); num = to_app(n)->get_num_args(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) m_results1.push_back(get_cached(to_app(n)->get_arg(j))); cache_result(n, this->Visitor::visit(to_app(n), m_results1.data())); break; @@ -77,10 +77,10 @@ void recurse_expr::process(expr * n m_results1.reset(); m_results2.reset(); num = to_quantifier(n)->get_num_patterns(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) m_results1.push_back(get_cached(to_quantifier(n)->get_pattern(j))); num = to_quantifier(n)->get_num_no_patterns(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) m_results2.push_back(get_cached(to_quantifier(n)->get_no_pattern(j))); cache_result(n, this->Visitor::visit(to_quantifier(n), get_cached(to_quantifier(n)->get_expr()), m_results1.data(), m_results2.data())); } diff --git a/src/ast/rewriter/arith_rewriter.cpp b/src/ast/rewriter/arith_rewriter.cpp index ab9ac1597..f5d25b8c3 100644 --- a/src/ast/rewriter/arith_rewriter.cpp +++ b/src/ast/rewriter/arith_rewriter.cpp @@ -110,7 +110,7 @@ void arith_rewriter::get_coeffs_gcd(expr * t, numeral & g, bool & first, unsigne expr * const * ms = get_monomials(t, sz); SASSERT(sz >= 1); numeral a; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = ms[i]; if (is_numeral(arg, a)) { if (!a.is_zero()) @@ -139,7 +139,7 @@ bool arith_rewriter::div_polynomial(expr * t, numeral const & g, const_treatment expr * const * ms = get_monomials(t, sz); expr_ref_buffer new_args(m); numeral a; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = ms[i]; if (is_numeral(arg, a)) { a /= g; @@ -406,7 +406,7 @@ bool arith_rewriter::elim_to_real_mon(expr * monomial, expr_ref & new_monomial) expr_ref_buffer new_vars(m); expr_ref new_var(m); unsigned num = to_app(monomial)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (!elim_to_real_var(to_app(monomial)->get_arg(i), new_var)) return false; new_vars.push_back(new_var); @@ -453,7 +453,7 @@ bool arith_rewriter::is_reduce_power_target(expr * arg, bool is_eq) { sz = 1; args = &arg; } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = args[i]; expr* arg0, *arg1; if (m_util.is_power(arg, arg0, arg1)) { @@ -480,7 +480,7 @@ expr * arith_rewriter::reduce_power(expr * arg, bool is_eq) { } ptr_buffer new_args; rational k; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = args[i]; expr * arg0, *arg1; if (m_util.is_power(arg, arg0, arg1) && m_util.is_numeral(arg1, k) && k.is_int() && @@ -941,7 +941,7 @@ bool arith_rewriter::is_anum_simp_target(unsigned num_args, expr * const * args) return false; unsigned num_irrat = 0; unsigned num_rat = 0; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (m_util.is_numeral(args[i])) { num_rat++; if (num_irrat > 0) @@ -1746,7 +1746,7 @@ br_status arith_rewriter::mk_power_core(expr * arg1, expr * arg2, expr_ref & res is_num_y && y.is_unsigned() && 1 < y.get_unsigned() && y.get_unsigned() <= m_max_degree) { ptr_buffer args; unsigned k = y.get_unsigned(); - for (unsigned i = 0; i < k; i++) { + for (unsigned i = 0; i < k; ++i) { args.push_back(arg1); } result = ensure_real(m_util.mk_mul(args.size(), args.data())); diff --git a/src/ast/rewriter/array_rewriter.cpp b/src/ast/rewriter/array_rewriter.cpp index c6197fdd2..67f969197 100644 --- a/src/ast/rewriter/array_rewriter.cpp +++ b/src/ast/rewriter/array_rewriter.cpp @@ -128,7 +128,7 @@ br_status array_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * c // l_false -- at least one disequal // l_undef -- don't know lbool array_rewriter::compare_args(unsigned num_args, expr * const * args1, expr * const * args2) { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (args1[i] == args2[i]) continue; if (m().are_distinct(args1[i], args2[i])) @@ -367,7 +367,7 @@ br_status array_rewriter::mk_select_core(unsigned num_args, expr * const * args, expr * v = to_app(args[0])->get_arg(num_args); ptr_buffer eqs; unsigned num_indices = num_args-1; - for (unsigned i = 0; i < num_indices; i++) { + for (unsigned i = 0; i < num_indices; ++i) { eqs.push_back(m().mk_eq(to_app(args[0])->get_arg(i+1), args[i+1])); } if (num_indices == 1) { @@ -411,7 +411,7 @@ br_status array_rewriter::mk_map_core(func_decl * f, unsigned num_args, expr * c app* store_expr = nullptr; unsigned num_indices = 0; bool same_store = true; - for (unsigned i = 0; same_store && i < num_args; i++) { + for (unsigned i = 0; same_store && i < num_args; ++i) { expr* a = args[i]; if (m_util.is_const(a)) { continue; @@ -424,7 +424,7 @@ br_status array_rewriter::mk_map_core(func_decl * f, unsigned num_args, expr * c store_expr = to_app(a); } else { - for (unsigned j = 1; same_store && j < num_indices + 1; j++) { + for (unsigned j = 1; same_store && j < num_indices + 1; ++j) { same_store = (store_expr->get_arg(j) == to_app(a)->get_arg(j)); } } @@ -436,7 +436,7 @@ br_status array_rewriter::mk_map_core(func_decl * f, unsigned num_args, expr * c if (same_store) { ptr_buffer arrays; ptr_buffer values; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr* a = args[i]; if (m_util.is_const(a)) { arrays.push_back(a); diff --git a/src/ast/rewriter/ast_counter.cpp b/src/ast/rewriter/ast_counter.cpp index 0e89f8228..17ac30b60 100644 --- a/src/ast/rewriter/ast_counter.cpp +++ b/src/ast/rewriter/ast_counter.cpp @@ -29,7 +29,7 @@ int & counter::get(unsigned el) { } counter & counter::count(unsigned sz, const unsigned * els, int delta) { - for(unsigned i = 0; i < sz; i++) { + for(unsigned i = 0; i < sz; ++i) { update(els[i], delta); } return *this; @@ -77,7 +77,7 @@ int counter::get_max_counter_value() const { void var_counter::count_vars(const app * pred, int coef) { unsigned n = pred->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { m_fv(pred->get_arg(i)); for (unsigned j = 0; j < m_fv.size(); ++j) { if (m_fv[j]) { diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp index 0392c25f3..b9d885e01 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp +++ b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp @@ -152,7 +152,7 @@ struct blaster_rewriter_cfg : public default_rewriter_cfg { } else { unsigned bv_size = butil().get_bv_size(t); - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { parameter p(i); out_bits.push_back(m().mk_app(butil().get_family_id(), OP_BIT2BOOL, 1, &p, 1, &t)); } @@ -226,7 +226,7 @@ struct blaster_rewriter_cfg : public default_rewriter_cfg { unsigned bv_size = butil().get_bv_size(s); sort * b = m().mk_bool_sort(); m_out.reset(); - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { m_out.push_back(m().mk_fresh_const(nullptr, b)); m_newbits.push_back(to_app(m_out.back())->get_decl()); } @@ -277,7 +277,7 @@ void OP(unsigned num_args, expr * const * args, expr_ref & result) { \ SASSERT(num_args > 0); \ result = args[0]; \ expr_ref new_result(m_manager); \ - for (unsigned i = 1; i < num_args; i++) { \ + for (unsigned i = 1; i < num_args; ++i) { \ BIN_OP(result.get(), args[i], new_result); \ result = new_result; \ } \ @@ -369,7 +369,7 @@ MK_PARAMETRIC_UNARY_REDUCE(reduce_sign_extend, mk_sign_extend); void blast_bv_term(expr * t, expr_ref & result, proof_ref & result_pr) { ptr_buffer bits; unsigned bv_size = butil().get_bv_size(t); - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { parameter p(i); bits.push_back(m().mk_app(butil().get_family_id(), OP_BIT2BOOL, 1, &p, 1, &t)); } @@ -553,7 +553,7 @@ MK_PARAMETRIC_UNARY_REDUCE(reduce_sign_extend, mk_sign_extend); return BR_FAILED; default: TRACE(bit_blaster, tout << "non-supported operator: " << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << std::endl;); + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << std::endl;); { expr_ref r(m().mk_app(f, num, args), m()); result = r; @@ -588,7 +588,7 @@ MK_PARAMETRIC_UNARY_REDUCE(reduce_sign_extend, mk_sign_extend); if (butil().is_bv_sort(s)) { unsigned bv_size = butil().get_bv_size(s); new_args.reset(); - for (unsigned k = 0; k < bv_size; k++) { + for (unsigned k = 0; k < bv_size; ++k) { new_args.push_back(m().mk_var(j, m().mk_bool_sort())); j++; } @@ -660,12 +660,12 @@ MK_PARAMETRIC_UNARY_REDUCE(reduce_sign_extend, mk_sign_extend); string_buffer<> name_buffer; ptr_buffer new_decl_sorts; sbuffer new_decl_names; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { symbol const & n = old_q->get_decl_name(i); sort * s = old_q->get_decl_sort(i); if (butil().is_bv_sort(s)) { unsigned bv_size = butil().get_bv_size(s); - for (unsigned j = 0; j < bv_size; j++) { + for (unsigned j = 0; j < bv_size; ++j) { name_buffer.reset(); name_buffer << n << "." << j; new_decl_names.push_back(symbol(name_buffer.c_str())); diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h index 5baef579f..342ff5ed8 100644 --- a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h +++ b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h @@ -38,7 +38,7 @@ void bit_blaster_tpl::checkpoint() { */ template bool bit_blaster_tpl::is_numeral(unsigned sz, expr * const * bits) const { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (!is_bool_const(bits[i])) return false; return true; @@ -51,7 +51,7 @@ bool bit_blaster_tpl::is_numeral(unsigned sz, expr * const * bits) const { template bool bit_blaster_tpl::is_numeral(unsigned sz, expr * const * bits, numeral & r) const { r.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m().is_true(bits[i])) r += power(i); else if (!m().is_false(bits[i])) @@ -65,7 +65,7 @@ bool bit_blaster_tpl::is_numeral(unsigned sz, expr * const * bits, numeral */ template bool bit_blaster_tpl::is_minus_one(unsigned sz, expr * const * bits) const { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (!m().is_true(bits[i])) return false; return true; @@ -76,7 +76,7 @@ static void _num2bits(ast_manager & m, rational const & v, unsigned sz, expr_ref SASSERT(v.is_nonneg()); rational aux = v; rational two(2), base32(1ull << 32ull, rational::ui64()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i + 32 < sz) { unsigned u = (aux % base32).get_unsigned(); for (unsigned j = 0; j < 32; ++j) { @@ -122,7 +122,7 @@ void bit_blaster_tpl::mk_neg(unsigned sz, expr * const * a_bits, expr_ref_v SASSERT(sz > 0); expr_ref cin(m()), cout(m()), out(m()); cin = m().mk_true(); - for (unsigned idx = 0; idx < sz; idx++) { + for (unsigned idx = 0; idx < sz; ++idx) { expr_ref not_a(m()); mk_not(a_bits[idx], not_a); if (idx < sz - 1) @@ -139,7 +139,7 @@ void bit_blaster_tpl::mk_adder(unsigned sz, expr * const * a_bits, expr * c SASSERT(sz > 0); expr_ref cin(m()), cout(m()), out(m()); cin = m().mk_false(); - for (unsigned idx = 0; idx < sz; idx++) { + for (unsigned idx = 0; idx < sz; ++idx) { if (idx < sz - 1) mk_full_adder(a_bits[idx], b_bits[idx], cin, out, cout); else @@ -160,7 +160,7 @@ void bit_blaster_tpl::mk_subtracter(unsigned sz, expr * const * a_bits, exp SASSERT(sz > 0); expr_ref cin(m()), out(m()); cin = m().mk_true(); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { expr_ref not_b(m()); mk_not(b_bits[j], not_b); mk_full_adder(a_bits[j], not_b, cin, out, cout); @@ -237,7 +237,7 @@ void bit_blaster_tpl::mk_multiplier(unsigned sz, expr * const * a_bits, exp FA denotes a full-adder. */ - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { checkpoint(); couts.reset(); expr_ref i1(m()), i2(m()); @@ -246,7 +246,7 @@ void bit_blaster_tpl::mk_multiplier(unsigned sz, expr * const * a_bits, exp if (i < sz - 1) { mk_half_adder(i1, i2, out, cout); couts.push_back(cout); - for (unsigned j = 2; j <= i; j++) { + for (unsigned j = 2; j <= i; ++j) { expr_ref prev_out(m()); prev_out = out; expr_ref i3(m()); @@ -260,7 +260,7 @@ void bit_blaster_tpl::mk_multiplier(unsigned sz, expr * const * a_bits, exp else { // last step --> I don't need to generate/store couts. mk_xor(i1, i2, out); - for (unsigned j = 2; j <= i; j++) { + for (unsigned j = 2; j <= i; ++j) { expr_ref i3(m()); mk_and(a_bits[j], b_bits[i - j], i3); mk_xor3(i3, out, cins.get(j - 2), out); @@ -390,12 +390,12 @@ void bit_blaster_tpl::mk_udiv_urem(unsigned sz, expr * const * a_bits, expr // init p p.push_back(a_bits[sz-1]); - for (unsigned i = 1; i < sz; i++) + for (unsigned i = 1; i < sz; ++i) p.push_back(m().mk_false()); q_bits.resize(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); // generate p - b expr_ref q(m()); @@ -414,7 +414,7 @@ void bit_blaster_tpl::mk_udiv_urem(unsigned sz, expr * const * a_bits, expr } else { // last step: p contains the remainder - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { expr_ref ie(m()); mk_ite(q, t.get(j), p.get(j), ie); p.set(j, ie); @@ -422,7 +422,7 @@ void bit_blaster_tpl::mk_udiv_urem(unsigned sz, expr * const * a_bits, expr } } DEBUG_CODE({ - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(q_bits.get(i) != 0); }}); TRACE(bit_blaster, @@ -452,7 +452,7 @@ void bit_blaster_tpl::mk_urem(unsigned sz, expr * const * a_bits, expr * co template void bit_blaster_tpl::mk_multiplexer(expr * c, unsigned sz, expr * const * t_bits, expr * const * e_bits, expr_ref_vector & out_bits) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr_ref t(m()); mk_ite(c, t_bits[i], e_bits[i], t); out_bits.push_back(t); @@ -768,7 +768,7 @@ void bit_blaster_tpl::mk_smod(unsigned sz, expr * const * a_bits, expr * co template void bit_blaster_tpl::mk_eq(unsigned sz, expr * const * a_bits, expr * const * b_bits, expr_ref & out) { expr_ref_vector out_bits(m()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mk_iff(a_bits[i], b_bits[i], out); out_bits.push_back(out); } @@ -784,9 +784,9 @@ void bit_blaster_tpl::mk_rotate_left(unsigned sz, expr * const * a_bits, un tout << "\n"; ); n = n % sz; - for (unsigned i = sz - n; i < sz; i++) + for (unsigned i = sz - n; i < sz; ++i) out_bits.push_back(a_bits[i]); - for (unsigned i = 0 ; i < sz - n; i++) + for (unsigned i = 0 ; i < sz - n; ++i) out_bits.push_back(a_bits[i]); } @@ -798,19 +798,19 @@ void bit_blaster_tpl::mk_rotate_right(unsigned sz, expr * const * a_bits, u template void bit_blaster_tpl::mk_sign_extend(unsigned sz, expr * const * a_bits, unsigned n, expr_ref_vector & out_bits) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) out_bits.push_back(a_bits[i]); expr * high_bit = a_bits[sz - 1]; - for (unsigned i = sz; i < sz + n; i++) + for (unsigned i = sz; i < sz + n; ++i) out_bits.push_back(high_bit); } template void bit_blaster_tpl::mk_zero_extend(unsigned sz, expr * const * a_bits, unsigned n, expr_ref_vector & out_bits) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) out_bits.push_back(a_bits[i]); expr * high_bit = m().mk_false(); - for (unsigned i = sz; i < sz + n; i++) + for (unsigned i = sz; i < sz + n; ++i) out_bits.push_back(high_bit); } @@ -821,7 +821,7 @@ template void bit_blaster_tpl::mk_is_eq(unsigned sz, expr * const * a_bits, unsigned n, expr_ref & out) { numeral two(2); expr_ref_vector out_bits(m()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (n % 2 == 0) { expr_ref not_a(m()); mk_not(a_bits[i], not_a); @@ -840,7 +840,7 @@ void bit_blaster_tpl::mk_is_eq(unsigned sz, expr * const * a_bits, unsigned */ template void bit_blaster_tpl::mk_eqs(unsigned sz, expr * const * a_bits, expr_ref_vector & eqs) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr_ref eq(m()); mk_is_eq(sz, a_bits, i, eq); eqs.push_back(eq); @@ -855,9 +855,9 @@ void bit_blaster_tpl::mk_shl(unsigned sz, expr * const * a_bits, expr * con unsigned n = static_cast(k.get_int64()); if (n >= sz) n = sz; unsigned pos; - for (pos = 0; pos < n; pos++) + for (pos = 0; pos < n; ++pos) out_bits.push_back(m().mk_false()); - for (unsigned i = 0; pos < sz; pos++, i++) + for (unsigned i = 0; pos < sz; ++pos, ++i) out_bits.push_back(a_bits[i]); } else { @@ -900,9 +900,9 @@ void bit_blaster_tpl::mk_lshr(unsigned sz, expr * const * a_bits, expr * co if (k > numeral(sz)) k = numeral(sz); unsigned n = static_cast(k.get_int64()); unsigned pos = 0; - for (unsigned i = n; i < sz; pos++, i++) + for (unsigned i = n; i < sz; ++pos, ++i) out_bits.push_back(a_bits[i]); - for (; pos < sz; pos++) + for (; pos < sz; ++pos) out_bits.push_back(m().mk_false()); } else { @@ -943,9 +943,9 @@ void bit_blaster_tpl::mk_ashr(unsigned sz, expr * const * a_bits, expr * co if (k > numeral(sz)) k = numeral(sz); unsigned n = static_cast(k.get_int64()); unsigned pos = 0; - for (unsigned i = n; i < sz; pos++, i++) + for (unsigned i = n; i < sz; ++pos, ++i) out_bits.push_back(a_bits[i]); - for (; pos < sz; pos++) + for (; pos < sz; ++pos) out_bits.push_back(a_bits[sz-1]); } else { @@ -1034,7 +1034,7 @@ void bit_blaster_tpl::mk_le(unsigned sz, expr * const * a_bits, expr * cons expr_ref not_a(m()); mk_not(a_bits[0], not_a); mk_or(not_a, b_bits[0], out); - for (unsigned idx = 1; idx < (Signed ? sz - 1 : sz); idx++) { + for (unsigned idx = 1; idx < (Signed ? sz - 1 : sz); ++idx) { mk_not(a_bits[idx], not_a); mk_ge2(not_a, b_bits[idx], out, out); } @@ -1057,7 +1057,7 @@ void bit_blaster_tpl::mk_ule(unsigned sz, expr * const * a_bits, expr * con template void bit_blaster_tpl::mk_not(unsigned sz, expr * const * a_bits, expr_ref_vector & out_bits) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr_ref t(m()); mk_not(a_bits[i], t); out_bits.push_back(t); @@ -1067,7 +1067,7 @@ void bit_blaster_tpl::mk_not(unsigned sz, expr * const * a_bits, expr_ref_v #define MK_BINARY(NAME, OP) \ template \ void bit_blaster_tpl::NAME(unsigned sz, expr * const * a_bits, expr * const * b_bits, expr_ref_vector & out_bits) { \ - for (unsigned i = 0; i < sz; i++) { \ + for (unsigned i = 0; i < sz; ++i) { \ expr_ref t(m()); \ OP(a_bits[i], b_bits[i], t); \ out_bits.push_back(t); \ @@ -1105,7 +1105,7 @@ void bit_blaster_tpl::mk_comp(unsigned sz, expr * const * a_bits, expr * co template void bit_blaster_tpl::mk_carry_save_adder(unsigned sz, expr * const * a_bits, expr * const * b_bits, expr * const * c_bits, expr_ref_vector & sum_bits, expr_ref_vector & carry_bits) { expr_ref t(m()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mk_xor3(a_bits[i], b_bits[i], c_bits[i], t); sum_bits.push_back(t); mk_carry(a_bits[i], b_bits[i], c_bits[i], t); diff --git a/src/ast/rewriter/bool_rewriter.cpp b/src/ast/rewriter/bool_rewriter.cpp index ed75a8a61..321bd6f47 100644 --- a/src/ast/rewriter/bool_rewriter.cpp +++ b/src/ast/rewriter/bool_rewriter.cpp @@ -76,7 +76,7 @@ br_status bool_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * co void bool_rewriter::mk_and_as_or(unsigned num_args, expr * const * args, expr_ref & result) { expr_ref_buffer new_args(m()); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr_ref tmp(m()); mk_not(args[i], tmp); new_args.push_back(tmp); @@ -93,7 +93,7 @@ br_status bool_rewriter::mk_nflat_and_core(unsigned num_args, expr * const * arg expr_fast_mark2 pos_lits; expr* atom = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (m().is_true(arg)) { s = true; @@ -156,7 +156,7 @@ br_status bool_rewriter::mk_nflat_and_core(unsigned num_args, expr * const * arg br_status bool_rewriter::mk_flat_and_core(unsigned num_args, expr * const * args, expr_ref & result) { unsigned i; - for (i = 0; i < num_args; i++) { + for (i = 0; i < num_args; ++i) { if (m().is_and(args[i])) break; } @@ -164,7 +164,7 @@ br_status bool_rewriter::mk_flat_and_core(unsigned num_args, expr * const * args // has nested ANDs ptr_buffer flat_args; flat_args.append(i, args); - for (; i < num_args; i++) { + for (; i < num_args; ++i) { expr * arg = args[i]; // Remark: all rewrites are depth 1. if (m().is_and(arg)) { @@ -188,7 +188,7 @@ br_status bool_rewriter::mk_nflat_or_core(unsigned num_args, expr * const * args expr_fast_mark1 neg_lits; expr_fast_mark2 pos_lits; expr* prev = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (m().is_true(arg)) { neg_lits.reset(); @@ -284,7 +284,7 @@ br_status bool_rewriter::mk_nflat_or_core(unsigned num_args, expr * const * args br_status bool_rewriter::mk_flat_or_core(unsigned num_args, expr * const * args, expr_ref & result) { unsigned i; - for (i = 0; i < num_args; i++) { + for (i = 0; i < num_args; ++i) { if (m().is_or(args[i])) break; } @@ -294,7 +294,7 @@ br_status bool_rewriter::mk_flat_or_core(unsigned num_args, expr * const * args, // has nested ORs ptr_buffer flat_args; flat_args.append(i, args); - for (; i < num_args; i++) { + for (; i < num_args; ++i) { expr * arg = args[i]; // Remark: all rewrites are depth 1. if (m().is_or(arg)) { @@ -339,7 +339,7 @@ bool bool_rewriter::simp_nested_not_or(unsigned num_args, expr * const * args, ptr_buffer new_args; bool simp = false; m_local_ctx_cost += num_args; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (neg_lits.is_marked(arg)) { result = m().mk_false(); @@ -590,7 +590,7 @@ bool bool_rewriter::local_ctx_simp(unsigned num_args, expr * const * args, expr_ #endif if (forward) { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { PROCESS_ARG(); } forward = false; @@ -868,7 +868,7 @@ br_status bool_rewriter::mk_distinct_core(unsigned num_args, expr * const * args expr_fast_mark1 visited; bool all_value = true, all_diff = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (visited.is_marked(arg)) { result = m().mk_false(); @@ -902,8 +902,8 @@ br_status bool_rewriter::mk_distinct_core(unsigned num_args, expr * const * args if (m_blast_distinct && num_args < m_blast_distinct_threshold) { expr_ref_vector new_diseqs(m()); - for (unsigned i = 0; i < num_args; i++) { - for (unsigned j = i + 1; j < num_args; j++) + for (unsigned i = 0; i < num_args; ++i) { + for (unsigned j = i + 1; j < num_args; ++j) new_diseqs.push_back(m().mk_not(m().mk_eq(args[i], args[j]))); } result = m().mk_and(new_diseqs); diff --git a/src/ast/rewriter/bv_elim.cpp b/src/ast/rewriter/bv_elim.cpp index 811e3ab6b..6bd77f471 100644 --- a/src/ast/rewriter/bv_elim.cpp +++ b/src/ast/rewriter/bv_elim.cpp @@ -89,10 +89,10 @@ bool bv_elim_cfg::reduce_quantifier(quantifier * q, new_body = subst(old_body, sub_size, sub); - for (unsigned j = 0; j < q->get_num_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_patterns(); ++j) { pats.push_back(subst(new_patterns[j], sub_size, sub)); } - for (unsigned j = 0; j < q->get_num_no_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_no_patterns(); ++j) { no_pats.push_back(subst(new_no_patterns[j], sub_size, sub)); } diff --git a/src/ast/rewriter/bv_rewriter.cpp b/src/ast/rewriter/bv_rewriter.cpp index 18e82de72..7e03b62d1 100644 --- a/src/ast/rewriter/bv_rewriter.cpp +++ b/src/ast/rewriter/bv_rewriter.cpp @@ -685,7 +685,7 @@ unsigned bv_rewriter::propagate_extract(unsigned high, expr * arg, expr_ref & re numeral val; unsigned curr_first_sz = -1; // calculate how much can be removed - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * const curr = a->get_arg(i); const bool curr_is_conc = m_util.is_concat(curr); if (curr_is_conc && to_app(curr)->get_num_args() == 0) continue; @@ -709,7 +709,7 @@ unsigned bv_rewriter::propagate_extract(unsigned high, expr * arg, expr_ref & re SASSERT(removable <= to_remove); ptr_buffer new_args; ptr_buffer new_concat_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * const curr = a->get_arg(i); const bool curr_is_conc = m_util.is_concat(curr); if (curr_is_conc && to_app(curr)->get_num_args() == 0) continue; @@ -785,7 +785,7 @@ br_status bv_rewriter::mk_extract(unsigned high, unsigned low, expr * arg, expr_ if (m_util.is_concat(arg)) { unsigned num = to_app(arg)->get_num_args(); unsigned idx = sz; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * curr = to_app(arg)->get_arg(i); unsigned curr_sz = get_bv_size(curr); idx -= curr_sz; @@ -814,7 +814,7 @@ br_status bv_rewriter::mk_extract(unsigned high, unsigned low, expr * arg, expr_ used_extract = true; new_args.push_back(m_mk_extract(high - idx, 0, curr)); } - for (unsigned j = i + 1; j < num; j++) { + for (unsigned j = i + 1; j < num; ++j) { curr = to_app(arg)->get_arg(j); unsigned curr_sz = get_bv_size(curr); idx -= curr_sz; @@ -844,7 +844,7 @@ br_status bv_rewriter::mk_extract(unsigned high, unsigned low, expr * arg, expr_ m_util.is_bv_mul(arg)))) { ptr_buffer new_args; unsigned num = to_app(arg)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * curr = to_app(arg)->get_arg(i); new_args.push_back(m_mk_extract(high, low, curr)); } @@ -1095,7 +1095,7 @@ br_status bv_rewriter::mk_bv_ashr(expr * arg1, expr * arg2, expr_ref & result) { SASSERT(r2 <= numeral(bv_size)); unsigned k = r2.get_unsigned(); expr * sign = m_mk_extract(bv_size-1, bv_size-1, arg1); - for (unsigned i = 0; i < k; i++) + for (unsigned i = 0; i < k; ++i) new_args.push_back(sign); if (k != bv_size) new_args.push_back(m_mk_extract(bv_size-1, k, arg1)); @@ -1643,7 +1643,7 @@ br_status bv_rewriter::mk_concat(unsigned num_args, expr * const * args, expr_re bool expanded = false; bool fused_extract = false; bool eq_args = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; expr * prev = nullptr; if (i > 0) { @@ -1741,7 +1741,7 @@ br_status bv_rewriter::mk_sign_extend(unsigned n, expr * arg, expr_ref & result) unsigned sz = get_bv_size(arg); expr * sign = m_mk_extract(sz-1, sz-1, arg); ptr_buffer args; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) args.push_back(sign); args.push_back(arg); result = m_util.mk_concat(args.size(), args.data()); @@ -1757,7 +1757,7 @@ br_status bv_rewriter::mk_repeat(unsigned n, expr * arg, expr_ref & result) { return BR_DONE; } ptr_buffer args; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) args.push_back(arg); result = m_util.mk_concat(args.size(), args.data()); return BR_REWRITE1; @@ -1773,11 +1773,11 @@ br_status bv_rewriter::mk_bv_or(unsigned num, expr * const * args, expr_ref & re bool flattened = false; ptr_buffer flat_args; if (m_flat) { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; if (m_util.is_bv_or(arg)) { unsigned num2 = to_app(arg)->get_num_args(); - for (unsigned j = 0; j < num2; j++) + for (unsigned j = 0; j < num2; ++j) flat_args.push_back(to_app(arg)->get_arg(j)); } else { @@ -1797,7 +1797,7 @@ br_status bv_rewriter::mk_bv_or(unsigned num, expr * const * args, expr_ref & re bool merged = false; unsigned num_coeffs = 0; numeral v1, v2; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; if (is_numeral(arg, v2, sz)) { num_coeffs++; @@ -1846,7 +1846,7 @@ br_status bv_rewriter::mk_bv_or(unsigned num, expr * const * args, expr_ref & re app * concat1 = to_app(new_args[0]); app * concat2 = to_app(new_args[1]); unsigned i = 0; - for (i = 0; i < sz; i++) + for (i = 0; i < sz; ++i) if (!is_zero_bit(concat1, i) && !is_zero_bit(concat2, i)) break; if (i == sz) { @@ -1945,11 +1945,11 @@ br_status bv_rewriter::mk_bv_xor(unsigned num, expr * const * args, expr_ref & r bool flattened = false; ptr_buffer flat_args; if (m_flat) { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; if (m_util.is_bv_xor(arg)) { unsigned num2 = to_app(arg)->get_num_args(); - for (unsigned j = 0; j < num2; j++) + for (unsigned j = 0; j < num2; ++j) flat_args.push_back(to_app(arg)->get_arg(j)); } else { @@ -1968,7 +1968,7 @@ br_status bv_rewriter::mk_bv_xor(unsigned num, expr * const * args, expr_ref & r bool merged = false; numeral v1, v2; unsigned num_coeffs = 0; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; if (is_numeral(arg, v2, sz)) { v1 = bitwise_xor(v1, v2); @@ -2017,7 +2017,7 @@ br_status bv_rewriter::mk_bv_xor(unsigned num, expr * const * args, expr_ref & r if (!v1.is_zero() && num_coeffs == num - 1) { // find argument that is not a numeral expr * t = nullptr; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { t = args[i]; if (!is_numeral(t)) break; @@ -2070,7 +2070,7 @@ br_status bv_rewriter::mk_bv_xor(unsigned num, expr * const * args, expr_ref & r new_args.push_back(c); } - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; if (is_numeral(arg)) continue; @@ -2200,7 +2200,7 @@ br_status bv_rewriter::mk_bv_not(expr * arg, expr_ref & result) { br_status bv_rewriter::mk_bv_and(unsigned num, expr * const * args, expr_ref & result) { ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { new_args.push_back(m_util.mk_bv_not(args[i])); } SASSERT(num == new_args.size()); @@ -2210,7 +2210,7 @@ br_status bv_rewriter::mk_bv_and(unsigned num, expr * const * args, expr_ref & r br_status bv_rewriter::mk_bv_nand(unsigned num, expr * const * args, expr_ref & result) { ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { new_args.push_back(m_util.mk_bv_not(args[i])); } result = m_util.mk_bv_or(new_args.size(), new_args.data()); @@ -2369,7 +2369,7 @@ br_status bv_rewriter::mk_bv_add(unsigned num_args, expr * const * args, expr_re unsigned sz = get_bv_size(x); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!is_zero_bit(x,i) && !is_zero_bit(y,i)) return st; } @@ -2393,9 +2393,9 @@ br_status bv_rewriter::mk_bv_add(unsigned num_args, expr * const * args, expr_re if (_num_args < 2) return st; unsigned sz = get_bv_size(_args[0]); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { bool found_non_zero = false; - for (unsigned j = 0; j < _num_args; j++) { + for (unsigned j = 0; j < _num_args; ++j) { if (!is_zero_bit(_args[j], i)) { // at most one of the arguments may have a non-zero bit. if (found_non_zero) @@ -2616,7 +2616,7 @@ br_status bv_rewriter::mk_blast_eq_value(expr * lhs, expr * rhs, expr_ref & resu numeral two(2); ptr_buffer new_args; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { bool bit0 = (v % two).is_zero(); new_args.push_back(m.mk_eq(m_mk_extract(i,i, lhs), mk_numeral(bit0 ? 0 : 1, 1))); @@ -2979,7 +2979,7 @@ br_status bv_rewriter::mk_eq_core(expr * lhs, expr * rhs, expr_ref & result) { br_status bv_rewriter::mk_mkbv(unsigned num, expr * const * args, expr_ref & result) { if (m_mkbv2num) { unsigned i; - for (i = 0; i < num; i++) + for (i = 0; i < num; ++i) if (!m.is_true(args[i]) && !m.is_false(args[i])) return BR_FAILED; numeral val; diff --git a/src/ast/rewriter/cached_var_subst.cpp b/src/ast/rewriter/cached_var_subst.cpp index 0f731706d..8117caa0a 100644 --- a/src/ast/rewriter/cached_var_subst.cpp +++ b/src/ast/rewriter/cached_var_subst.cpp @@ -24,7 +24,7 @@ bool cached_var_subst::key_eq_proc::operator()(cached_var_subst::key * k1, cache return false; if (k1->m_num_bindings != k2->m_num_bindings) return false; - for (unsigned i = 0; i < k1->m_num_bindings; i++) + for (unsigned i = 0; i < k1->m_num_bindings; ++i) if (k1->m_bindings[i] != k2->m_bindings[i]) return false; return true; @@ -66,7 +66,7 @@ expr_ref cached_var_subst::operator()() { m_new_keys[num_bindings] = m_key; // recycle key result = entry->get_data().m_value; SCTRACE(bindings, is_trace_enabled(TraceTag::coming_from_quant), tout << "(cache)\n"; - for (unsigned i = 0; i < num_bindings; i++) + for (unsigned i = 0; i < num_bindings; ++i) if (m_key->m_bindings[i]) tout << i << ": " << mk_ismt2_pp(m_key->m_bindings[i], result.m()) << ";\n"; tout.flush();); @@ -92,7 +92,7 @@ expr_ref cached_var_subst::operator()() { // increment reference counters m_refs.push_back(m_key->m_qa); - for (unsigned i = 0; i < m_key->m_num_bindings; i++) + for (unsigned i = 0; i < m_key->m_num_bindings; ++i) m_refs.push_back(m_key->m_bindings[i]); m_refs.push_back(result); return result; diff --git a/src/ast/rewriter/der.cpp b/src/ast/rewriter/der.cpp index 25fc295d7..8012f75e3 100644 --- a/src/ast/rewriter/der.cpp +++ b/src/ast/rewriter/der.cpp @@ -198,7 +198,7 @@ void der::reduce1(quantifier * q, expr_ref & r, proof_ref & pr) { m_pos2var.reserve(num_args, -1); // Find all equalities/disequalities - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr* arg = literals.get(i); is_eq = is_forall(q) ? is_var_diseq(arg, num_decls, v, t) : is_var_eq(arg, num_decls, v, t); if (is_eq) { @@ -243,7 +243,7 @@ static void der_sort_vars(ptr_vector & vars, expr_ref_vector & definitions, // eliminate self loops, and definitions containing quantifiers. bool found = false; - for (unsigned i = 0; i < definitions.size(); i++) { + for (unsigned i = 0; i < definitions.size(); ++i) { var * v = vars[i]; expr * t = definitions.get(i); if (t == nullptr || has_quantifiers(t) || occurs(v, t)) @@ -263,7 +263,7 @@ static void der_sort_vars(ptr_vector & vars, expr_ref_vector & definitions, unsigned vidx, num; - for (unsigned i = 0; i < definitions.size(); i++) { + for (unsigned i = 0; i < definitions.size(); ++i) { if (!definitions.get(i)) continue; var * v = vars[i]; @@ -362,7 +362,7 @@ void der::create_substitution(unsigned sz) { m_subst_map.reset(); m_subst_map.resize(sz, nullptr); - for(unsigned i = 0; i < m_order.size(); i++) { + for(unsigned i = 0; i < m_order.size(); ++i) { expr_ref cur(m_map.get(m_order[i]), m); // do all the previous substitutions before inserting @@ -379,7 +379,7 @@ void der::apply_substitution(quantifier * q, expr_ref_vector& literals, bool is_ // get a new expression m_new_args.reset(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { int x = m_pos2var[i]; if (x != -1 && m_map.get(x) != nullptr) continue; // this is a disequality with definition (vanishes) @@ -393,11 +393,11 @@ void der::apply_substitution(quantifier * q, expr_ref_vector& literals, bool is_ // don't forget to update the quantifier patterns expr_ref_buffer new_patterns(m); expr_ref_buffer new_no_patterns(m); - for (unsigned j = 0; j < q->get_num_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_patterns(); ++j) { new_patterns.push_back(m_subst(q->get_pattern(j), m_subst_map.size(), m_subst_map.data())); } - for (unsigned j = 0; j < q->get_num_no_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_no_patterns(); ++j) { new_no_patterns.push_back(m_subst(q->get_no_pattern(j), m_subst_map.size(), m_subst_map.data())); } diff --git a/src/ast/rewriter/distribute_forall.cpp b/src/ast/rewriter/distribute_forall.cpp index b65b3f543..4bce5640c 100644 --- a/src/ast/rewriter/distribute_forall.cpp +++ b/src/ast/rewriter/distribute_forall.cpp @@ -120,7 +120,7 @@ void distribute_forall::reduce1_quantifier(quantifier * q) { app * or_e = to_app(to_app(e)->get_arg(0)); unsigned num_args = or_e->get_num_args(); expr_ref_buffer new_args(m_manager); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = or_e->get_arg(i); expr_ref not_arg(m_manager); br.mk_not(arg, not_arg); diff --git a/src/ast/rewriter/elim_bounds.cpp b/src/ast/rewriter/elim_bounds.cpp index 00c974700..86829280b 100644 --- a/src/ast/rewriter/elim_bounds.cpp +++ b/src/ast/rewriter/elim_bounds.cpp @@ -151,14 +151,14 @@ bool elim_bounds_cfg::reduce_quantifier(quantifier * q, } } } - TRACE(elim_bounds, tout << "candidates:\n"; for (unsigned i = 0; i < candidates.size(); i++) tout << mk_pp(candidates[i], m) << "\n";); + TRACE(elim_bounds, tout << "candidates:\n"; for (unsigned i = 0; i < candidates.size(); ++i) tout << mk_pp(candidates[i], m) << "\n";); // remove candidates that have lower and upper bounds for (var * v : candidates) { if (lowers.contains(v) && uppers.contains(v)) candidate_set.erase(v); } - TRACE(elim_bounds, tout << "candidates after filter:\n"; for (unsigned i = 0; i < candidates.size(); i++) tout << mk_pp(candidates[i], m) << "\n";); + TRACE(elim_bounds, tout << "candidates after filter:\n"; for (unsigned i = 0; i < candidates.size(); ++i) tout << mk_pp(candidates[i], m) << "\n";); if (candidate_set.empty()) { return false; } diff --git a/src/ast/rewriter/inj_axiom.cpp b/src/ast/rewriter/inj_axiom.cpp index a1fdef2f9..a62bd4ada 100644 --- a/src/ast/rewriter/inj_axiom.cpp +++ b/src/ast/rewriter/inj_axiom.cpp @@ -53,7 +53,7 @@ bool simplify_inj_axiom(ast_manager & m, quantifier * q, expr_ref & result) { unsigned num = f1->get_num_args(); unsigned idx = UINT_MAX; unsigned num_vars = 1; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * c1 = f1->get_arg(i); expr * c2 = f2->get_arg(i); if (!is_var(c1) && !is_uninterp_const(c1)) @@ -86,7 +86,7 @@ bool simplify_inj_axiom(ast_manager & m, quantifier * q, expr_ref & result) { buffer names; expr * var = nullptr; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * c = f1->get_arg(i); if (is_var(c)) { names.push_back(symbol(i)); diff --git a/src/ast/rewriter/macro_replacer.cpp b/src/ast/rewriter/macro_replacer.cpp index 1cbcc14c6..b942276f5 100644 --- a/src/ast/rewriter/macro_replacer.cpp +++ b/src/ast/rewriter/macro_replacer.cpp @@ -56,11 +56,11 @@ struct macro_replacer::macro_replacer_cfg : public default_rewriter_cfg { proof_ref& result_pr) { bool erase_patterns = false; - for (unsigned i = 0; !erase_patterns && i < old_q->get_num_patterns(); i++) + for (unsigned i = 0; !erase_patterns && i < old_q->get_num_patterns(); ++i) if (old_q->get_pattern(i) != new_patterns[i]) erase_patterns = true; - for (unsigned i = 0; !erase_patterns && i < old_q->get_num_no_patterns(); i++) + for (unsigned i = 0; !erase_patterns && i < old_q->get_num_no_patterns(); ++i) if (old_q->get_no_pattern(i) != new_no_patterns[i]) erase_patterns = true; @@ -86,7 +86,7 @@ struct macro_replacer::macro_replacer_cfg : public default_rewriter_cfg { unsigned num = head->get_num_args(); ptr_buffer subst_args; subst_args.resize(num, 0); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { var* v = to_var(head->get_arg(i)); VERIFY(v->get_idx() < num); unsigned nidx = num - v->get_idx() - 1; diff --git a/src/ast/rewriter/maximize_ac_sharing.cpp b/src/ast/rewriter/maximize_ac_sharing.cpp index 6749f1c21..e2bd6c314 100644 --- a/src/ast/rewriter/maximize_ac_sharing.cpp +++ b/src/ast/rewriter/maximize_ac_sharing.cpp @@ -38,7 +38,7 @@ br_status maximize_ac_sharing::reduce_app(func_decl * f, unsigned num_args, expr expr * numeral = nullptr; if (is_numeral(args[0])) { numeral = args[0]; - for (unsigned i = 1; i < num_args; i++) + for (unsigned i = 1; i < num_args; ++i) _args.push_back(args[i]); num_args--; } @@ -51,16 +51,16 @@ br_status maximize_ac_sharing::reduce_app(func_decl * f, unsigned num_args, expr #define MAX_NUM_ARGS_FOR_OPT 128 // Try to reuse already created circuits. - TRACE(ac_sharing_detail, tout << "args: "; for (unsigned i = 0; i < num_args; i++) tout << mk_pp(_args[i], m) << "\n";); + TRACE(ac_sharing_detail, tout << "args: "; for (unsigned i = 0; i < num_args; ++i) tout << mk_pp(_args[i], m) << "\n";); try_to_reuse: if (num_args > 1 && num_args < MAX_NUM_ARGS_FOR_OPT) { - for (unsigned i = 0; i + 1 < num_args; i++) { - for (unsigned j = i + 1; j < num_args; j++) { + for (unsigned i = 0; i + 1 < num_args; ++i) { + for (unsigned j = i + 1; j < num_args; ++j) { if (contains(f, _args[i], _args[j])) { TRACE(ac_sharing_detail, tout << "reusing args: " << i << " " << j << "\n";); _args[i] = m.mk_app(f, _args[i], _args[j]); SASSERT(num_args > 1); - for (unsigned w = j; w + 1 < num_args; w++) { + for (unsigned w = j; w + 1 < num_args; ++w) { _args[w] = _args[w+1]; } num_args--; @@ -75,7 +75,7 @@ br_status maximize_ac_sharing::reduce_app(func_decl * f, unsigned num_args, expr while (true) { TRACE(ac_sharing_detail, tout << "tree-loop: num_args: " << num_args << "\n";); unsigned j = 0; - for (unsigned i = 0; i < num_args; i += 2, j++) { + for (unsigned i = 0; i < num_args; i += 2, ++j) { if (i == num_args - 1) { _args[j] = _args[i]; } diff --git a/src/ast/rewriter/poly_rewriter_def.h b/src/ast/rewriter/poly_rewriter_def.h index f0f564816..c70cccf62 100644 --- a/src/ast/rewriter/poly_rewriter_def.h +++ b/src/ast/rewriter/poly_rewriter_def.h @@ -98,7 +98,7 @@ expr * poly_rewriter::mk_mul_app(unsigned num_args, expr * const * args) new_args.push_back(this->mk_power(prev, k_prev, s)); }; - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { expr * arg = get_power_body(args[i], k); if (arg == prev) { k_prev += k; @@ -154,7 +154,7 @@ br_status poly_rewriter::mk_flat_mul_core(unsigned num_args, expr * cons // - (* c (* x_1 ... x_n)) if (num_args != 2 || !is_numeral(args[0]) || (is_mul(args[1]) && is_numeral(to_app(args[1])->get_arg(0)))) { unsigned i; - for (i = 0; i < num_args; i++) { + for (i = 0; i < num_args; ++i) { if (is_mul(args[i])) break; } @@ -164,7 +164,7 @@ br_status poly_rewriter::mk_flat_mul_core(unsigned num_args, expr * cons // we need the todo buffer to handle: (* (* c (* x_1 ... x_n)) (* d (* y_1 ... y_n))) ptr_buffer todo; flat_args.append(i, args); - for (unsigned j = i; j < num_args; j++) { + for (unsigned j = i; j < num_args; ++j) { if (is_mul(args[j])) { todo.push_back(args[j]); while (!todo.empty()) { @@ -189,9 +189,9 @@ br_status poly_rewriter::mk_flat_mul_core(unsigned num_args, expr * cons br_status st = mk_nflat_mul_core(flat_args.size(), flat_args.data(), result); TRACE(poly_rewriter, tout << "flat mul:\n"; - for (unsigned i = 0; i < num_args; i++) tout << mk_bounded_pp(args[i], M()) << "\n"; + for (unsigned i = 0; i < num_args; ++i) tout << mk_bounded_pp(args[i], M()) << "\n"; tout << "---->\n"; - for (unsigned i = 0; i < flat_args.size(); i++) tout << mk_bounded_pp(flat_args[i], M()) << "\n"; + for (unsigned i = 0; i < flat_args.size(); ++i) tout << mk_bounded_pp(flat_args[i], M()) << "\n"; tout << st << "\n"; ); if (st == BR_FAILED) { @@ -218,7 +218,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con unsigned num_coeffs = 0; unsigned num_add = 0; expr * var = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (is_numeral(arg, a)) { num_coeffs++; @@ -288,7 +288,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con // (* c_1 ... c_n (+ t_1 ... t_m)) --> (+ (* c_1*...*c_n t_1) ... (* c_1*...*c_n t_m)) ptr_buffer new_add_args; unsigned num = to_app(var)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { new_add_args.push_back(mk_mul_app(c, to_app(var)->get_arg(i))); } result = mk_add_app(new_add_args.size(), new_add_args.data()); @@ -315,7 +315,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con ptr_buffer new_args; expr * prev = nullptr; bool ordered = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * curr = args[i]; if (is_numeral(curr)) continue; @@ -325,7 +325,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con prev = curr; } TRACE(poly_rewriter, - for (unsigned i = 0; i < new_args.size(); i++) { + for (unsigned i = 0; i < new_args.size(); ++i) { if (i > 0) tout << (lt(new_args[i-1], new_args[i]) ? " < " : " !< "); tout << mk_ismt2_pp(new_args[i], M()); @@ -337,7 +337,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con std::sort(new_args.begin(), new_args.end(), lt); TRACE(poly_rewriter, tout << "after sorting:\n"; - for (unsigned i = 0; i < new_args.size(); i++) { + for (unsigned i = 0; i < new_args.size(); ++i) { if (i > 0) tout << (lt(new_args[i-1], new_args[i]) ? " < " : " !< "); tout << mk_ismt2_pp(new_args[i], M()); @@ -377,13 +377,13 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con ptr_buffer m_args; TRACE(som, tout << "starting soM()...\n";); do { - TRACE(som, for (unsigned i = 0; i < it.size(); i++) tout << it[i] << " "; + TRACE(som, for (unsigned i = 0; i < it.size(); ++i) tout << it[i] << " "; tout << "\n";); if (sum.size() > m_som_blowup * orig_size) { return BR_FAILED; } m_args.reset(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * const * v = sums[i]; expr * arg = v[it[i]]; m_args.push_back(arg); @@ -398,7 +398,7 @@ br_status poly_rewriter::mk_nflat_mul_core(unsigned num_args, expr * con template br_status poly_rewriter::mk_flat_add_core(unsigned num_args, expr * const * args, expr_ref & result) { unsigned i; - for (i = 0; i < num_args; i++) { + for (i = 0; i < num_args; ++i) { if (is_add(args[i])) break; } @@ -406,12 +406,12 @@ br_status poly_rewriter::mk_flat_add_core(unsigned num_args, expr * cons // has nested ADDs ptr_buffer flat_args; flat_args.append(i, args); - for (; i < num_args; i++) { + for (; i < num_args; ++i) { expr * arg = args[i]; // Remark: all rewrites are depth 1. if (is_add(arg)) { unsigned num = to_app(arg)->get_num_args(); - for (unsigned j = 0; j < num; j++) + for (unsigned j = 0; j < num; ++j) flat_args.push_back(to_app(arg)->get_arg(j)); } else { @@ -538,7 +538,7 @@ br_status poly_rewriter::mk_nflat_add_core(unsigned num_args, expr * con bool has_multiple = false; expr * prev = nullptr; bool ordered = true; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (is_numeral(arg, a)) { @@ -566,14 +566,14 @@ br_status poly_rewriter::mk_nflat_add_core(unsigned num_args, expr * con SASSERT(m_sort_sums || ordered); TRACE(rewriter, tout << "ordered: " << ordered << " sort sums: " << m_sort_sums << "\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";); if (has_multiple) { // expensive case buffer coeffs; m_expr2pos.reset(); // compute the coefficient of power products that occur multiple times. - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (is_numeral(arg)) continue; @@ -595,7 +595,7 @@ br_status poly_rewriter::mk_nflat_add_core(unsigned num_args, expr * con } // copy power products with non zero coefficients to new_args visited.reset(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (is_numeral(arg)) continue; @@ -642,7 +642,7 @@ br_status poly_rewriter::mk_nflat_add_core(unsigned num_args, expr * con expr_ref_buffer new_args(M()); if (!c.is_zero()) new_args.push_back(mk_numeral(c)); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = args[i]; if (is_numeral(arg)) continue; @@ -693,7 +693,7 @@ br_status poly_rewriter::mk_sub(unsigned num_args, expr * const * args, expr_ref minus_one(mk_numeral(numeral(-1)), M()); expr_ref_buffer new_args(M()); new_args.push_back(args[0]); - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { if (is_zero(args[i])) continue; expr * aux_args[2] = { minus_one, args[i] }; new_args.push_back(mk_mul_app(2, aux_args)); @@ -724,7 +724,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m numeral a; unsigned num_coeffs = 0; - for (unsigned i = 0; i < lhs_sz; i++) { + for (unsigned i = 0; i < lhs_sz; ++i) { expr * arg = lhs_monomials[i]; if (is_numeral(arg, a)) { c += a; @@ -739,7 +739,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m return BR_FAILED; } - for (unsigned i = 0; i < rhs_sz; i++) { + for (unsigned i = 0; i < rhs_sz; ++i) { expr * arg = rhs_monomials[i]; if (is_numeral(arg, a)) { c -= a; @@ -771,7 +771,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m buffer coeffs; m_expr2pos.reset(); - for (unsigned i = 0; i < lhs_sz; i++) { + for (unsigned i = 0; i < lhs_sz; ++i) { expr * arg = lhs_monomials[i]; if (is_numeral(arg)) continue; @@ -788,7 +788,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m } } - for (unsigned i = 0; i < rhs_sz; i++) { + for (unsigned i = 0; i < rhs_sz; ++i) { expr * arg = rhs_monomials[i]; if (is_numeral(arg)) continue; @@ -806,7 +806,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m new_lhs_monomials.push_back(0); // save space for coefficient if needed // copy power products with non zero coefficients to new_lhs_monomials visited.reset(); - for (unsigned i = 0; i < lhs_sz; i++) { + for (unsigned i = 0; i < lhs_sz; ++i) { expr * arg = lhs_monomials[i]; if (is_numeral(arg)) continue; @@ -827,7 +827,7 @@ br_status poly_rewriter::cancel_monomials(expr * lhs, expr * rhs, bool m ptr_buffer new_rhs_monomials; new_rhs_monomials.push_back(0); // save space for coefficient if needed - for (unsigned i = 0; i < rhs_sz; i++) { + for (unsigned i = 0; i < rhs_sz; ++i) { expr * arg = rhs_monomials[i]; if (is_numeral(arg)) continue; diff --git a/src/ast/rewriter/push_app_ite.cpp b/src/ast/rewriter/push_app_ite.cpp index 32e111614..9b0474137 100644 --- a/src/ast/rewriter/push_app_ite.cpp +++ b/src/ast/rewriter/push_app_ite.cpp @@ -23,7 +23,7 @@ Revision History: static int has_ite_arg(ast_manager& m, unsigned num_args, expr * const * args) { - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (m.is_ite(args[i])) return i; return -1; @@ -37,7 +37,7 @@ bool push_app_ite_cfg::is_target(func_decl * decl, unsigned num_args, expr * con if (m.is_ite(decl)) return false; bool found_ite = false; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (m.is_ite(args[i]) && !m.is_bool(args[i])) { if (found_ite) { if (m_conservative) @@ -51,7 +51,7 @@ bool push_app_ite_cfg::is_target(func_decl * decl, unsigned num_args, expr * con CTRACE(push_app_ite, found_ite, tout << "found target for push app ite:\n"; tout << "conservative " << m_conservative << "\n"; tout << decl->get_name(); - for (unsigned i = 0; i < num_args; i++) tout << " " << mk_pp(args[i], m); + for (unsigned i = 0; i < num_args; ++i) tout << " " << mk_pp(args[i], m); tout << "\n";); return found_ite; } @@ -86,7 +86,7 @@ bool ng_push_app_ite_cfg::is_target(func_decl * decl, unsigned num_args, expr * bool r = push_app_ite_cfg::is_target(decl, num_args, args); if (!r) return false; - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (!is_ground(args[i])) return true; return false; diff --git a/src/ast/rewriter/rewriter.cpp b/src/ast/rewriter/rewriter.cpp index 6c96d6411..700d28f41 100644 --- a/src/ast/rewriter/rewriter.cpp +++ b/src/ast/rewriter/rewriter.cpp @@ -151,14 +151,14 @@ bool rewriter_core::is_child_of_top_frame(expr * t) const { switch (parent->get_kind()) { case AST_APP: num = to_app(parent)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (to_app(parent)->get_arg(i) == t) return true; } return false; case AST_QUANTIFIER: num = to_quantifier(parent)->get_num_children(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (to_quantifier(parent)->get_child(i) == t) return true; } @@ -177,7 +177,7 @@ void rewriter_core::elim_reflex_prs(unsigned spos) { unsigned sz = m_result_pr_stack.size(); SASSERT(spos <= sz); unsigned j = spos; - for (unsigned i = spos; i < sz; i++) { + for (unsigned i = spos; i < sz; ++i) { proof * pr = m_result_pr_stack.get(i); if (pr != nullptr) { if (i != j) diff --git a/src/ast/rewriter/rewriter_def.h b/src/ast/rewriter/rewriter_def.h index 7a0a1f61a..ebfc71482 100644 --- a/src/ast/rewriter/rewriter_def.h +++ b/src/ast/rewriter/rewriter_def.h @@ -427,7 +427,7 @@ void rewriter_tpl::process_app(app * t, frame & fr) { fr.m_state = EXPAND_DEF; TRACE(get_macro, tout << "f: " << f->get_name() << ", def: \n" << mk_ismt2_pp(def, m()) << "\n"; tout << "Args num: " << num_args << "\n"; - for (unsigned i = 0; i < num_args; i++) tout << mk_ismt2_pp(new_args[i], m()) << "\n";); + for (unsigned i = 0; i < num_args; ++i) tout << mk_ismt2_pp(new_args[i], m()) << "\n";); unsigned sz = m_bindings.size(); unsigned i = num_args; while (i > 0) { @@ -535,7 +535,7 @@ void rewriter_tpl::process_quantifier(quantifier * q, frame & fr) { begin_scope(); m_root = q->get_expr(); unsigned sz = m_bindings.size(); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { m_bindings.push_back(nullptr); m_shifts.push_back(sz); } @@ -561,13 +561,13 @@ void rewriter_tpl::process_quantifier(quantifier * q, frame & fr) { expr * const * np = it + 1; expr * const * nnp = np + num_pats; unsigned j = 0; - for (unsigned i = 0; i < num_pats; i++) + for (unsigned i = 0; i < num_pats; ++i) if (m_manager.is_pattern(np[i])) new_pats[j++] = np[i]; new_pats.shrink(j); num_pats = j; j = 0; - for (unsigned i = 0; i < num_no_pats; i++) + for (unsigned i = 0; i < num_no_pats; ++i) if (m_manager.is_pattern(nnp[i])) new_no_pats[j++] = nnp[i]; new_no_pats.shrink(j); @@ -662,7 +662,7 @@ void rewriter_tpl::cleanup() { template void rewriter_tpl::display_bindings(std::ostream& out) { - for (unsigned i = 0; i < m_bindings.size(); i++) { + for (unsigned i = 0; i < m_bindings.size(); ++i) { if (m_bindings[i]) out << i << ": " << mk_ismt2_pp(m_bindings[i], m()) << ";\n"; } @@ -690,7 +690,7 @@ void rewriter_tpl::set_inv_bindings(unsigned num_bindings, expr * const SASSERT(not_rewriting()); m_bindings.reset(); m_shifts.reset(); - for (unsigned i = 0; i < num_bindings; i++) { + for (unsigned i = 0; i < num_bindings; ++i) { m_bindings.push_back(bindings[i]); m_shifts.push_back(num_bindings); } diff --git a/src/ast/rewriter/seq_rewriter.cpp b/src/ast/rewriter/seq_rewriter.cpp index d708af9e0..2bd2d3f7d 100644 --- a/src/ast/rewriter/seq_rewriter.cpp +++ b/src/ast/rewriter/seq_rewriter.cpp @@ -4335,7 +4335,7 @@ br_status seq_rewriter::mk_str_in_regexp(expr* a, expr* b, expr_ref& result) { if (str().is_string(a, s) && re().is_ground(b)) { // Just check membership and replace by true/false expr_ref r(b, m()); - for (unsigned i = 0; i < s.length(); i++) { + for (unsigned i = 0; i < s.length(); ++i) { if (re().is_empty(r)) { result = m().mk_false(); return BR_DONE; diff --git a/src/ast/rewriter/th_rewriter.cpp b/src/ast/rewriter/th_rewriter.cpp index 2a519880a..e5d52ce5a 100644 --- a/src/ast/rewriter/th_rewriter.cpp +++ b/src/ast/rewriter/th_rewriter.cpp @@ -457,11 +457,11 @@ struct th_rewriter_cfg : public default_rewriter_cfg { new_t2 = nullptr; expr_fast_mark1 visited1; expr_fast_mark2 visited2; - for (unsigned i = 0; i < num1; i++) { + for (unsigned i = 0; i < num1; ++i) { expr * arg = ms1[i]; visited1.mark(arg); } - for (unsigned i = 0; i < num2; i++) { + for (unsigned i = 0; i < num2; ++i) { expr * arg = ms2[i]; visited2.mark(arg); if (visited1.is_marked(arg)) @@ -470,7 +470,7 @@ struct th_rewriter_cfg : public default_rewriter_cfg { return false; // more than one missing term new_t2 = arg; } - for (unsigned i = 0; i < num1; i++) { + for (unsigned i = 0; i < num1; ++i) { expr * arg = ms1[i]; if (visited2.is_marked(arg)) continue; @@ -486,7 +486,7 @@ struct th_rewriter_cfg : public default_rewriter_cfg { new_t2 = m_a_util.mk_numeral(rational::zero(), is_int); // mk common part ptr_buffer args; - for (unsigned i = 0; i < num1; i++) { + for (unsigned i = 0; i < num1; ++i) { expr * arg = ms1[i]; if (arg == new_t1.get()) continue; @@ -635,7 +635,7 @@ struct th_rewriter_cfg : public default_rewriter_cfg { if (st != BR_DONE && st != BR_FAILED) { CTRACE(th_rewriter_step, st != BR_FAILED, tout << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << "\n"; + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << "\n"; tout << "---------->\n" << mk_ismt2_pp(result, m()) << "\n";); return st; } @@ -657,7 +657,7 @@ struct th_rewriter_cfg : public default_rewriter_cfg { CTRACE(th_rewriter_step, st != BR_FAILED, tout << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << "\n"; + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << "\n"; tout << "---------->\n" << mk_ismt2_pp(result, m()) << "\n";); return st; } diff --git a/src/ast/rewriter/var_subst.cpp b/src/ast/rewriter/var_subst.cpp index cd3d1605d..5f30da192 100644 --- a/src/ast/rewriter/var_subst.cpp +++ b/src/ast/rewriter/var_subst.cpp @@ -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; } diff --git a/src/ast/seq_decl_plugin.cpp b/src/ast/seq_decl_plugin.cpp index 16c7e3492..72eefeab0 100644 --- a/src/ast/seq_decl_plugin.cpp +++ b/src/ast/seq_decl_plugin.cpp @@ -1291,7 +1291,7 @@ bool seq_util::rex::pp::print_seq(std::ostream& out, expr* s) const { print(out, e); } else if (re.u.str.is_string(s, z)) { - for (unsigned i = 0; i < z.length(); i++) + for (unsigned i = 0; i < z.length(); ++i) out << (char)z[i]; } else if (re.u.str.is_at(s, x, i)) diff --git a/src/ast/simplifiers/bound_propagator.cpp b/src/ast/simplifiers/bound_propagator.cpp index d2612ad7f..e21c16c6d 100644 --- a/src/ast/simplifiers/bound_propagator.cpp +++ b/src/ast/simplifiers/bound_propagator.cpp @@ -189,7 +189,7 @@ void bound_propagator::init_eq(linear_equation * eq) { new_c.m_counter = 0; new_c.m_eq = eq; unsigned sz = eq->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_watches[eq->x(i)].push_back(c_idx); } if (propagate(c_idx) && scope_lvl() > 0) @@ -248,7 +248,7 @@ void bound_propagator::pop(unsigned num_scopes) { unsigned i = reinit_stack_sz; unsigned j = reinit_stack_sz; unsigned sz = m_reinit_stack.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { unsigned c_idx = m_reinit_stack[i]; bool p = propagate(c_idx); if (new_lvl > 0 && p) { @@ -520,7 +520,7 @@ bool bound_propagator::propagate_eq(unsigned c_idx) { double ll = 0.0; double uu = 0.0; unsigned sz = eq->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x_i = eq->x(i); double a_i = eq->approx_a(i); bound * l_i = m_lowers[x_i]; @@ -583,7 +583,7 @@ bool bound_propagator::propagate_eq(unsigned c_idx) { SASSERT(!ll_failed || !uu_failed); if (ll_i == UINT_MAX || uu_i == UINT_MAX) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x_i = eq->x(i); double a_i = eq->approx_a(i); bound * l_i = m_lowers[x_i]; @@ -672,7 +672,7 @@ bool bound_propagator::propagate_lower(unsigned c_idx, unsigned i) { mpq k; bool strict = false; bool neg_a_i = m.is_neg(a_i); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { if (i == j) continue; var x_j = eq->x(j); @@ -709,7 +709,7 @@ bool bound_propagator::propagate_upper(unsigned c_idx, unsigned i) { mpq k; bool strict = false; bool neg_a_i = m.is_neg(a_i); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { if (i == j) continue; var x_j = eq->x(j); @@ -821,7 +821,7 @@ void bound_propagator::explain(var x, bound * b, unsigned ts, assumption_vector if (!is_a_i_pos(*eq, x)) is_lower = !is_lower; unsigned sz = eq->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x_i = eq->x(i); if (x_i == x) continue; @@ -854,7 +854,7 @@ template bool bound_propagator::get_bound(unsigned sz, Numeral const * as, var const * xs, mpq & r, bool & st) const { st = false; m.reset(r); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x_i = xs[i]; Numeral const & a_i = as[i]; if (m.is_zero(a_i)) @@ -880,7 +880,7 @@ bool bound_propagator::upper(unsigned sz, mpq const * as, var const * xs, mpq & } void bound_propagator::display_bounds_of(std::ostream & out, linear_equation const & eq) const { - for (unsigned i = 0; i < eq.size(); i++) { + for (unsigned i = 0; i < eq.size(); ++i) { display_var_bounds(out, eq.x(i)); out << "\n"; } @@ -916,7 +916,7 @@ void bound_propagator::display_var_bounds(std::ostream & out, var x, bool approx void bound_propagator::display_bounds(std::ostream & out, bool approx, bool precise) const { unsigned num_vars = m_dead.size(); - for (unsigned x = 0; x < num_vars; x++) { + for (unsigned x = 0; x < num_vars; ++x) { if (!is_dead(x)) { display_var_bounds(out, x, approx, precise); out << "\n"; diff --git a/src/ast/simplifiers/bound_simplifier.cpp b/src/ast/simplifiers/bound_simplifier.cpp index 3ae3a1a01..10ab7b494 100644 --- a/src/ast/simplifiers/bound_simplifier.cpp +++ b/src/ast/simplifiers/bound_simplifier.cpp @@ -489,7 +489,7 @@ void bound_simplifier::restore_bounds() { m_fmls.add(dependent_expr(m, tmp, nullptr, nullptr)); }; - for (unsigned x = 0; x < sz; x++) { + for (unsigned x = 0; x < sz; ++x) { expr* p = m_var2expr.get(x); has_l = bp.lower(x, l, strict_l, ts); has_u = bp.upper(x, u, strict_u, ts); @@ -641,7 +641,7 @@ void find_ite_bounds(expr* root) { void find_ite_bounds() { unsigned sz = m_new_goal->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr* f = m_new_goal->form(i); if (m.is_ite(f)) find_ite_bounds(to_app(f)); diff --git a/src/ast/simplifiers/dependent_expr_state.cpp b/src/ast/simplifiers/dependent_expr_state.cpp index 7d00708ac..9cfd8d1a0 100644 --- a/src/ast/simplifiers/dependent_expr_state.cpp +++ b/src/ast/simplifiers/dependent_expr_state.cpp @@ -18,7 +18,7 @@ Author: unsigned dependent_expr_state::num_exprs() { expr_fast_mark1 visited; unsigned r = 0; - for (unsigned i = 0; i < qtail(); i++) + for (unsigned i = 0; i < qtail(); ++i) r += get_num_exprs((*this)[i].fml(), visited); return r; } diff --git a/src/ast/simplifiers/eliminate_predicates.cpp b/src/ast/simplifiers/eliminate_predicates.cpp index c396e6235..2fb9b62d8 100644 --- a/src/ast/simplifiers/eliminate_predicates.cpp +++ b/src/ast/simplifiers/eliminate_predicates.cpp @@ -322,7 +322,7 @@ void eliminate_predicates::insert_macro(app* head, expr* def, expr_dependency* d ptr_buffer vars, subst_args; subst_args.resize(num, nullptr); vars.resize(num, nullptr); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { var* v = to_var(head->get_arg(i)); var* w = m.mk_var(i, v->get_sort()); unsigned idx = v->get_idx(); diff --git a/src/ast/simplifiers/linear_equation.cpp b/src/ast/simplifiers/linear_equation.cpp index fe4282421..e27942a23 100644 --- a/src/ast/simplifiers/linear_equation.cpp +++ b/src/ast/simplifiers/linear_equation.cpp @@ -48,7 +48,7 @@ unsigned linear_equation::pos(unsigned x_i) const { void linear_equation_manager::display(std::ostream & out, linear_equation const & eq) const { unsigned sz = eq.m_size; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) out << " + "; out << m.to_string(eq.m_as[i]) << "*x" << eq.m_xs[i]; @@ -63,7 +63,7 @@ linear_equation * linear_equation_manager::mk(unsigned sz, mpq * as, var * xs, b mpz l; mpz r; m.set(l, as[0].denominator()); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { m.set(r, as[i].denominator()); m.lcm(r, l, l); } @@ -72,7 +72,7 @@ linear_equation * linear_equation_manager::mk(unsigned sz, mpq * as, var * xs, b // copy l * as to m_int_buffer. m_int_buffer.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { TRACE(linear_equation_mk, tout << "before as[" << i << "]: " << m.to_string(as[i]) << "\n";); m.mul(l, as[i], as[i]); TRACE(linear_equation_mk, tout << "after as[" << i << "]: " << m.to_string(as[i]) << "\n";); @@ -91,16 +91,16 @@ linear_equation * linear_equation_manager::mk(unsigned sz, mpq * as, var * xs, b linear_equation * linear_equation_manager::mk_core(unsigned sz, mpz * as, var * xs) { SASSERT(sz > 0); DEBUG_CODE({ - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { SASSERT(xs[i-1] < xs[i]); } }); - TRACE(linear_equation_bug, for (unsigned i = 0; i < sz; i++) tout << m.to_string(as[i]) << "*x" << xs[i] << " "; tout << "\n";); + TRACE(linear_equation_bug, for (unsigned i = 0; i < sz; ++i) tout << m.to_string(as[i]) << "*x" << xs[i] << " "; tout << "\n";); mpz g; m.set(g, as[0]); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { if (m.is_one(g)) break; if (m.is_neg(as[i])) { @@ -113,14 +113,14 @@ linear_equation * linear_equation_manager::mk_core(unsigned sz, mpz * as, var * } } if (!m.is_one(g)) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m.div(as[i], g, as[i]); } } TRACE(linear_equation_bug, tout << "g: " << m.to_string(g) << "\n"; - for (unsigned i = 0; i < sz; i++) tout << m.to_string(as[i]) << "*x" << xs[i] << " "; tout << "\n";); + for (unsigned i = 0; i < sz; ++i) tout << m.to_string(as[i]) << "*x" << xs[i] << " "; tout << "\n";); m.del(g); @@ -130,7 +130,7 @@ linear_equation * linear_equation_manager::mk_core(unsigned sz, mpz * as, var * mpz * new_as = reinterpret_cast(reinterpret_cast(new_eq) + sizeof(linear_equation)); double * new_app_as = reinterpret_cast(reinterpret_cast(new_as) + sz * sizeof(mpz)); var * new_xs = reinterpret_cast(reinterpret_cast(new_app_as) + sz * sizeof(double)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { new (new_as + i) mpz(); m.set(new_as[i], as[i]); new_app_as[i] = m.get_double(as[i]); @@ -146,7 +146,7 @@ linear_equation * linear_equation_manager::mk_core(unsigned sz, mpz * as, var * linear_equation * linear_equation_manager::mk(unsigned sz, mpz * as, var * xs, bool normalized) { if (!normalized) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; m_mark.reserve(x+1, false); m_val_buffer.reserve(x+1); @@ -161,7 +161,7 @@ linear_equation * linear_equation_manager::mk(unsigned sz, mpz * as, var * xs, b } unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; if (m_mark[x]) { if (!m.is_zero(m_val_buffer[x])) { @@ -178,26 +178,26 @@ linear_equation * linear_equation_manager::mk(unsigned sz, mpz * as, var * xs, b } else { DEBUG_CODE({ - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; m_mark.reserve(x+1, false); SASSERT(!m_mark[x]); m_mark[x] = true; } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; m_mark[x] = false; } }); } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; m_val_buffer.reserve(x+1); m.swap(m_val_buffer[x], as[i]); } std::sort(xs, xs+sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = xs[i]; m.swap(as[i], m_val_buffer[x]); } @@ -270,7 +270,7 @@ linear_equation * linear_equation_manager::mk(mpz const & b1, linear_equation co } void linear_equation_manager::del(linear_equation * eq) { - for (unsigned i = 0; i < eq->m_size; i++) { + for (unsigned i = 0; i < eq->m_size; ++i) { m.del(eq->m_as[i]); } unsigned obj_sz = linear_equation::get_obj_size(eq->m_size); diff --git a/src/ast/simplifiers/reduce_args_simplifier.cpp b/src/ast/simplifiers/reduce_args_simplifier.cpp index 28345f31d..eedb14142 100644 --- a/src/ast/simplifiers/reduce_args_simplifier.cpp +++ b/src/ast/simplifiers/reduce_args_simplifier.cpp @@ -213,7 +213,7 @@ class reduce_args_simplifier : public dependent_expr_simplifier { // compute the hash-code using only the arguments where m_bv is true. unsigned a = 0x9e3779b9; unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!m_bv.get(i)) continue; // ignore argument a = hash_u_u(a, n->get_arg(i)->get_id()); @@ -230,7 +230,7 @@ class reduce_args_simplifier : public dependent_expr_simplifier { // compare only the arguments where m_bv is true SASSERT(n1->get_num_args() == n2->get_num_args()); unsigned num_args = n1->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!m_bv.get(i)) continue; // ignore argument if (n1->get_arg(i) != n2->get_arg(i)) @@ -306,7 +306,7 @@ class reduce_args_simplifier : public dependent_expr_simplifier { } ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (!bv.get(i)) new_args.push_back(args[i]); } @@ -339,7 +339,7 @@ class reduce_args_simplifier : public dependent_expr_simplifier { bit_vector & bv = decl2args.find(f); new_vars.reset(); new_args.reset(); - for (unsigned i = 0; i < f->get_arity(); i++) { + for (unsigned i = 0; i < f->get_arity(); ++i) { new_vars.push_back(m.mk_var(i, f->get_domain(i))); if (!bv.get(i)) new_args.push_back(new_vars.back()); @@ -352,7 +352,7 @@ class reduce_args_simplifier : public dependent_expr_simplifier { } else { new_eqs.reset(); - for (unsigned i = 0; i < f->get_arity(); i++) + for (unsigned i = 0; i < f->get_arity(); ++i) if (bv.get(i)) new_eqs.push_back(m.mk_eq(new_vars.get(i), t->get_arg(i))); SASSERT(new_eqs.size() > 0); diff --git a/src/ast/sls/bvsls_opt_engine.cpp b/src/ast/sls/bvsls_opt_engine.cpp index 6f92cc2ed..ecc1a117f 100644 --- a/src/ast/sls/bvsls_opt_engine.cpp +++ b/src/ast/sls/bvsls_opt_engine.cpp @@ -41,7 +41,7 @@ bvsls_opt_engine::optimization_result bvsls_opt_engine::optimize( if (initial_model.get() != nullptr) { TRACE(sls_opt, tout << "Initial model provided: " << std::endl; - for (unsigned i = 0; i < initial_model->get_num_constants(); i++) { + for (unsigned i = 0; i < initial_model->get_num_constants(); ++i) { func_decl * fd = initial_model->get_constant(i); expr * val = initial_model->get_const_interp(fd); tout << fd->get_name() << " := " << mk_ismt2_pp(val, m()) << std::endl; @@ -57,7 +57,7 @@ bvsls_opt_engine::optimization_result bvsls_opt_engine::optimize( for (m_stats.m_restarts = 0; m_stats.m_restarts < m_max_restarts; - m_stats.m_restarts++) + ++m_stats.m_restarts) { mpz old_best; m_mpz_manager.set(old_best, m_best_model_score); @@ -178,7 +178,7 @@ void bvsls_opt_engine::save_model(mpz const & score) { model_ref mdl = m_hard_tracker.get_model(); model_ref obj_mdl = m_obj_tracker.get_model(); - for (unsigned i = 0; i < obj_mdl->get_num_constants(); i++) { + for (unsigned i = 0; i < obj_mdl->get_num_constants(); ++i) { func_decl * fd = obj_mdl->get_constant(i); expr * val = obj_mdl->get_const_interp(fd); if (mdl->has_interpretation(fd)) { @@ -252,14 +252,14 @@ mpz bvsls_opt_engine::find_best_move( mpz new_score; m_mpz_manager.set(new_score, score); - for (unsigned i = 0; i < to_evaluate.size() && m_mpz_manager.lt(new_score, max_score); i++) { + for (unsigned i = 0; i < to_evaluate.size() && m_mpz_manager.lt(new_score, max_score); ++i) { func_decl * fd = to_evaluate[i]; sort * srt = fd->get_range(); bv_sz = (m_manager.is_bool(srt)) ? 1 : m_bv_util.get_bv_size(srt); m_mpz_manager.set(old_value, m_obj_tracker.get_value(fd)); // first try to flip every bit - for (unsigned j = 0; j < bv_sz && m_mpz_manager.lt(new_score, max_score); j++) { + for (unsigned j = 0; j < bv_sz && m_mpz_manager.lt(new_score, max_score); ++j) { // What would happen if we flipped bit #i ? mk_flip(srt, old_value, j, temp); diff --git a/src/ast/sls/bvsls_opt_engine.h b/src/ast/sls/bvsls_opt_engine.h index 1ad362598..a55a33565 100644 --- a/src/ast/sls/bvsls_opt_engine.h +++ b/src/ast/sls/bvsls_opt_engine.h @@ -59,7 +59,7 @@ protected: obj_hashtable const & top_exprs = m_obj_tracker.get_top_exprs(); for (obj_hashtable::iterator it = top_exprs.begin(); it != top_exprs.end(); - it++) + ++it) m_mpz_manager.add(res, m_obj_tracker.get_value(*it), res); return res; } diff --git a/src/ast/sls/sls_bv_engine.cpp b/src/ast/sls/sls_bv_engine.cpp index 98da1bfcf..866ed2727 100644 --- a/src/ast/sls/sls_bv_engine.cpp +++ b/src/ast/sls/sls_bv_engine.cpp @@ -269,7 +269,7 @@ void sls_engine::mk_random_move(ptr_vector & unsat_constants) } TRACE(sls, tout << "Randomization candidates: "; - for (unsigned i = 0; i < unsat_constants.size(); i++) + for (unsigned i = 0; i < unsat_constants.size(); ++i) tout << unsat_constants[i]->get_name() << ", "; tout << std::endl; tout << "Random move: "; @@ -302,17 +302,17 @@ double sls_engine::find_best_move( // Andreas: Introducting a bit of randomization by using a random offset and a random direction to go through the candidate list. unsigned sz = to_evaluate.size(); unsigned offset = (m_random_offset) ? m_tracker.get_random_uint(16) % sz : 0; - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { unsigned i = j + offset; if (i >= sz) i -= sz; - //for (unsigned i = 0; i < to_evaluate.size(); i++) { + //for (unsigned i = 0; i < to_evaluate.size(); ++i) { func_decl * fd = to_evaluate[i]; sort * srt = fd->get_range(); bv_sz = (m_manager.is_bool(srt)) ? 1 : m_bv_util.get_bv_size(srt); m_mpz_manager.set(old_value, m_tracker.get_value(fd)); // first try to flip every bit - for (unsigned j = 0; j < bv_sz; j++) { + for (unsigned j = 0; j < bv_sz; ++j) { // What would happen if we flipped bit #i ? mk_flip(srt, old_value, j, temp); @@ -360,19 +360,19 @@ double sls_engine::find_best_move_mc(ptr_vector & to_evaluate, double // Andreas: Introducting a bit of randomization by using a random offset and a random direction to go through the candidate list. unsigned sz = to_evaluate.size(); unsigned offset = (m_random_offset) ? m_tracker.get_random_uint(16) % sz : 0; - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { unsigned i = j + offset; if (i >= sz) i -= sz; - //for (unsigned i = 0; i < to_evaluate.size(); i++) { + //for (unsigned i = 0; i < to_evaluate.size(); ++i) { func_decl * fd = to_evaluate[i]; sort * srt = fd->get_range(); bv_sz = (m_manager.is_bool(srt)) ? 1 : m_bv_util.get_bv_size(srt); m_mpz_manager.set(old_value, m_tracker.get_value(fd)); if (m_bv_util.is_bv_sort(srt) && bv_sz > 2) { - for (unsigned j = 0; j < bv_sz; j++) { + for (unsigned j = 0; j < bv_sz; ++j) { mk_flip(srt, old_value, j, temp); - for (unsigned l = 0; l < m_vns_mc && l < bv_sz / 2; l++) + for (unsigned l = 0; l < m_vns_mc && l < bv_sz / 2; ++l) { unsigned k = m_tracker.get_random_uint(16) % bv_sz; while (k == j) diff --git a/src/ast/sls/sls_bv_evaluator.h b/src/ast/sls/sls_bv_evaluator.h index a2119e64d..2ac59e519 100644 --- a/src/ast/sls/sls_bv_evaluator.h +++ b/src/ast/sls/sls_bv_evaluator.h @@ -76,7 +76,7 @@ public: switch (n->get_decl_kind()) { case OP_AND: { m_mpz_manager.set(result, m_one); - for (unsigned i = 0; i < n_args; i++) + for (unsigned i = 0; i < n_args; ++i) if (m_mpz_manager.neq(m_tracker.get_value(args[i]), result)) { m_mpz_manager.set(result, m_zero); break; @@ -84,7 +84,7 @@ public: break; } case OP_OR: { - for (unsigned i = 0; i < n_args; i++) + for (unsigned i = 0; i < n_args; ++i) if (m_mpz_manager.neq(m_tracker.get_value(args[i]), result)) { m_mpz_manager.set(result, m_one); break; @@ -102,7 +102,7 @@ public: SASSERT(n_args >= 2); m_mpz_manager.set(result, m_one); const mpz & first = m_tracker.get_value(args[0]); - for (unsigned i = 1; i < n_args; i++) + for (unsigned i = 1; i < n_args; ++i) if (m_mpz_manager.neq(m_tracker.get_value(args[i]), first)) { m_mpz_manager.set(result, m_zero); break; @@ -111,8 +111,8 @@ public: } case OP_DISTINCT: { m_mpz_manager.set(result, m_one); - for (unsigned i = 0; i < n_args && m_mpz_manager.is_one(result); i++) { - for (unsigned j = i+1; j < n_args && m_mpz_manager.is_one(result); j++) { + for (unsigned i = 0; i < n_args && m_mpz_manager.is_one(result); ++i) { + for (unsigned j = i+1; j < n_args && m_mpz_manager.is_one(result); ++j) { if (m_mpz_manager.eq(m_tracker.get_value(args[i]), m_tracker.get_value(args[j]))) m_mpz_manager.set(result, m_zero); } @@ -136,7 +136,7 @@ public: switch(k) { case OP_CONCAT: { SASSERT(n_args >= 2); - for (unsigned i = 0; i < n_args; i++) { + for (unsigned i = 0; i < n_args; ++i) { if (i != 0) { const mpz & p = m_powers(m_bv_util.get_bv_size(args[i])); m_mpz_manager.mul(result, p, result); @@ -157,7 +157,7 @@ public: } case OP_BADD: { SASSERT(n_args >= 2); - for (unsigned i = 0; i < n_args; i++) { + for (unsigned i = 0; i < n_args; ++i) { const mpz & next = m_tracker.get_value(args[i]); m_mpz_manager.add(result, next, result); } @@ -177,7 +177,7 @@ public: case OP_BMUL: { SASSERT(n_args >= 2); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) { + for (unsigned i = 1; i < n_args; ++i) { const mpz & next = m_tracker.get_value(args[i]); m_mpz_manager.mul(result, next, result); } @@ -341,14 +341,14 @@ public: case OP_BAND: { SASSERT(n_args >= 2); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) + for (unsigned i = 1; i < n_args; ++i) m_mpz_manager.bitwise_and(result, m_tracker.get_value(args[i]), result); break; } case OP_BOR: { SASSERT(n_args >= 2); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) { + for (unsigned i = 1; i < n_args; ++i) { m_mpz_manager.bitwise_or(result, m_tracker.get_value(args[i]), result); } break; @@ -356,7 +356,7 @@ public: case OP_BXOR: { SASSERT(n_args >= 2); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) + for (unsigned i = 1; i < n_args; ++i) m_mpz_manager.bitwise_xor(result, m_tracker.get_value(args[i]), result); break; } @@ -365,7 +365,7 @@ public: mpz temp; unsigned bv_sz = m_bv_util.get_bv_size(n); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) { + for (unsigned i = 1; i < n_args; ++i) { m_mpz_manager.bitwise_and(result, m_tracker.get_value(args[i]), temp); m_mpz_manager.bitwise_not(bv_sz, temp, result); } @@ -377,7 +377,7 @@ public: mpz temp; unsigned bv_sz = m_bv_util.get_bv_size(n); m_mpz_manager.set(result, m_tracker.get_value(args[0])); - for (unsigned i = 1; i < n_args; i++) { + for (unsigned i = 1; i < n_args; ++i) { m_mpz_manager.bitwise_or(result, m_tracker.get_value(args[i]), temp); m_mpz_manager.bitwise_not(bv_sz, temp, result); } @@ -495,7 +495,7 @@ public: } TRACE(sls_eval, tout << "(" << fd->get_name(); - for (unsigned i = 0; i < n_args; i++) + for (unsigned i = 0; i < n_args; ++i) tout << " " << m_mpz_manager.to_string(m_tracker.get_value(args[i])); tout << ") ---> " << m_mpz_manager.to_string(result); if (m_manager.is_bool(fd->get_range())) tout << " [Boolean]"; @@ -513,7 +513,7 @@ public: unsigned n_args = a->get_num_args(); m_temp_exprs.reset(); - for (unsigned i = 0; i < n_args; i++) { + for (unsigned i = 0; i < n_args; ++i) { expr * arg = a->get_arg(i); const mpz & v = m_tracker.get_value(arg); m_temp_exprs.push_back(m_tracker.mpz2value(arg->get_sort(), v)); @@ -549,7 +549,7 @@ public: while (cur_depth != static_cast(-1)) { ptr_vector & cur_depth_exprs = m_traversal_stack[cur_depth]; - for (unsigned i = 0; i < cur_depth_exprs.size(); i++) { + for (unsigned i = 0; i < cur_depth_exprs.size(); ++i) { expr * cur = cur_depth_exprs[i]; (*this)(to_app(cur), new_value); @@ -570,7 +570,7 @@ public: if (m_tracker.has_uplinks(cur)) { ptr_vector & ups = m_tracker.get_uplinks(cur); - for (unsigned j = 0; j < ups.size(); j++) { + for (unsigned j = 0; j < ups.size(); ++j) { expr * next = ups[j]; unsigned next_d = m_tracker.get_distance(next); SASSERT(next_d < cur_depth); @@ -600,7 +600,7 @@ public: while (cur_depth != static_cast(-1)) { ptr_vector & cur_depth_exprs = m_traversal_stack[cur_depth]; - for (unsigned i = 0; i < cur_depth_exprs.size(); i++) { + for (unsigned i = 0; i < cur_depth_exprs.size(); ++i) { expr * cur = cur_depth_exprs[i]; (*this)(to_app(cur), new_value); @@ -611,7 +611,7 @@ public: m_tracker.set_score(cur, new_score); if (m_tracker.has_uplinks(cur)) { ptr_vector & ups = m_tracker.get_uplinks(cur); - for (unsigned j = 0; j < ups.size(); j++) { + for (unsigned j = 0; j < ups.size(); ++j) { expr * next = ups[j]; unsigned next_d = m_tracker.get_distance(next); SASSERT(next_d < cur_depth); @@ -672,7 +672,7 @@ public: ptr_vector & cur_depth_exprs = m_traversal_stack_bool[cur_depth]; - for (unsigned i = 0; i < cur_depth_exprs.size(); i++) { + for (unsigned i = 0; i < cur_depth_exprs.size(); ++i) { expr * cur = cur_depth_exprs[i]; new_score = m_tracker.score(cur); @@ -689,7 +689,7 @@ public: if (m_tracker.has_uplinks(cur)) { ptr_vector & ups = m_tracker.get_uplinks(cur); - for (unsigned j = 0; j < ups.size(); j++) { + for (unsigned j = 0; j < ups.size(); ++j) { expr * next = ups[j]; unsigned next_d = m_tracker.get_distance(next); SASSERT(next_d < cur_depth); @@ -709,7 +709,7 @@ public: if (pot_benefits) { unsigned cur_size = cur_depth_exprs.size(); - for (unsigned i = 0; i < cur_size; i++) { + for (unsigned i = 0; i < cur_size; ++i) { expr * cur = cur_depth_exprs[i]; new_score = m_tracker.score(cur); @@ -719,7 +719,7 @@ public: if (m_tracker.has_uplinks(cur)) { ptr_vector & ups = m_tracker.get_uplinks(cur); - for (unsigned j = 0; j < ups.size(); j++) { + for (unsigned j = 0; j < ups.size(); ++j) { expr * next = ups[j]; unsigned next_d = m_tracker.get_distance(next); SASSERT(next_d < cur_depth); @@ -748,7 +748,7 @@ public: while (cur_depth != static_cast(-1)) { ptr_vector & cur_depth_exprs = m_traversal_stack[cur_depth]; - for (unsigned i = 0; i < cur_depth_exprs.size(); i++) { + for (unsigned i = 0; i < cur_depth_exprs.size(); ++i) { expr * cur = cur_depth_exprs[i]; (*this)(to_app(cur), new_value); @@ -756,7 +756,7 @@ public: // Andreas: Should actually always have uplinks ... if (m_tracker.has_uplinks(cur)) { ptr_vector & ups = m_tracker.get_uplinks(cur); - for (unsigned j = 0; j < ups.size(); j++) { + for (unsigned j = 0; j < ups.size(); ++j) { expr * next = ups[j]; unsigned next_d = m_tracker.get_distance(next); SASSERT(next_d < cur_depth); diff --git a/src/ast/sls/sls_bv_tracker.h b/src/ast/sls/sls_bv_tracker.h index 5b228a36b..aa0c7304c 100644 --- a/src/ast/sls/sls_bv_tracker.h +++ b/src/ast/sls/sls_bv_tracker.h @@ -155,12 +155,12 @@ public: double sum = 0.0; unsigned count = 0; - for (unsigned i = 0; i < g->size(); i++) + for (unsigned i = 0; i < g->size(); ++i) { m_temp_constants.reset(); ptr_vector const & this_decls = m_constants_occ.find(g->form(i)); unsigned sz = this_decls.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * fd = this_decls[i]; m_temp_constants.push_back(fd); sort * srt = fd->get_range(); @@ -294,7 +294,7 @@ public: expr * e; unsigned touched_old, touched_new; - for (unsigned i = 0; i < as.size(); i++) + for (unsigned i = 0; i < as.size(); ++i) { e = as[i]; touched_old = m_scores.find(e).touched; @@ -380,7 +380,7 @@ public: // precondition: m_scores is set up. unsigned sz = as.size(); ptr_vector stack; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) stack.push_back(to_app(as[i])); while (!stack.empty()) { app * cur = stack.back(); @@ -388,7 +388,7 @@ public: unsigned d = get_distance(cur); - for (unsigned i = 0; i < cur->get_num_args(); i++) { + for (unsigned i = 0; i < cur->get_num_args(); ++i) { app * child = to_app(cur->get_arg(i)); unsigned d_child = get_distance(child); if (d >= d_child) { @@ -406,7 +406,7 @@ public: app * a = to_app(e); expr * const * args = a->get_args(); unsigned int sz = a->get_num_args(); - for (unsigned int i = 0; i < sz; i++) { + for (unsigned int i = 0; i < sz; ++i) { expr * q = args[i]; initialize_recursive(proc, visited, q); } @@ -419,7 +419,7 @@ public: app * a = to_app(e); expr * const * args = a->get_args(); unsigned int sz = a->get_num_args(); - for (unsigned int i = 0; i < sz; i++) { + for (unsigned int i = 0; i < sz; ++i) { expr * q = args[i]; initialize_recursive(q); } @@ -458,7 +458,7 @@ public: if (m_track_unsat) { m_list_false = new expr*[sz]; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) { if (m_mpz_manager.eq(get_value(as[i]), m_zero)) break_assertion(as[i]); @@ -529,14 +529,14 @@ public: void show_model(std::ostream & out) { unsigned sz = get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * fd = get_constant(i); out << fd->get_name() << " = " << m_mpz_manager.to_string(get_value(fd)) << std::endl; } } void set_model(model_ref const & mdl) { - for (unsigned i = 0; i < mdl->get_num_constants(); i++) { + for (unsigned i = 0; i < mdl->get_num_constants(); ++i) { func_decl * fd = mdl->get_constant(i); expr * val = mdl->get_const_interp(fd); if (m_entry_points.contains(fd)) { @@ -560,7 +560,7 @@ public: model_ref get_model() { model_ref res = alloc(model, m_manager); unsigned sz = get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * fd = get_constant(i); res->register_decl(fd, mpz2value(fd->get_range(), get_value(fd))); } @@ -648,7 +648,7 @@ public: void randomize(ptr_vector const & as) { TRACE(sls_verbose, tout << "Abandoned model:" << std::endl; show_model(tout); ); - for (entry_point_type::iterator it = m_entry_points.begin(); it != m_entry_points.end(); it++) { + for (entry_point_type::iterator it = m_entry_points.begin(); it != m_entry_points.end(); ++it) { func_decl * fd = it->m_key; sort * s = fd->get_range(); mpz temp = get_random(s); @@ -662,7 +662,7 @@ public: void reset(ptr_vector const & as) { TRACE(sls_verbose, tout << "Abandoned model:" << std::endl; show_model(tout); ); - for (entry_point_type::iterator it = m_entry_points.begin(); it != m_entry_points.end(); it++) { + for (entry_point_type::iterator it = m_entry_points.begin(); it != m_entry_points.end(); ++it) { set_value(it->m_value, m_zero); } } @@ -720,7 +720,7 @@ public: else if (m_manager.is_and(n) && !negated) { /* Andreas: Seems to have no effect. But maybe you want to try it again at some point. double sum = 0.0; - for (unsigned i = 0; i < a->get_num_args(); i++) + for (unsigned i = 0; i < a->get_num_args(); ++i) sum += get_score(args[i]); res = sum / (double) a->get_num_args(); */ double min = 1.0; @@ -892,8 +892,8 @@ public: app * a = to_app(n); unsigned pairs = 0, distinct_pairs = 0; unsigned sz = a->get_num_args(); - for (unsigned i = 0; i < sz; i++) { - for (unsigned j = i+1; j < sz; j++) { + for (unsigned i = 0; i < sz; ++i) { + for (unsigned j = i+1; j < sz; ++j) { // pair i/j const mpz & v0 = get_value(a->get_arg(0)); const mpz & v1 = get_value(a->get_arg(1)); @@ -970,7 +970,7 @@ public: ptr_vector & get_constants(expr * e) { ptr_vector const & this_decls = m_constants_occ.find(e); unsigned sz = this_decls.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * fd = this_decls[i]; if (!m_temp_constants.contains(fd)) m_temp_constants.push_back(fd); @@ -1043,9 +1043,9 @@ public: { double max = -1.0; // Andreas: Commented things here might be used for track_unsat data structures as done in SLS for SAT. But seems to have no benefit. - /* for (unsigned i = 0; i < m_where_false.size(); i++) { + /* for (unsigned i = 0; i < m_where_false.size(); ++i) { expr * e = m_list_false[i]; */ - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * e = as[i]; if (m_mpz_manager.neq(get_value(e), m_one)) { @@ -1075,7 +1075,7 @@ public: return m_list_false[get_random_uint(16) % sz]; */ unsigned cnt_unsat = 0; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (m_mpz_manager.neq(get_value(as[i]), m_one) && (get_random_uint(16) % ++cnt_unsat == 0)) pos = i; if (pos == static_cast(-1)) return nullptr; @@ -1092,7 +1092,7 @@ public: m_temp_constants.reset(); unsigned cnt_unsat = 0, pos = -1; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if ((i != m_last_pos) && m_mpz_manager.neq(get_value(as[i]), m_one) && (get_random_uint(16) % ++cnt_unsat == 0)) pos = i; if (pos == static_cast(-1)) diff --git a/src/ast/sls/sls_powers.h b/src/ast/sls/sls_powers.h index 80ccbe04f..e420e0f07 100644 --- a/src/ast/sls/sls_powers.h +++ b/src/ast/sls/sls_powers.h @@ -27,7 +27,7 @@ class powers : public u_map { public: powers(unsynch_mpz_manager & m) : m(m) {} ~powers() { - for (iterator it = begin(); it != end(); it++) { + for (iterator it = begin(); it != end(); ++it) { m.del(*it->m_value); dealloc(it->m_value); } diff --git a/src/ast/sls/sls_seq_plugin.cpp b/src/ast/sls/sls_seq_plugin.cpp index f74261da2..f5fec948a 100644 --- a/src/ast/sls/sls_seq_plugin.cpp +++ b/src/ast/sls/sls_seq_plugin.cpp @@ -1624,13 +1624,13 @@ namespace sls { if (offset_val.is_neg() || offset_val.get_unsigned() >= r.length()) { has_empty = true; - for (unsigned i = 0; i < r.length(); i++) + for (unsigned i = 0; i < r.length(); ++i) m_int_updates.push_back({ offset, rational(i), 1 }); } if (!len_val.is_pos()) { has_empty = true; - for (unsigned i = 1; i + offset_u < r.length(); i++) + for (unsigned i = 1; i + offset_u < r.length(); ++i) m_int_updates.push_back({ len, rational(i), 1 }); } diff --git a/src/ast/static_features.cpp b/src/ast/static_features.cpp index 0fe422ea4..d0c2ce8e2 100644 --- a/src/ast/static_features.cpp +++ b/src/ast/static_features.cpp @@ -184,7 +184,7 @@ void static_features::update_core(expr * e) { else { m_num_ite_terms++; // process then&else nodes - for (unsigned i = 1; i < 3; i++) { + for (unsigned i = 1; i < 3; ++i) { expr * arg = to_app(e)->get_arg(i); acc_num(arg); // Must check whether arg is diff logic or not. @@ -224,7 +224,7 @@ void static_features::update_core(expr * e) { unsigned num_patterns = to_quantifier(e)->get_num_patterns(); if (num_patterns > 0) { m_num_quantifiers_with_patterns++; - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { expr * p = to_quantifier(e)->get_pattern(i); if (is_app(p) && to_app(p)->get_num_args() > 1) { m_num_quantifiers_with_multi_patterns++; @@ -332,7 +332,7 @@ void static_features::update_core(expr * e) { sort * ty = to_app(e)->get_decl()->get_range(); mark_theory(ty->get_family_id()); unsigned n = ty->get_num_parameters(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { sort * ds = to_sort(ty->get_parameter(i).get_ast()); update_core(ds); } @@ -531,7 +531,7 @@ void static_features::process_root(expr * e) { if (num_args == 2) m_num_bin_clauses++; unsigned depth = 0; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(e)->get_arg(i); if (m.is_not(arg)) arg = to_app(arg)->get_arg(0); @@ -555,7 +555,7 @@ void static_features::process_root(expr * e) { } void static_features::collect(unsigned num_formulas, expr * const * formulas) { - for (unsigned i = 0; i < num_formulas; i++) + for (unsigned i = 0; i < num_formulas; ++i) process_root(formulas[i]); } @@ -564,7 +564,7 @@ bool static_features::internal_family(symbol const & f_name) const { } void static_features::display_family_data(std::ostream & out, char const * prefix, unsigned_vector const & data) const { - for (unsigned fid = 0; fid < data.size(); fid++) { + for (unsigned fid = 0; fid < data.size(); ++fid) { symbol const & n = m.get_family_name(fid); if (!internal_family(n)) out << prefix << "_" << n << " " << data[fid] << "\n"; diff --git a/src/ast/substitution/demodulator_rewriter.cpp b/src/ast/substitution/demodulator_rewriter.cpp index 28bef1275..20925d424 100644 --- a/src/ast/substitution/demodulator_rewriter.cpp +++ b/src/ast/substitution/demodulator_rewriter.cpp @@ -200,7 +200,7 @@ expr_ref demodulator_rewriter_util::rewrite(expr * n) { m_rewrite_todo.push_back(n); while (!m_rewrite_todo.empty()) { TRACE(demodulator_stack, tout << "STACK: " << std::endl; - for (unsigned i = 0; i < m_rewrite_todo.size(); i++) + for (unsigned i = 0; i < m_rewrite_todo.size(); ++i) tout << std::dec << i << ": " << std::hex << (size_t)m_rewrite_todo[i] << " = " << mk_pp(m_rewrite_todo[i], m) << std::endl; ); @@ -495,7 +495,7 @@ expr * demodulator_rewriter::rewrite(expr * n) { m_rewrite_todo.push_back(n); while (!m_rewrite_todo.empty()) { TRACE(demodulator_stack, tout << "STACK: " << std::endl; - for (unsigned i = 0; i < m_rewrite_todo.size(); i++) + for (unsigned i = 0; i < m_rewrite_todo.size(); ++i) tout << std::dec << i << ": " << std::hex << (size_t)m_rewrite_todo[i] << " = " << mk_pp(m_rewrite_todo[i], m) << std::endl; ); @@ -879,7 +879,7 @@ bool demodulator_match_subst::match_args(app * lhs, expr * const * args) { m_all_args_eq = true; unsigned num_args = lhs->get_num_args(); if (!fill_commutative(lhs, args)) { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * t_arg = lhs->get_arg(i); expr * i_arg = args[i]; if (t_arg != i_arg) diff --git a/src/ast/substitution/substitution.cpp b/src/ast/substitution/substitution.cpp index 03ebc21a9..86b88527e 100644 --- a/src/ast/substitution/substitution.cpp +++ b/src/ast/substitution/substitution.cpp @@ -40,7 +40,7 @@ void substitution::reset() { void substitution::reset_cache() { TRACE(subst_bug, tout << "substitution::reset_cache\n"; - for (unsigned i = 0; i < m_new_exprs.size(); i++) { tout << mk_pp(m_new_exprs.get(i), m_manager) << "\nref_count: " << m_new_exprs.get(i)->get_ref_count() << "\n"; }); + for (unsigned i = 0; i < m_new_exprs.size(); ++i) { tout << mk_pp(m_new_exprs.get(i), m_manager) << "\nref_count: " << m_new_exprs.get(i)->get_ref_count() << "\n"; }); m_apply_cache.reset(); m_new_exprs.reset(); @@ -54,7 +54,7 @@ void substitution::pop_scope(unsigned num_scopes) { unsigned old_sz = m_scopes[new_lvl]; unsigned curr_sz = m_vars.size(); SASSERT(old_sz <= curr_sz); - for (unsigned i = old_sz; i < curr_sz; i++) { + for (unsigned i = old_sz; i < curr_sz; ++i) { var_offset & curr = m_vars[i]; m_subst.erase(curr.first, curr.second); } @@ -144,7 +144,7 @@ void substitution::apply(unsigned num_actual_offsets, unsigned const * deltas, e m_todo.pop_back(); new_args.reset(); bool has_new_args = false; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(e)->get_arg(i); expr * new_arg = nullptr; @@ -175,8 +175,8 @@ void substitution::apply(unsigned num_actual_offsets, unsigned const * deltas, e subst.reserve(m_subst.offsets_capacity(), m_subst.vars_capacity() + num_vars); var_shifter var_sh(m_manager); expr_offset r; - for (unsigned i = 0; i < m_subst.offsets_capacity(); i++) { - for (unsigned j = 0; j < m_subst.vars_capacity(); j++) { + for (unsigned i = 0; i < m_subst.offsets_capacity(); ++i) { + for (unsigned j = 0; j < m_subst.vars_capacity(); ++j) { if (find(j, i, r)) { var_sh(r.get_expr(), num_vars, er); subst.insert(j + num_vars, i, expr_offset(er, r.get_offset())); @@ -311,8 +311,8 @@ bool substitution::acyclic() { void substitution::display(std::ostream & out, unsigned num_actual_offsets, unsigned const * deltas) { reset_cache(); - for (unsigned i = 0; i < num_actual_offsets; i++) - for (unsigned j = 0; j < m_subst.vars_capacity(); j++) { + for (unsigned i = 0; i < num_actual_offsets; ++i) + for (unsigned j = 0; j < m_subst.vars_capacity(); ++j) { expr_offset r; if (find(j, i, r)) { expr_ref tmp(m_manager); @@ -323,8 +323,8 @@ void substitution::display(std::ostream & out, unsigned num_actual_offsets, unsi } void substitution::display(std::ostream & out) { - for (unsigned i = 0; i < m_subst.offsets_capacity(); i++) - for (unsigned j = 0; j < m_subst.vars_capacity(); j++) { + for (unsigned i = 0; i < m_subst.offsets_capacity(); ++i) + for (unsigned j = 0; j < m_subst.vars_capacity(); ++j) { expr_offset r; if (find(j, i, r)) out << "VAR " << j << ":" << i << " --> " << r.get_offset() << "\n" << mk_pp(r.get_expr(), m_manager) << "\n"; diff --git a/src/ast/substitution/substitution_tree.cpp b/src/ast/substitution/substitution_tree.cpp index b8dd0ea94..b23c44c80 100644 --- a/src/ast/substitution/substitution_tree.cpp +++ b/src/ast/substitution/substitution_tree.cpp @@ -70,7 +70,7 @@ inline void substitution_tree::erase_reg_from_todo(unsigned ridx) { */ void substitution_tree::linearize(svector & result) { ptr_buffer new_args; - for (unsigned i = 0; i < m_todo.size(); i++) { + for (unsigned i = 0; i < m_todo.size(); ++i) { unsigned ireg_idx = m_todo[i]; expr * n = get_reg_value(ireg_idx); var * ireg = m_manager.mk_var(ireg_idx, n->get_sort()); @@ -83,7 +83,7 @@ void substitution_tree::linearize(svector & result) { if (num == 0) new_app = to_app(n); else { - for (unsigned j = 0; j < num; j++) { + for (unsigned j = 0; j < num; ++j) { unsigned oreg = next_reg(); set_reg_value(oreg, to_app(n)->get_arg(j)); m_todo.push_back(oreg); @@ -109,7 +109,7 @@ void substitution_tree::process_args(app * in, app * out) { CTRACE(subst_tree_bug, in->get_num_args() != out->get_num_args(), tout << mk_ismt2_pp(in, m_manager) << "\n" << mk_ismt2_pp(out, m_manager) << "\n";); unsigned num = out->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * in_arg = in->get_arg(i); expr * out_arg = out->get_arg(i); SASSERT(is_var(out_arg)); @@ -232,7 +232,7 @@ void substitution_tree::mark_used_regs(svector const & sv) { mark_used_reg(s.first->get_idx()); if (is_app(s.second)) { unsigned num_args = to_app(s.second)->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(s.second)->get_arg(i); SASSERT(is_var(arg)); mark_used_reg(to_var(arg)->get_idx()); @@ -578,7 +578,7 @@ void substitution_tree::display(std::ostream & out, subst const & s) const { out << to_app(s.second)->get_decl()->get_name(); else { out << "(" << to_app(s.second)->get_decl()->get_name(); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) out << " r!" << to_var(to_app(s.second)->get_arg(i))->get_idx(); out << ")"; } @@ -600,7 +600,7 @@ void substitution_tree::display(std::ostream & out, svector const & sv) c } void substitution_tree::display(std::ostream & out, node * n, unsigned delta) const { - for (unsigned i = 0; i < delta; i++) + for (unsigned i = 0; i < delta; ++i) out << " "; display(out, n->m_subst); if (n->m_leaf) { @@ -734,7 +734,7 @@ bool substitution_tree::visit_vars(expr * e, st_visitor & st) { var_ref_vector * v = m_vars[s_id]; if (v && !v->empty()) { unsigned sz = v->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var * curr = v->get(i); m_subst->push_scope(); if (unify_match(expr_offset(curr, m_st_offset), expr_offset(e, m_in_offset))) { @@ -870,7 +870,7 @@ void substitution_tree::display(std::ostream & out) const { if (v == nullptr) continue; // m_vars may contain null pointers. See substitution_tree::insert. unsigned num = v->size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (!found_var) { found_var = true; out << "vars: "; diff --git a/src/ast/substitution/unifier.cpp b/src/ast/substitution/unifier.cpp index fc4532312..3b1bd128a 100644 --- a/src/ast/substitution/unifier.cpp +++ b/src/ast/substitution/unifier.cpp @@ -164,7 +164,7 @@ bool unifier::operator()(unsigned num_exprs, expr ** es, substitution & s, bool } } #endif - for (unsigned i = 0; i < num_exprs - 1; i++) { + for (unsigned i = 0; i < num_exprs - 1; ++i) { if (!unify_core(expr_offset(es[i], use_offsets ? i : 0), expr_offset(es[i+1], use_offsets ? i + 1 : 0))) { m_last_call_succeeded = false; diff --git a/src/ast/used_symbols.h b/src/ast/used_symbols.h index cd849364d..f69db364a 100644 --- a/src/ast/used_symbols.h +++ b/src/ast/used_symbols.h @@ -73,13 +73,13 @@ public: if (!ignore_quantifiers) { found(to_quantifier(n)->get_qid()); unsigned num_decls = to_quantifier(n)->get_num_decls(); - for (unsigned i = 0; i < num_decls; i++) + for (unsigned i = 0; i < num_decls; ++i) found(to_quantifier(n)->get_decl_name(i)); unsigned num_pats = to_quantifier(n)->get_num_patterns(); - for (unsigned i = 0; i < num_pats; i++) + for (unsigned i = 0; i < num_pats; ++i) visit(to_quantifier(n)->get_pattern(i)); unsigned num_no_pats = to_quantifier(n)->get_num_no_patterns(); - for (unsigned i = 0; i < num_no_pats; i++) + for (unsigned i = 0; i < num_no_pats; ++i) visit(to_quantifier(n)->get_no_pattern(i)); visit(to_quantifier(n)->get_expr()); } diff --git a/src/ast/used_vars.cpp b/src/ast/used_vars.cpp index 29321d98a..4a72750d1 100644 --- a/src/ast/used_vars.cpp +++ b/src/ast/used_vars.cpp @@ -97,7 +97,7 @@ void used_vars::process(expr * n, unsigned delta) { bool used_vars::uses_all_vars(unsigned num_decls) const { if (num_decls > m_found_vars.size()) return false; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { if (!m_found_vars[i]) return false; } @@ -106,7 +106,7 @@ bool used_vars::uses_all_vars(unsigned num_decls) const { bool used_vars::uses_a_var(unsigned num_decls) const { num_decls = std::min(num_decls, m_found_vars.size()); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { if (m_found_vars[i]) return true; } @@ -116,7 +116,7 @@ bool used_vars::uses_a_var(unsigned num_decls) const { unsigned used_vars::get_num_vars() const { unsigned r = 0; unsigned num = m_found_vars.size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (m_found_vars[i]) r++; } diff --git a/src/ast/well_sorted.cpp b/src/ast/well_sorted.cpp index 3c952f651..cb8b8b93d 100644 --- a/src/ast/well_sorted.cpp +++ b/src/ast/well_sorted.cpp @@ -55,7 +55,7 @@ struct well_sorted_proc { return; } - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sort * actual_sort = n->get_arg(i)->get_sort(); sort * expected_sort = decl->is_associative() ? decl->get_domain(0) : decl->get_domain(i); if (expected_sort != actual_sort) { diff --git a/src/cmd_context/basic_cmds.cpp b/src/cmd_context/basic_cmds.cpp index ed7e14b20..46e66aaec 100644 --- a/src/cmd_context/basic_cmds.cpp +++ b/src/cmd_context/basic_cmds.cpp @@ -273,7 +273,7 @@ ATOMIC_CMD(labels_cmd, "labels", "retrieve Simplify-like labels", { svector labels; ctx.get_check_sat_result()->get_labels(labels); ctx.regular_stream() << "(labels"; - for (unsigned i = 0; i < labels.size(); i++) { + for (unsigned i = 0; i < labels.size(); ++i) { ctx.regular_stream() << " " << labels[i]; } ctx.regular_stream() << ")" << std::endl; @@ -893,7 +893,7 @@ public: ptr_vector & array_sort_args = m_domain; sort_ref_buffer domain(ctx.m()); unsigned arity = m_f->get_arity(); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { array_sort_args.push_back(m_f->get_domain(i)); domain.push_back(array_sort->instantiate(ctx.pm(), array_sort_args.size(), array_sort_args.data())); array_sort_args.pop_back(); diff --git a/src/cmd_context/cmd_context.cpp b/src/cmd_context/cmd_context.cpp index 8b5d126ec..b065607f6 100644 --- a/src/cmd_context/cmd_context.cpp +++ b/src/cmd_context/cmd_context.cpp @@ -174,7 +174,7 @@ bool func_decls::clash(func_decl * f) const { continue; unsigned num = g->get_arity(); unsigned i; - for (i = 0; i < num; i++) + for (i = 0; i < num; ++i) if (g->get_domain(i) != f->get_domain(i)) break; if (i == num) @@ -208,7 +208,7 @@ bool func_decls::check_signature(ast_manager& m, func_decl* f, unsigned arity, s if (!domain) return true; coerced = false; - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { sort* s1 = f->get_domain(i); sort* s2 = domain[i]; if (s1 == s2) @@ -232,7 +232,7 @@ bool func_decls::check_poly_signature(ast_manager& m, func_decl* f, unsigned ari return false; if (f->get_arity() != arity) return false; - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) if (!sub.match(f->get_domain(i), domain[i])) return false; if (!range) @@ -290,7 +290,7 @@ func_decl * func_decls::find(ast_manager & m, unsigned num_args, expr * const * if (!more_than_one()) first(); ptr_buffer sorts; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!args[i]) return nullptr; sorts.push_back(args[i]->get_sort()); @@ -314,7 +314,7 @@ func_decl * func_decls::get_entry(unsigned inx) { else { func_decl_set * fs = UNTAG(func_decl_set *, m_decls); auto b = fs->begin(); - for (unsigned i = 0; i < inx; i++) + for (unsigned i = 0; i < inx; ++i) b++; return *b; } @@ -1149,7 +1149,7 @@ func_decl * cmd_context::find_func_decl(symbol const & s, unsigned num_indices, } else { buffer ps; - for (unsigned i = 0; i < num_indices; i++) + for (unsigned i = 0; i < num_indices; ++i) ps.push_back(parameter(indices[i])); f = m().mk_func_decl(fid, k, num_indices, ps.data(), arity, domain, range); } @@ -1268,12 +1268,12 @@ bool cmd_context::try_mk_declared_app(symbol const &s, unsigned num_args, expr * unsigned sz = get_array_arity(s); if (sz != num_args) return false; - for (unsigned i = 0; i < sz; i++) + 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++) + 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; @@ -1290,7 +1290,7 @@ bool cmd_context::try_mk_macro_app(symbol const & s, unsigned num_args, expr * c TRACE(macro_bug, tout << "well_sorted_check_enabled(): " << well_sorted_check_enabled() << "\n"; tout << "s: " << s << "\n"; tout << "body:\n" << mk_ismt2_pp(_t, m()) << "\n"; - tout << "args:\n"; for (unsigned i = 0; i < num_args; i++) tout << mk_ismt2_pp(args[i], m()) << "\n" << mk_pp(args[i]->get_sort(), m()) << "\n";); + tout << "args:\n"; for (unsigned i = 0; i < num_args; ++i) tout << mk_ismt2_pp(args[i], m()) << "\n" << mk_pp(args[i]->get_sort(), m()) << "\n";); scoped_rlimit no_limit(m().limit(), 0); result = rev_subst()(_t, coerced_args); if (well_sorted_check_enabled() && !is_well_sorted(m(), result)) @@ -1649,7 +1649,7 @@ void cmd_context::push() { } void cmd_context::push(unsigned n) { - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) push(); } @@ -2123,7 +2123,7 @@ void cmd_context::complete_model(model_ref& md) const { } } - for (unsigned i = 0; i < md->get_num_functions(); i++) { + for (unsigned i = 0; i < md->get_num_functions(); ++i) { func_decl * f = md->get_function(i); func_interp * fi = md->get_func_interp(f); IF_VERBOSE(12, verbose_stream() << "(model.completion " << f->get_name() << ")\n"; ); @@ -2135,7 +2135,7 @@ void cmd_context::complete_model(model_ref& md) const { for (auto& [k, v] : m_func_decls) { IF_VERBOSE(12, verbose_stream() << "(model.completion " << k << ")\n"; ); - for (unsigned i = 0; i < v.get_num_entries(); i++) { + for (unsigned i = 0; i < v.get_num_entries(); ++i) { func_decl * f = v.get_entry(i); if (md->has_interpretation(f)) @@ -2338,14 +2338,14 @@ void cmd_context::set_solver_factory(solver_factory * f) { // assert formulas and create scopes in the new solver. unsigned lim = 0; for (scope& s : m_scopes) { - for (unsigned i = lim; i < s.m_assertions_lim; i++) { + for (unsigned i = lim; i < s.m_assertions_lim; ++i) { m_solver->assert_expr(m_assertions[i]); } lim = s.m_assertions_lim; m_solver->push(); } unsigned sz = m_assertions.size(); - for (unsigned i = lim; i < sz; i++) { + for (unsigned i = lim; i < sz; ++i) { m_solver->assert_expr(m_assertions[i]); } } @@ -2493,7 +2493,7 @@ void cmd_context::display_smt2_benchmark(std::ostream & out, unsigned num, expr out << "(set-logic " << logic << ")" << std::endl; // collect uninterpreted function declarations decl_collector decls(m()); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) decls.visit(assertions[i]); // TODO: display uninterpreted sort decls, and datatype decls. @@ -2503,7 +2503,7 @@ void cmd_context::display_smt2_benchmark(std::ostream & out, unsigned num, expr out << std::endl; } - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { out << "(assert "; display(out, assertions[i], 8); out << ")" << std::endl; diff --git a/src/cmd_context/extra_cmds/dbg_cmds.cpp b/src/cmd_context/extra_cmds/dbg_cmds.cpp index c8f5deb7d..d7316619f 100644 --- a/src/cmd_context/extra_cmds/dbg_cmds.cpp +++ b/src/cmd_context/extra_cmds/dbg_cmds.cpp @@ -246,7 +246,7 @@ UNARY_CMD(used_vars_cmd, "dbg-used-vars", "", "test used_vars functor", CP arg = to_quantifier(arg)->get_expr(); proc(arg); ctx.regular_stream() << "(vars"; - for (unsigned i = 0; i < proc.get_max_found_var_idx_plus_1(); i++) { + for (unsigned i = 0; i < proc.get_max_found_var_idx_plus_1(); ++i) { sort * s = proc.get(i); ctx.regular_stream() << "\n (" << std::left << std::setw(6) << i << " "; if (s != 0) diff --git a/src/cmd_context/extra_cmds/polynomial_cmds.cpp b/src/cmd_context/extra_cmds/polynomial_cmds.cpp index 1f4915ca5..5d0ee4261 100644 --- a/src/cmd_context/extra_cmds/polynomial_cmds.cpp +++ b/src/cmd_context/extra_cmds/polynomial_cmds.cpp @@ -67,7 +67,7 @@ static void factor(cmd_context & ctx, expr * t, polynomial::factor_params const ctx.regular_stream() << std::endl << f0; unsigned num_factors = fs.distinct_factors(); expr_ref f(ctx.m()); - for (unsigned i = 0; i < num_factors; i++) { + for (unsigned i = 0; i < num_factors; ++i) { ctx.regular_stream() << std::endl; if (fs.get_degree(i) > 1) ctx.regular_stream() << "(^ "; @@ -137,7 +137,7 @@ class poly_isolate_roots_cmd : public cmd { polynomial::var_vector xs; m_pm.vars(m_p, xs); unsigned num_assigned = 0; - for (unsigned i = 0; i < xs.size(); i++) { + for (unsigned i = 0; i < xs.size(); ++i) { if (m_x2v.contains(xs[i])) num_assigned++; } @@ -148,7 +148,7 @@ class poly_isolate_roots_cmd : public cmd { ctx.regular_stream() << "(roots"; pp_params params; bool pp_decimal = params.decimal(); - for (unsigned i = 0; i < rs.size(); i++) { + for (unsigned i = 0; i < rs.size(); ++i) { ctx.regular_stream() << std::endl; if (!pp_decimal) m_am.display_root_smt2(ctx.regular_stream(), rs[i]); diff --git a/src/cmd_context/pdecl.cpp b/src/cmd_context/pdecl.cpp index 722a66fff..8e0f4e878 100644 --- a/src/cmd_context/pdecl.cpp +++ b/src/cmd_context/pdecl.cpp @@ -196,7 +196,7 @@ class psort_app : public psort { m.inc_ref(d); m.inc_ref(num_args, args); SASSERT(num_args == m_decl->get_num_params() || m_decl->has_var_params()); - DEBUG_CODE(if (num_args == num_params) { for (unsigned i = 0; i < num_params; i++) args[i]->check_num_params(this); }); + DEBUG_CODE(if (num_args == num_params) { for (unsigned i = 0; i < num_params; ++i) args[i]->check_num_params(this); }); } void finalize(pdecl_manager & m) override { @@ -247,7 +247,7 @@ public: return false; SASSERT(m_args.size() == _other->m_args.size()); unsigned sz = m_args.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_args[i] != _other->m_args[i]) return false; } @@ -260,7 +260,7 @@ public: else { out << "(" << m_decl->get_name(); unsigned sz = m_args.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << " "; m_args[i]->display(out); } @@ -319,7 +319,7 @@ sort * psort_user_decl::instantiate(pdecl_manager & m, unsigned n, sort * const return r; if (m_def == nullptr) { buffer ps; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) ps.push_back(parameter(s[i])); r = m.m().mk_uninterpreted_sort(m_name, ps.size(), ps.data()); } @@ -334,7 +334,7 @@ sort * psort_user_decl::instantiate(pdecl_manager & m, unsigned n, sort * const void display_sort_args(std::ostream & out, unsigned num_params) { if (num_params > 0) out << " ("; - for (unsigned i = 0; i < num_params; i++) { + for (unsigned i = 0; i < num_params; ++i) { if (i > 0) out << " "; out << "s_" << i; } @@ -406,7 +406,7 @@ sort * psort_builtin_decl::instantiate(pdecl_manager & m, unsigned n, sort * con } else { buffer params; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) params.push_back(parameter(s[i])); sort * r = m.m().mk_sort(m_fid, m_kind, n, params.data()); m.save_info(r, this, n, s); @@ -422,7 +422,7 @@ sort * psort_builtin_decl::instantiate(pdecl_manager & m, unsigned n, unsigned c } else { buffer params; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) params.push_back(parameter(s[i])); sort * r = m.m().mk_sort(m_fid, m_kind, n, params.data()); m.save_info(r, this, n, s); @@ -720,7 +720,7 @@ sort* pdecl_manager::instantiate_datatype(psort_decl* p, symbol const& name, uns } buffer ps; ps.push_back(parameter(name)); - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) ps.push_back(parameter(s[i])); datatype_util util(m.m()); r = m.m().mk_sort(util.get_family_id(), DATATYPE_SORT, ps.size(), ps.data()); diff --git a/src/cmd_context/pdecl.h b/src/cmd_context/pdecl.h index 409172671..581059a87 100644 --- a/src/cmd_context/pdecl.h +++ b/src/cmd_context/pdecl.h @@ -345,11 +345,11 @@ public: void lazy_dec_ref(pdecl * p) { p->dec_ref(); if (p->get_ref_count() == 0) m_to_delete.push_back(p); } template - void lazy_dec_ref(unsigned num, T * const * ps) { for (unsigned i = 0; i < num; i++) lazy_dec_ref(ps[i]); } + void lazy_dec_ref(unsigned num, T * const * ps) { for (unsigned i = 0; i < num; ++i) lazy_dec_ref(ps[i]); } void inc_ref(pdecl * p) { if (p) { p->inc_ref(); } } void dec_ref(pdecl * p) { if (p) { lazy_dec_ref(p); del_decls(); } } template - void inc_ref(unsigned num, T * const * ps) { for (unsigned i = 0; i < num; i++) inc_ref(ps[i]); } + void inc_ref(unsigned num, T * const * ps) { for (unsigned i = 0; i < num; ++i) inc_ref(ps[i]); } template void dec_ref(unsigned num, T * const * ps) { lazy_dec_ref(num, ps); del_decls(); } psort_inst_cache * mk_inst_cache(unsigned num_params); diff --git a/src/cmd_context/simplifier_cmds.cpp b/src/cmd_context/simplifier_cmds.cpp index 291142b53..8189326cc 100644 --- a/src/cmd_context/simplifier_cmds.cpp +++ b/src/cmd_context/simplifier_cmds.cpp @@ -34,7 +34,7 @@ static simplifier_factory mk_and_then(cmd_context & ctx, sexpr * n) { if (num_children == 2) return sexpr2simplifier(ctx, n->get_child(1)); std::vector args; - for (unsigned i = 1; i < num_children; i++) + for (unsigned i = 1; i < num_children; ++i) args.push_back(sexpr2simplifier(ctx, n->get_child(i))); simplifier_factory result = [args](ast_manager& m, const params_ref& p, dependent_expr_state& st) { scoped_ptr s = alloc(then_simplifier, m, p, st); diff --git a/src/cmd_context/tactic_cmds.cpp b/src/cmd_context/tactic_cmds.cpp index 90b0cbae6..70532c2c4 100644 --- a/src/cmd_context/tactic_cmds.cpp +++ b/src/cmd_context/tactic_cmds.cpp @@ -330,7 +330,7 @@ public: bool print_dependencies = p.get_bool("print_dependencies", false); ctx.regular_stream() << "(goals\n"; unsigned sz = result_goals.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (print_dependencies) result_goals[i]->display_with_dependencies(ctx); else @@ -353,7 +353,7 @@ public: goal * fg = result_goals[0]; unsigned sz = fg->size(); ptr_buffer assertions; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { assertions.push_back(fg->form(i)); } ctx.display_smt2_benchmark(ctx.regular_stream(), assertions.size(), assertions.data()); @@ -362,7 +362,7 @@ public: // create a big OR expr_ref_buffer or_args(m); ptr_vector formulas; - for (unsigned i = 0; i < num_goals; i++) { + for (unsigned i = 0; i < num_goals; ++i) { formulas.reset(); result_goals[i]->get_formulas(formulas); if (formulas.size() == 1) @@ -407,7 +407,7 @@ static tactic * mk_and_then(cmd_context & ctx, sexpr * n) { if (num_children == 2) return sexpr2tactic(ctx, n->get_child(1)); tactic_ref_buffer args; - for (unsigned i = 1; i < num_children; i++) + for (unsigned i = 1; i < num_children; ++i) args.push_back(sexpr2tactic(ctx, n->get_child(i))); return and_then(args.size(), args.data()); } @@ -420,7 +420,7 @@ static tactic * mk_or_else(cmd_context & ctx, sexpr * n) { if (num_children == 2) return sexpr2tactic(ctx, n->get_child(1)); tactic_ref_buffer args; - for (unsigned i = 1; i < num_children; i++) + for (unsigned i = 1; i < num_children; ++i) args.push_back(sexpr2tactic(ctx, n->get_child(i))); return or_else(args.size(), args.data()); } @@ -433,7 +433,7 @@ static tactic * mk_par(cmd_context & ctx, sexpr * n) { if (num_children == 2) return sexpr2tactic(ctx, n->get_child(1)); tactic_ref_buffer args; - for (unsigned i = 1; i < num_children; i++) + for (unsigned i = 1; i < num_children; ++i) args.push_back(sexpr2tactic(ctx, n->get_child(i))); return par(args.size(), args.data()); } @@ -446,7 +446,7 @@ static tactic * mk_par_then(cmd_context & ctx, sexpr * n) { if (num_children == 2) return sexpr2tactic(ctx, n->get_child(1)); tactic_ref_buffer args; - for (unsigned i = 1; i < num_children; i++) + for (unsigned i = 1; i < num_children; ++i) args.push_back(sexpr2tactic(ctx, n->get_child(i))); return par_and_then(args.size(), args.data()); } @@ -580,7 +580,7 @@ static tactic * mk_echo(cmd_context & ctx, sexpr * n) { if (num_children < 2) throw cmd_exception("invalid echo tactic, must have at least one argument", n->get_line(), n->get_pos()); tactic_ref res; - for (unsigned i = 1; i < num_children; i++) { + for (unsigned i = 1; i < num_children; ++i) { sexpr * curr = n->get_child(i); bool last = (i == num_children - 1); tactic * t; diff --git a/src/math/grobner/grobner.cpp b/src/math/grobner/grobner.cpp index 61866a6fc..cf4e68916 100644 --- a/src/math/grobner/grobner.cpp +++ b/src/math/grobner/grobner.cpp @@ -126,7 +126,7 @@ void grobner::display_var(std::ostream & out, expr * var) const { } void grobner::display_vars(std::ostream & out, unsigned num_vars, expr * const * vars) const { - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { display_var(out, vars[i]); out << " "; } @@ -167,7 +167,7 @@ void grobner::display_monomial(std::ostream & out, monomial const & m, std::func void grobner::display_monomials(std::ostream & out, unsigned num_monomials, monomial * const * monomials, std::function& display_var) const { bool first = true; - for (unsigned i = 0; i < num_monomials; i++) { + for (unsigned i = 0; i < num_monomials; ++i) { monomial const * m = monomials[i]; if (first) first = false; @@ -277,7 +277,7 @@ inline void grobner::add_var(monomial * m, expr * v) { grobner::monomial * grobner::mk_monomial(rational const & coeff, unsigned num_vars, expr * const * vars) { monomial * r = alloc(monomial); r->m_coeff = coeff; - for (unsigned i = 0; i < num_vars; i++) + for (unsigned i = 0; i < num_vars; ++i) add_var(r, vars[i]); std::stable_sort(r->m_vars.begin(), r->m_vars.end(), m_var_lt); return r; @@ -341,7 +341,7 @@ void grobner::assert_eq_0(unsigned num_monomials, monomial * const * monomials, void grobner::assert_eq_0(unsigned num_monomials, rational const * coeffs, expr * const * monomials, v_dependency * ex) { #define MK_EQ(COEFF) \ ptr_vector ms; \ - for (unsigned i = 0; i < num_monomials; i++) \ + for (unsigned i = 0; i < num_monomials; ++i) \ ms.push_back(mk_monomial(COEFF, monomials[i])); \ std::stable_sort(ms.begin(), ms.end(), m_monomial_lt); \ merge_monomials(ms); \ @@ -473,14 +473,14 @@ void grobner::normalize_coeff(ptr_vector & monomials) { if (c.is_one()) return; if (c.is_minus_one()) { - for (unsigned i = 0; i < sz && m_manager.inc(); i++) + for (unsigned i = 0; i < sz && m_manager.inc(); ++i) monomials[i]->m_coeff.neg(); return; } if (c.bitsize() > 1000) return; - for (unsigned i = 0; i < sz && m_manager.inc(); i++) { + for (unsigned i = 0; i < sz && m_manager.inc(); ++i) { if (monomials[i]->m_coeff.bitsize() > 1000) continue; monomials[i]->m_coeff /= c; @@ -536,7 +536,7 @@ bool grobner::is_subset(monomial const * m1, monomial const * m2, ptr_vector= sz1) { - for (; i2 < sz2; i2++) + for (; i2 < sz2; ++i2) rest.push_back(m2->m_vars[i2]); TRACE(grobner, tout << "monomial: "; display_monomial(tout, *m1); tout << " is a subset of "; @@ -574,7 +574,7 @@ bool grobner::is_subset(monomial const * m1, monomial const * m2, ptr_vector const & vars, ptr_vector & result) { unsigned sz = source->get_num_monomials(); - for (unsigned i = start_idx; i < sz; i++) { + for (unsigned i = start_idx; i < sz; ++i) { monomial const * m = source->get_monomial(i); monomial * new_m = alloc(monomial); new_m->m_coeff = m->m_coeff; @@ -605,7 +605,7 @@ grobner::monomial * grobner::copy_monomial(monomial const * m) { grobner::equation * grobner::copy_equation(equation const * eq) { equation * r = alloc(equation); unsigned sz = eq->get_num_monomials(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) r->m_monomials.push_back(copy_monomial(eq->get_monomial(i))); init_equation(r, eq->m_dep); r->m_lc = eq->m_lc; @@ -636,7 +636,7 @@ grobner::equation * grobner::simplify(equation const * source, equation * target ptr_vector & new_monomials = m_tmp_monomials; new_monomials.reset(); ptr_vector & rest = m_tmp_vars1; - for (; i < sz; i++) { + for (; i < sz; ++i) { monomial * curr = target->m_monomials[i]; rest.reset(); if (is_subset(LT, curr, rest)) { @@ -828,7 +828,7 @@ bool grobner::unify(monomial const * m1, monomial const * m2, ptr_vector & while (true) { if (i1 >= sz1) { if (found_M) { - for (; i2 < sz2; i2++) + for (; i2 < sz2; ++i2) rest2.push_back(m2->m_vars[i2]); return true; } @@ -836,7 +836,7 @@ bool grobner::unify(monomial const * m1, monomial const * m2, ptr_vector & } if (i2 >= sz2) { if (found_M) { - for (; i1 < sz1; i1++) + for (; i1 < sz1; ++i1) rest1.push_back(m1->m_vars[i1]); return true; } diff --git a/src/math/interval/interval_def.h b/src/math/interval/interval_def.h index c0a3b54e2..934afecd8 100644 --- a/src/math/interval/interval_def.h +++ b/src/math/interval/interval_def.h @@ -384,7 +384,7 @@ template void interval_manager::fact(unsigned n, numeral & o) { _scoped_numeral aux(m()); m().set(o, 1); - for (unsigned i = 2; i <= n; i++) { + for (unsigned i = 2; i <= n; ++i) { m().set(aux, static_cast(i)); m().mul(aux, o, o); TRACE(fact_bug, tout << "i: " << i << ", o: " << m().to_rational_string(o) << "\n";); @@ -1901,7 +1901,7 @@ void interval_manager::pi(unsigned n, interval & r) { // compute lower bound numeral & l_val = m_result_lower; m().reset(l_val); - for (unsigned i = 0; i <= n; i++) { + for (unsigned i = 0; i <= n; ++i) { pi_series(i, p, false); round_to_minus_inf(); m().add(l_val, p, l_val); @@ -1916,7 +1916,7 @@ void interval_manager::pi(unsigned n, interval & r) { else { // recompute the sum rounding to plus infinite m().reset(u_val); - for (unsigned i = 0; i <= n; i++) { + for (unsigned i = 0; i <= n; ++i) { pi_series(i, p, true); round_to_plus_inf(); m().add(u_val, p, u_val); @@ -1954,7 +1954,7 @@ void interval_manager::e_series(unsigned k, bool upper, numeral & o) { _scoped_numeral d(m()), a(m()); m().set(o, 2); m().set(d, 1); - for (unsigned i = 2; i <= k; i++) { + for (unsigned i = 2; i <= k; ++i) { set_rounding(!upper); m().set(a, static_cast(i)); m().mul(d, a, d); // d == i! diff --git a/src/math/lp/core_solver_pretty_printer_def.h b/src/math/lp/core_solver_pretty_printer_def.h index cdd99932a..98f6f569f 100644 --- a/src/math/lp/core_solver_pretty_printer_def.h +++ b/src/math/lp/core_solver_pretty_printer_def.h @@ -59,7 +59,7 @@ core_solver_pretty_printer::core_solver_pretty_printer(const lp_core_solve template void core_solver_pretty_printer::init_costs() { - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { if (m_core_solver.m_basis_heading[i] < 0) { set_coeff(m_costs, m_cost_signs, i, m_core_solver.m_d[i], m_core_solver.column_name(i)); } @@ -69,7 +69,7 @@ template void core_solver_pretty_printer::init_co template void core_solver_pretty_printer::init_rs_width() { m_rs_width = static_cast(T_to_string(m_core_solver.get_cost()).size()); - for (unsigned i = 0; i < nrows(); i++) { + for (unsigned i = 0; i < nrows(); ++i) { unsigned wt = static_cast(T_to_string(m_rs[i]).size()); if (wt > m_rs_width) { m_rs_width = wt; @@ -78,7 +78,7 @@ template void core_solver_pretty_printer::init_rs } template void core_solver_pretty_printer::init_m_A_and_signs() { - for (unsigned column = 0; column < ncols(); column++) { + for (unsigned column = 0; column < ncols(); ++column) { vector t(nrows(), zero_of_type()); for (const auto & c : m_core_solver.m_A.m_columns[column]){ t[c.var()] = m_core_solver.m_A.get_val(c); @@ -108,7 +108,7 @@ template void core_solver_pretty_printer::init_m_ } template void core_solver_pretty_printer::init_column_widths() { - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { m_column_widths[i] = get_column_width(i); } } @@ -147,7 +147,7 @@ template unsigned core_solver_pretty_printer:: ge unsigned w = static_cast(std::max((size_t)m_costs[column].size(), T_to_string(m_core_solver.m_x[column]).size())); adjust_width_with_bounds(column, w); adjust_width_with_basis_heading(column, w); - for (unsigned i = 0; i < nrows(); i++) { + for (unsigned i = 0; i < nrows(); ++i) { unsigned cellw = static_cast(m_A[i][column].size()); if (cellw > w) { w = cellw; @@ -196,7 +196,7 @@ template void core_solver_pretty_printer::print_x print_blanks_local(blanks, m_out); auto bh = m_core_solver.m_x; - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { string s = T_to_string(bh[i]); int blanks = m_column_widths[i] - static_cast(s.size()); print_blanks_local(blanks, m_out); @@ -241,7 +241,7 @@ template void core_solver_pretty_printer::print_l m_out << m_lower_bounds_title; print_blanks_local(blanks, m_out); - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { string s = get_lower_bound_string(i); int blanks = m_column_widths[i] - static_cast(s.size()); print_blanks_local(blanks, m_out); @@ -258,7 +258,7 @@ template void core_solver_pretty_printer::print_u m_out << m_upp_bounds_title; print_blanks_local(blanks, m_out); - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { string s = get_upp_bound_string(i); int blanks = m_column_widths[i] - static_cast(s.size()); print_blanks_local(blanks, m_out); @@ -273,7 +273,7 @@ template void core_solver_pretty_printer::print_a } template void core_solver_pretty_printer::print() { - for (unsigned i = 0; i < nrows(); i++) { + for (unsigned i = 0; i < nrows(); ++i) { print_row(i); } m_out << std::endl; @@ -295,7 +295,7 @@ template void core_solver_pretty_printer::print_b return; } auto bh = m_core_solver.m_basis_heading; - for (unsigned i = 0; i < ncols(); i++) { + for (unsigned i = 0; i < ncols(); ++i) { string s = T_to_string(bh[i]); int blanks = m_column_widths[i] - static_cast(s.size()); print_blanks_local(blanks, m_out); @@ -320,7 +320,7 @@ bool string_is_trivial(const std::string & s) { } template void core_solver_pretty_printer::print_given_row(vector & row, vector & signs, X rst) { - for (unsigned col = 0; col < row.size(); col++) { + for (unsigned col = 0; col < row.size(); ++col) { unsigned width = m_column_widths[col]; string s = row[col]; if (m_squash_blanks && string_is_trivial(s)) diff --git a/src/math/lp/cross_nested.h b/src/math/lp/cross_nested.h index 192480226..e944be739 100644 --- a/src/math/lp/cross_nested.h +++ b/src/math/lp/cross_nested.h @@ -111,7 +111,7 @@ public: auto common_vars = get_vars_of_expr(ch[0]); for (lpvar j : common_vars) { bool divides_the_rest = true; - for (unsigned i = 1; i < ch.size() && divides_the_rest; i++) { + for (unsigned i = 1; i < ch.size() && divides_the_rest; ++i) { if (!ch[i]->contains(j)) divides_the_rest = false; } @@ -156,7 +156,7 @@ public: static void restore_front(const vector ©, vector& front) { SASSERT(copy.size() == front.size()); - for (unsigned i = 0; i < front.size(); i++) + for (unsigned i = 0; i < front.size(); ++i) *(front[i]) = copy[i]; } diff --git a/src/math/lp/dense_matrix.h b/src/math/lp/dense_matrix.h index ab1d92229..2d9d6c235 100644 --- a/src/math/lp/dense_matrix.h +++ b/src/math/lp/dense_matrix.h @@ -49,10 +49,10 @@ public: dense_matrix operator*=(matrix const & a) { SASSERT(column_count() == a.row_count()); dense_matrix c(row_count(), a.column_count()); - for (unsigned i = 0; i < row_count(); i++) { - for (unsigned j = 0; j < a.column_count(); j++) { + for (unsigned i = 0; i < row_count(); ++i) { + for (unsigned j = 0; j < a.column_count(); ++j) { T v = numeric_traits::zero(); - for (unsigned k = 0; k < a.column_count(); k++) { + for (unsigned k = 0; k < a.column_count(); ++k) { v += get_elem(i, k) * a(k, j); } c.set_elem(i, j, v); diff --git a/src/math/lp/dense_matrix_def.h b/src/math/lp/dense_matrix_def.h index 858d10eaa..3f8e5d8ff 100644 --- a/src/math/lp/dense_matrix_def.h +++ b/src/math/lp/dense_matrix_def.h @@ -34,7 +34,7 @@ dense_matrix::operator=(matrix const & other){ return *this; m_values = new T[m_m * m_n]; for (unsigned i = 0; i < m_m; i ++) - for (unsigned j = 0; j < m_n; j++) + for (unsigned j = 0; j < m_n; ++j) m_values[i * m_n + j] = other.get_elem(i, j); return *this; } @@ -47,7 +47,7 @@ dense_matrix::operator=(dense_matrix const & other){ m_n = other.m_n; m_values.resize(m_m * m_n); for (unsigned i = 0; i < m_m; i ++) - for (unsigned j = 0; j < m_n; j++) + for (unsigned j = 0; j < m_n; ++j) m_values[i * m_n + j] = other.get_elem(i, j); return *this; } @@ -56,8 +56,8 @@ template dense_matrix::dense_matrix(matrix m_m(other->row_count()), m_n(other->column_count()) { m_values.resize(m_m*m_n); - for (unsigned i = 0; i < m_m; i++) - for (unsigned j = 0; j < m_n; j++) + for (unsigned i = 0; i < m_m; ++i) + for (unsigned j = 0; j < m_n; ++j) m_values[i * m_n + j] = other->get_elem(i, j); } @@ -65,13 +65,13 @@ template void dense_matrix::apply_from_right(T * T * t = new T[m_m]; for (int i = 0; i < m_m; i ++) { T v = numeric_traits::zero(); - for (int j = 0; j < m_m; j++) { + for (int j = 0; j < m_m; ++j) { v += w[j]* get_elem(j, i); } t[i] = v; } - for (int i = 0; i < m_m; i++) { + for (int i = 0; i < m_m; ++i) { w[i] = t[i]; } delete [] t; @@ -81,11 +81,11 @@ template void dense_matrix::apply_from_right(vect vector t(m_m, numeric_traits::zero()); for (unsigned i = 0; i < m_m; i ++) { auto & v = t[i]; - for (unsigned j = 0; j < m_m; j++) + for (unsigned j = 0; j < m_m; ++j) v += w[j]* get_elem(j, i); } - for (unsigned i = 0; i < m_m; i++) + for (unsigned i = 0; i < m_m; ++i) w[i] = t[i]; } @@ -94,7 +94,7 @@ apply_from_left_with_different_dims(vector & w) { T * t = new T[m_m]; for (int i = 0; i < m_m; i ++) { T v = numeric_traits::zero(); - for (int j = 0; j < m_n; j++) { + for (int j = 0; j < m_n; ++j) { v += w[j]* get_elem(i, j); } t[i] = v; @@ -107,7 +107,7 @@ template void dense_matrix::apply_from_left(vecto T * t = new T[m_m]; for (unsigned i = 0; i < m_m; i ++) { T v = numeric_traits::zero(); - for (unsigned j = 0; j < m_m; j++) { + for (unsigned j = 0; j < m_m; ++j) { v += w[j]* get_elem(i, j); } t[i] = v; @@ -123,7 +123,7 @@ template void dense_matrix::apply_from_left(X * w T * t = new T[m_m]; for (int i = 0; i < m_m; i ++) { T v = numeric_traits::zero(); - for (int j = 0; j < m_m; j++) { + for (int j = 0; j < m_m; ++j) { v += w[j]* get_elem(i, j); } t[i] = v; @@ -139,7 +139,7 @@ template void dense_matrix::apply_from_left_to_X( vector t(m_m); for (int i = 0; i < m_m; i ++) { X v = zero_of_type(); - for (int j = 0; j < m_m; j++) { + for (int j = 0; j < m_m; ++j) { v += w[j]* get_elem(i, j); } t[i] = v; @@ -152,7 +152,7 @@ template void dense_matrix::apply_from_left_to_X( template void dense_matrix::swap_columns(unsigned a, unsigned b) { - for (unsigned i = 0; i < m_m; i++) { + for (unsigned i = 0; i < m_m; ++i) { T t = get_elem(i, a); set_elem(i, a, get_elem(i, b)); set_elem(i, b, t); @@ -160,7 +160,7 @@ template void dense_matrix::swap_columns(unsigned } template void dense_matrix::swap_rows(unsigned a, unsigned b) { - for (unsigned i = 0; i < m_n; i++) { + for (unsigned i = 0; i < m_n; ++i) { T t = get_elem(a, i); set_elem(a, i, get_elem(b, i)); set_elem(b, i, t); @@ -168,7 +168,7 @@ template void dense_matrix::swap_rows(unsigned a, } template void dense_matrix::multiply_row_by_constant(unsigned row, T & t) { - for (unsigned i = 0; i < m_n; i++) { + for (unsigned i = 0; i < m_n; ++i) { set_elem(row, i, t * get_elem(row, i)); } } @@ -177,8 +177,8 @@ template dense_matrix operator* (matrix & a, matrix & b){ SASSERT(a.column_count() == b.row_count()); dense_matrix ret(a.row_count(), b.column_count()); - for (unsigned i = 0; i < ret.m_m; i++) - for (unsigned j = 0; j< ret.m_n; j++) { + for (unsigned i = 0; i < ret.m_m; ++i) + for (unsigned j = 0; j< ret.m_n; ++j) { T v = numeric_traits::zero(); for (unsigned k = 0; k < a.column_count(); k ++){ v += (a.get_elem(i, k) * b.get_elem(k, j)); diff --git a/src/math/lp/dioph_eq.cpp b/src/math/lp/dioph_eq.cpp index 4b48e473e..369306973 100644 --- a/src/math/lp/dioph_eq.cpp +++ b/src/math/lp/dioph_eq.cpp @@ -261,7 +261,7 @@ namespace lp { std::ostream& print_S(std::ostream& out) { out << "S:\n"; - for (unsigned ei = 0 ; ei < m_e_matrix.row_count(); ei++) { + for (unsigned ei = 0 ; ei < m_e_matrix.row_count(); ++ei) { print_entry(ei, out, false, false, true); } return out; @@ -468,7 +468,7 @@ namespace lp { bool invariant() const { // 1. For each j in [0..m_index.size()), if m_index[j] = -1, ensure no m_data[k].var() == j // otherwise verify m_data[m_index[j]].var() == j - for (unsigned j = 0; j < m_index.size(); j++) { + for (unsigned j = 0; j < m_index.size(); ++j) { int idx = m_index[j]; if (idx == -1) { // Check that j is not in m_data @@ -690,7 +690,7 @@ namespace lp { auto& column = m_l_matrix.m_columns[j]; int pivot_col_cell_index = -1; - for (unsigned k = 0; k < column.size(); k++) { + for (unsigned k = 0; k < column.size(); ++k) { if (column[k].var() == last_row_index) { pivot_col_cell_index = k; break; @@ -1135,7 +1135,7 @@ namespace lp { bool entries_are_ok() { if (lra.settings().get_cancel_flag()) return true; - for (unsigned ei = 0; ei < m_e_matrix.row_count(); ei++) { + for (unsigned ei = 0; ei < m_e_matrix.row_count(); ++ei) { if (entry_invariant(ei) == false) { TRACE(dio, tout << "bad entry:"; print_entry(ei, tout);); return false; @@ -1909,7 +1909,7 @@ namespace lp { } void fill_f_vector(std_vector & f_vector) { - for (unsigned ei = 0; ei < m_e_matrix.row_count(); ei++) { + for (unsigned ei = 0; ei < m_e_matrix.row_count(); ++ei) { if (belongs_to_s(ei)) continue; if (m_e_matrix.m_rows[ei].size() == 0) { if (m_sum_of_fixed[ei].is_zero()) { @@ -2011,7 +2011,7 @@ namespace lp { bool columns_to_terms_is_correct() const { std::unordered_map> c2t; - for (unsigned k = 0; k < lra.terms().size(); k++) { + for (unsigned k = 0; k < lra.terms().size(); ++k) { const lar_term* t = lra.terms()[k]; if (!lia.column_is_int(t->j())) continue; SASSERT(t->j() != UINT_MAX); @@ -2059,7 +2059,7 @@ namespace lp { return true; } bool is_in_sync() const { - for (unsigned j = 0; j < m_e_matrix.column_count(); j++) { + for (unsigned j = 0; j < m_e_matrix.column_count(); ++j) { unsigned external_j = m_var_register.local_to_external(j); if (external_j == UINT_MAX) continue; @@ -2069,7 +2069,7 @@ namespace lp { } - for (unsigned ei = 0; ei < m_e_matrix.row_count(); ei++) { + for (unsigned ei = 0; ei < m_e_matrix.row_count(); ++ei) { auto it = m_row2fresh_defs.find(ei); if (it != m_row2fresh_defs.end()) { for (unsigned xt : it->second) { @@ -2212,7 +2212,7 @@ namespace lp { } bool is_eliminated_from_f(unsigned j) const { - for (unsigned ei = 0; ei < m_e_matrix.row_count(); ei++) { + for (unsigned ei = 0; ei < m_e_matrix.row_count(); ++ei) { if (!belongs_to_f(ei)) continue; const auto& row = m_e_matrix.m_rows[ei]; @@ -2488,7 +2488,7 @@ namespace lp { int kh_sign = 0; // the initial values of kh_sign and h_markovich_number do not matter, assign to remove the warning unsigned h_markovich_number = 0; unsigned ih = -1; // f_vector[ih] = h - for (unsigned i = 0; i < f_vector.size(); i++) { + for (unsigned i = 0; i < f_vector.size(); ++i) { unsigned ei = f_vector[i]; SASSERT (belongs_to_f(ei)); if (m_e_matrix.m_rows[ei].size() == 0) { diff --git a/src/math/lp/emonics.cpp b/src/math/lp/emonics.cpp index afceade0c..5661bf325 100644 --- a/src/math/lp/emonics.cpp +++ b/src/math/lp/emonics.cpp @@ -517,7 +517,7 @@ bool emonics::invariant() const { TRACE(nla_solver_mons, display(tout);); // the variable index contains exactly the active monomials unsigned mons = 0; - for (lpvar v = 0; v < m_var2index.size(); v++) + for (lpvar v = 0; v < m_var2index.size(); ++v) if (is_monic_var(v)) mons++; diff --git a/src/math/lp/factorization.cpp b/src/math/lp/factorization.cpp index 89c16ec91..2f4f0e86b 100644 --- a/src/math/lp/factorization.cpp +++ b/src/math/lp/factorization.cpp @@ -15,7 +15,7 @@ void const_iterator_mon::init_vars_by_the_mask(unsigned_vector & k_vars, unsigne // the last element for m_factorization.m_rooted_vars goes to k_vars SASSERT(m_mask.size() + 1 == m_ff->m_vars.size()); k_vars.push_back(m_ff->m_vars.back()); - for (unsigned j = 0; j < m_mask.size(); j++) { + for (unsigned j = 0; j < m_mask.size(); ++j) { if (m_mask[j]) k_vars.push_back(m_ff->m_vars[j]); else diff --git a/src/math/lp/general_matrix.h b/src/math/lp/general_matrix.h index 87a79ec27..3d91ed9c1 100644 --- a/src/math/lp/general_matrix.h +++ b/src/math/lp/general_matrix.h @@ -75,8 +75,8 @@ public: unsigned m = row_count(); unsigned n = column_count(); general_matrix g(m, n); - for (unsigned i = 0; i < m; i++) - for (unsigned j = 0; j < n; j++) + for (unsigned i = 0; i < m; ++i) + for (unsigned j = 0; j < n; ++j) g[i][j] = (*this)[i][j]; print_matrix(g.m_data, out, blanks); } @@ -88,8 +88,8 @@ public: void print_submatrix(std::ostream & out, unsigned k, unsigned blanks = 0) const { general_matrix m(row_count() - k, column_count() - k); - for (unsigned i = k; i < row_count(); i++) { - for (unsigned j = k; j < column_count(); j++) + for (unsigned i = k; i < row_count(); ++i) { + for (unsigned j = k; j < column_count(); ++j) m[i-k][j-k] = (*this)[i][j]; } print_matrix(m.m_data, out, blanks); @@ -118,9 +118,9 @@ public: SASSERT(m.row_count() == column_count()); general_matrix ret(row_count(), m.column_count()); for (unsigned i = 0; i < row_count(); i ++) { - for (unsigned j = 0; j < m.column_count(); j++) { + for (unsigned j = 0; j < m.column_count(); ++j) { mpq a(0); - for (unsigned k = 0; k < column_count(); k++) + for (unsigned k = 0; k < column_count(); ++k) a += ((*this)[i][k])*m[k][j]; ret[i][j] = a; } @@ -129,16 +129,16 @@ public: } bool elements_are_equal(const general_matrix& m) const { - for (unsigned i = 0; i < row_count(); i++) - for (unsigned j = 0; j < column_count(); j++) + for (unsigned i = 0; i < row_count(); ++i) + for (unsigned j = 0; j < column_count(); ++j) if ( (*this)[i][j] != m[i][j]) return false; return true; } bool elements_are_equal_modulo(const general_matrix& m, const mpq & d) const { - for (unsigned i = 0; i < row_count(); i++) - for (unsigned j = 0; j < column_count(); j++) + for (unsigned i = 0; i < row_count(); ++i) + for (unsigned j = 0; j < column_count(); ++j) if (!is_zero(((*this)[i][j] - m[i][j]) % d)) return false; return true; @@ -159,9 +159,9 @@ public: vector operator*(const vector & x) const { vector r; SASSERT(x.size() == column_count()); - for (unsigned i = 0; i < row_count(); i++) { + for (unsigned i = 0; i < row_count(); ++i) { mpq v(0); - for (unsigned j = 0; j < column_count(); j++) { + for (unsigned j = 0; j < column_count(); ++j) { v += (*this)[i][j] * x[j]; } r.push_back(v); @@ -214,8 +214,8 @@ public: if (n == column_count()) return *this; general_matrix ret(row_count(), n); - for (unsigned i = 0; i < row_count(); i++) - for (unsigned j = 0; j < n; j++) + for (unsigned i = 0; i < row_count(); ++i) + for (unsigned j = 0; j < n; ++j) ret[i][j] = (*this)[i][j]; return ret; } @@ -224,7 +224,7 @@ public: vector r(a.column_count()); for (unsigned j = 0; j < a.column_count(); j ++) { mpq t = zero_of_type(); - for (unsigned i = 0; i < a.row_count(); i++) { + for (unsigned i = 0; i < a.row_count(); ++i) { t += f[i] * a[i][j]; } r[j] = t; diff --git a/src/math/lp/hnf.h b/src/math/lp/hnf.h index 51dd88779..a315339ba 100644 --- a/src/math/lp/hnf.h +++ b/src/math/lp/hnf.h @@ -109,8 +109,8 @@ void extended_gcd_minimal_uv(const mpq & a, const mpq & b, mpq & d, mpq & u, mpq template bool prepare_pivot_for_lower_triangle(M &m, unsigned r) { - for (unsigned i = r; i < m.row_count(); i++) { - for (unsigned j = r; j < m.column_count(); j++) { + for (unsigned i = r; i < m.row_count(); ++i) { + for (unsigned j = r; j < m.column_count(); ++j) { if (!is_zero(m[i][j])) { if (i != r) { m.transpose_rows(i, r); @@ -128,8 +128,8 @@ bool prepare_pivot_for_lower_triangle(M &m, unsigned r) { template void pivot_column_non_fractional(M &m, unsigned r, bool & overflow, const mpq & big_number) { SASSERT(!is_zero(m[r][r])); - for (unsigned j = r + 1; j < m.column_count(); j++) { - for (unsigned i = r + 1; i < m.row_count(); i++) { + for (unsigned j = r + 1; j < m.column_count(); ++j) { + for (unsigned i = r + 1; i < m.row_count(); ++i) { if ( (m[i][j] = (r > 0) ? (m[r][r]*m[i][j] - m[i][r]*m[r][j]) / m[r-1][r-1] : (m[r][r]*m[i][j] - m[i][r]*m[r][j])) @@ -146,7 +146,7 @@ void pivot_column_non_fractional(M &m, unsigned r, bool & overflow, const mpq & template unsigned to_lower_triangle_non_fractional(M &m, bool & overflow, const mpq& big_number) { unsigned i = 0; - for (; i < m.row_count(); i++) { + for (; i < m.row_count(); ++i) { if (!prepare_pivot_for_lower_triangle(m, i)) { return i; } @@ -163,13 +163,13 @@ template mpq gcd_of_row_starting_from_diagonal(const M& m, unsigned i) { mpq g = zero_of_type(); unsigned j = i; - for (; j < m.column_count() && is_zero(g); j++) { + for (; j < m.column_count() && is_zero(g); ++j) { const auto & t = m[i][j]; if (!is_zero(t)) g = abs(t); } SASSERT(!is_zero(g)); - for (; j < m.column_count(); j++) { + for (; j < m.column_count(); ++j) { const auto & t = m[i][j]; if (!is_zero(t)) g = gcd(g, t); @@ -193,7 +193,7 @@ mpq determinant_of_rectangular_matrix(const M& m, svector & basis_rows if (rank == 0) return one_of_type(); - for (unsigned i = 0; i < rank; i++) { + for (unsigned i = 0; i < rank; ++i) { basis_rows.push_back(m_copy.adjust_row(i)); } TRACE(hnf_calc, tout << "basis_rows = "; print_vector(basis_rows, tout); m_copy.print(tout, "m_copy = ");); @@ -236,13 +236,13 @@ class hnf { #ifdef Z3DEBUG void buffer_p_col_i_plus_q_col_j_H(const mpq & p, unsigned i, const mpq & q, unsigned j) { - for (unsigned k = i; k < m_m; k++) { + for (unsigned k = i; k < m_m; ++k) { m_buffer[k] = p * m_H[k][i] + q * m_H[k][j]; } } #endif bool zeros_in_column_W_above(unsigned i) { - for (unsigned k = 0; k < i; k++) + for (unsigned k = 0; k < i; ++k) if (!is_zero(m_W[k][i])) return false; return true; @@ -250,13 +250,13 @@ class hnf { void buffer_p_col_i_plus_q_col_j_W_modulo(const mpq & p, const mpq & q) { SASSERT(zeros_in_column_W_above(m_i)); - for (unsigned k = m_i; k < m_m; k++) { + for (unsigned k = m_i; k < m_m; ++k) { m_buffer[k] = mod_R_balanced(mod_R_balanced(p * m_W[k][m_i]) + mod_R_balanced(q * m_W[k][m_j])); } } #ifdef Z3DEBUG void buffer_p_col_i_plus_q_col_j_U(const mpq & p, unsigned i, const mpq & q, unsigned j) { - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_buffer[k] = p * m_U[k][i] + q * m_U[k][j]; } } @@ -284,12 +284,12 @@ class hnf { } void copy_buffer_to_col_i_H(unsigned i) { - for (unsigned k = i; k < m_m; k++) { + for (unsigned k = i; k < m_m; ++k) { m_H[k][i] = m_buffer[k]; } } void copy_buffer_to_col_i_U(unsigned i) { - for (unsigned k = 0; k < m_n; k++) + for (unsigned k = 0; k < m_n; ++k) m_U[k][i] = m_buffer[k]; } @@ -301,17 +301,17 @@ class hnf { void multiply_U_reverse_from_left_by(unsigned i, unsigned j, const mpq & a, const mpq & b, const mpq & c, const mpq d) { // the new i-th row goes to the buffer - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_buffer[k] = a * m_U_reverse[i][k] + b * m_U_reverse[j][k]; } // calculate the new j-th row in place - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_U_reverse[j][k] = c * m_U_reverse[i][k] + d * m_U_reverse[j][k]; } // copy the buffer into i-th row - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_U_reverse[i][k] = m_buffer[k]; } } @@ -346,13 +346,13 @@ class hnf { void switch_sign_for_column(unsigned i) { - for (unsigned k = i; k < m_m; k++) + for (unsigned k = i; k < m_m; ++k) m_H[k][i].neg(); - for (unsigned k = 0; k < m_n; k++) + for (unsigned k = 0; k < m_n; ++k) m_U[k][i].neg(); // switch sign for the i-th row in the reverse m_U_reverse - for (unsigned k = 0; k < m_n; k++) + for (unsigned k = 0; k < m_n; ++k) m_U_reverse[i][k].neg(); } @@ -365,14 +365,14 @@ class hnf { void replace_column_j_by_j_minus_u_col_i_H(unsigned i, unsigned j, const mpq & u) { SASSERT(j < i); - for (unsigned k = i; k < m_m; k++) { + for (unsigned k = i; k < m_m; ++k) { m_H[k][j] -= u * m_H[k][i]; } } void replace_column_j_by_j_minus_u_col_i_U(unsigned i, unsigned j, const mpq & u) { SASSERT(j < i); - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_U[k][j] -= u * m_U[k][i]; } // Here we multiply from m_U from the right by the matrix ( 1, 0) @@ -380,7 +380,7 @@ class hnf { // To adjust the reverse we multiply it from the left by (1, 0) // (u, 1) - for (unsigned k = 0; k < m_n; k++) { + for (unsigned k = 0; k < m_n; ++k) { m_U_reverse[i][k] += u * m_U_reverse[j][k]; } @@ -390,7 +390,7 @@ class hnf { void work_on_columns_less_than_i_in_the_triangle(unsigned i) { const mpq & mii = m_H[i][i]; if (is_zero(mii)) return; - for (unsigned j = 0; j < i; j++) { + for (unsigned j = 0; j < i; ++j) { const mpq & mij = m_H[i][j]; if (!is_pos(mij) && - mij < mii) continue; @@ -401,7 +401,7 @@ class hnf { } void process_row(unsigned i) { - for (unsigned j = i + 1; j < m_n; j++) { + for (unsigned j = i + 1; j < m_n; ++j) { process_row_column(i, j); } if (i >= m_n) { @@ -415,14 +415,14 @@ class hnf { } void calculate() { - for (unsigned i = 0; i < m_m; i++) { + for (unsigned i = 0; i < m_m; ++i) { process_row(i); } } void prepare_U_and_U_reverse() { m_U = M(m_H.column_count()); - for (unsigned i = 0; i < m_U.column_count(); i++) + for (unsigned i = 0; i < m_U.column_count(); ++i) m_U[i][i] = 1; m_U_reverse = m_U; @@ -436,7 +436,7 @@ class hnf { const mpq& hii = m_H[i][i]; if (is_neg(hii)) return false; - for (unsigned j = 0; j < i; j++) { + for (unsigned j = 0; j < i; ++j) { const mpq & hij = m_H[i][j]; if (is_pos(hij)) return false; @@ -448,7 +448,7 @@ class hnf { } bool is_correct_form() const { - for (unsigned i = 0; i < m_m; i++) + for (unsigned i = 0; i < m_m; ++i) if (!row_is_correct_form(i)) return false; return true; @@ -483,14 +483,14 @@ public: private: #endif void copy_buffer_to_col_i_W_modulo() { - for (unsigned k = m_i; k < m_m; k++) { + for (unsigned k = m_i; k < m_m; ++k) { m_W[k][m_i] = m_buffer[k]; } } void replace_column_j_by_j_minus_u_col_i_W(unsigned j, const mpq & u) { SASSERT(j < m_i); - for (unsigned k = m_i; k < m_m; k++) { + for (unsigned k = m_i; k < m_m; ++k) { m_W[k][j] -= u * m_W[k][m_i]; // m_W[k][j] = mod_R_balanced(m_W[k][j]); } @@ -501,7 +501,7 @@ private: unsigned n = u.column_count(); if (m != n) return false; for (unsigned i = 0; i < m; i ++) - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { if (i == j) { if (one_of_type() != u[i][j]) return false; @@ -549,13 +549,13 @@ private: SASSERT(is_pos(mii)); // adjust column m_i - for (unsigned k = m_i + 1; k < m_m; k++) { + for (unsigned k = m_i + 1; k < m_m; ++k) { m_W[k][m_i] *= u; m_W[k][m_i] = mod_R_balanced(m_W[k][m_i]); } SASSERT(is_pos(mii)); - for (unsigned j = 0; j < m_i; j++) { + for (unsigned j = 0; j < m_i; ++j) { const mpq & mij = m_W[m_i][j]; if (!is_pos(mij) && - mij < mii) continue; @@ -566,7 +566,7 @@ private: void process_row_modulo() { - for (m_j = m_i + 1; m_j < m_n; m_j++) { + for (m_j = m_i + 1; m_j < m_n; ++m_j) { process_column_in_row_modulo(); } fix_row_under_diagonal_W_modulo(); diff --git a/src/math/lp/hnf_cutter.cpp b/src/math/lp/hnf_cutter.cpp index 423a34613..1712371f8 100644 --- a/src/math/lp/hnf_cutter.cpp +++ b/src/math/lp/hnf_cutter.cpp @@ -67,15 +67,15 @@ namespace lp { void hnf_cutter::init_matrix_A() { m_A = general_matrix(terms_count(), vars().size()); - for (unsigned i = 0; i < terms_count(); i++) + for (unsigned i = 0; i < terms_count(); ++i) initialize_row(i); } // todo: as we need only one row i with non integral b[i] need to optimize later void hnf_cutter::find_h_minus_1_b(const general_matrix& H, vector & b) { // the solution will be put into b - for (unsigned i = 0; i < H.row_count() ;i++) { - for (unsigned j = 0; j < i; j++) { + for (unsigned i = 0; i < H.row_count() ;++i) { + for (unsigned j = 0; j < i; ++j) { b[i] -= H[i][j]*b[j]; } b[i] /= H[i][i]; @@ -95,7 +95,7 @@ namespace lp { int hnf_cutter::find_cut_row_index(const vector & b) { int ret = -1; int n = 0; - for (int i = 0; i < static_cast(b.size()); i++) { + for (int i = 0; i < static_cast(b.size()); ++i) { if (is_integer(b[i])) continue; if (n == 0) { @@ -114,13 +114,13 @@ namespace lp { // we solve x = ei * H_min_1 // or x * H = ei unsigned m = H.row_count(); - for (unsigned k = i + 1; k < m; k++) { + for (unsigned k = i + 1; k < m; ++k) { row[k] = zero_of_type(); } row[i] = one_of_type() / H[i][i]; for(int k = i - 1; k >= 0; k--) { mpq t = zero_of_type(); - for (unsigned l = k + 1; l <= i; l++) { + for (unsigned l = k + 1; l <= i; ++l) { t += H[l][k]*row[l]; } row[k] = -t / H[k][k]; @@ -128,7 +128,7 @@ namespace lp { } void hnf_cutter::fill_term(const vector & row, lar_term& t) { - for (unsigned j = 0; j < row.size(); j++) { + for (unsigned j = 0; j < row.size(); ++j) { if (!is_zero(row[j])) t.add_monomial(row[j], m_var_register.local_to_external(j)); } @@ -136,7 +136,7 @@ namespace lp { #ifdef Z3DEBUG vector hnf_cutter::transform_to_local_columns(const vector & x) const { vector ret; - for (unsigned j = 0; j < vars().size(); j++) { + for (unsigned j = 0; j < vars().size(); ++j) { ret.push_back(x[m_var_register.local_to_external(j)].x); } return ret; diff --git a/src/math/lp/horner.cpp b/src/math/lp/horner.cpp index 89c528a9d..fffb4357c 100644 --- a/src/math/lp/horner.cpp +++ b/src/math/lp/horner.cpp @@ -122,7 +122,7 @@ bool horner::horner_lemmas() { unsigned r = c().random(); unsigned sz = rows.size(); bool conflict = false; - for (unsigned i = 0; i < sz && !conflict; i++) { + for (unsigned i = 0; i < sz && !conflict; ++i) { m_row_index = rows[(i + r) % sz]; if (lemmas_on_row(matrix.m_rows[m_row_index])) { c().lp_settings().stats().m_horner_conflicts++; diff --git a/src/math/lp/indexed_vector_def.h b/src/math/lp/indexed_vector_def.h index 724a08c28..52cb209ca 100644 --- a/src/math/lp/indexed_vector_def.h +++ b/src/math/lp/indexed_vector_def.h @@ -26,7 +26,7 @@ namespace lp { void print_vector_as_doubles(const vector & t, std::ostream & out) { - for (unsigned i = 0; i < t.size(); i++) + for (unsigned i = 0; i < t.size(); ++i) out << t[i].get_double() << std::setprecision(3) << " "; out << std::endl; } @@ -75,7 +75,7 @@ void indexed_vector::erase(unsigned j) { template void indexed_vector::print(std::ostream & out) { out << "m_index " << std::endl; - for (unsigned i = 0; i < m_index.size(); i++) { + for (unsigned i = 0; i < m_index.size(); ++i) { out << m_index[i] << " "; } out << std::endl; diff --git a/src/math/lp/int_branch.cpp b/src/math/lp/int_branch.cpp index c7b02960f..a82d4500b 100644 --- a/src/math/lp/int_branch.cpp +++ b/src/math/lp/int_branch.cpp @@ -70,7 +70,7 @@ int int_branch::find_inf_int_base_column() { // this loop looks for a column with the most usages, but breaks when // a column with a small span of bounds is found - for (; k < lra.r_basis().size(); k++) { + for (; k < lra.r_basis().size(); ++k) { j = lra.r_basis()[k]; if (!lia.column_is_int_inf(j)) continue; @@ -92,7 +92,7 @@ int int_branch::find_inf_int_base_column() { } SASSERT(k == lra.r_basis().size() || n == 1); // this loop looks for boxed columns with a small span - for (; k < lra.r_basis().size(); k++) { + for (; k < lra.r_basis().size(); ++k) { j = lra.r_basis()[k]; if (!lia.column_is_int_inf(j) || !lia.is_boxed(j)) continue; diff --git a/src/math/lp/int_cube.cpp b/src/math/lp/int_cube.cpp index da7cfb6aa..aad7fae6e 100644 --- a/src/math/lp/int_cube.cpp +++ b/src/math/lp/int_cube.cpp @@ -27,7 +27,7 @@ namespace lp { lia_move int_cube::operator()() { lia.settings().stats().m_cube_calls++; TRACE(cube, - for (unsigned j = 0; j < lra.number_of_vars(); j++) + for (unsigned j = 0; j < lra.number_of_vars(); ++j) lia.display_column(tout, j); tout << lra.constraints(); ); diff --git a/src/math/lp/int_gcd_test.cpp b/src/math/lp/int_gcd_test.cpp index 012dd3a0a..3ee34cb05 100644 --- a/src/math/lp/int_gcd_test.cpp +++ b/src/math/lp/int_gcd_test.cpp @@ -77,7 +77,7 @@ namespace lp { bool int_gcd_test::gcd_test() { reset_test(); const auto & A = lra.A_r(); // getting the matrix - for (unsigned i = 0; i < A.row_count(); i++) { + for (unsigned i = 0; i < A.row_count(); ++i) { unsigned basic_var = lra.r_basis()[i]; if (!lia.column_is_int(basic_var)) continue; diff --git a/src/math/lp/int_solver.cpp b/src/math/lp/int_solver.cpp index 51247e39d..cf0878597 100644 --- a/src/math/lp/int_solver.cpp +++ b/src/math/lp/int_solver.cpp @@ -127,7 +127,7 @@ namespace lp { bool all_columns_are_integral() const { return true; // otherwise it never returns true! - for (lpvar j = 0; j < lra.number_of_vars(); j++) + for (lpvar j = 0; j < lra.number_of_vars(); ++j) if (!lra.column_is_int(j)) return false; return true; @@ -449,14 +449,14 @@ namespace lp { std::ostream& int_solver::display_inf_rows(std::ostream& out) const { unsigned num = lra.A_r().column_count(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { if (column_is_int(v) && !get_value(v).is_int()) { display_column(out, v); } } num = 0; - for (unsigned i = 0; i < lra.A_r().row_count(); i++) { + for (unsigned i = 0; i < lra.A_r().row_count(); ++i) { unsigned j = lrac.m_r_basis[i]; if (column_is_int_inf(j)) { num++; diff --git a/src/math/lp/lar_constraints.h b/src/math/lp/lar_constraints.h index 7b9acaf97..4ad064489 100644 --- a/src/math/lp/lar_constraints.h +++ b/src/math/lp/lar_constraints.h @@ -206,7 +206,7 @@ public: unsigned m_index; iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } void next() { ++m_index; forward(); } - void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; } + void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); ++m_index) ; } public: lar_base_constraint const& operator*() { return cs[m_index]; } lar_base_constraint const* operator->() const { return &cs[m_index]; } @@ -231,7 +231,7 @@ public: unsigned m_index; iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } void next() { ++m_index; forward(); } - void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; } + void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); ++m_index) ; } public: constraint_index operator*() { return m_index; } constraint_index const* operator->() const { return &m_index; } diff --git a/src/math/lp/lar_core_solver.h b/src/math/lp/lar_core_solver.h index 552874cec..1773317be 100644 --- a/src/math/lp/lar_core_solver.h +++ b/src/math/lp/lar_core_solver.h @@ -144,7 +144,7 @@ public: for (unsigned j : m_r_solver.m_basis) { SASSERT(m_r_solver.m_A.m_columns[j].size() == 1); } - for (unsigned j =0; j < m_r_solver.m_basis_heading.size(); j++) { + for (unsigned j =0; j < m_r_solver.m_basis_heading.size(); ++j) { if (m_r_solver.m_basis_heading[j] >= 0) continue; if (m_r_solver.m_column_types[j] == column_type::fixed) continue; SASSERT(static_cast(- m_r_solver.m_basis_heading[j] - 1) < m_r_solver.m_column_types.size()); @@ -199,7 +199,7 @@ public: mpq find_delta_for_strict_boxed_bounds() const{ mpq delta = numeric_traits::one(); - for (unsigned j = 0; j < m_r_A.column_count(); j++ ) { + for (unsigned j = 0; j < m_r_A.column_count(); ++j ) { if (m_column_types()[j] != column_type::boxed) continue; update_delta(delta, m_r_lower_bounds[j], m_r_upper_bounds[j]); @@ -210,7 +210,7 @@ public: mpq find_delta_for_strict_bounds(const mpq & initial_delta) const{ mpq delta = initial_delta; - for (unsigned j = 0; j < m_r_A.column_count(); j++ ) { + for (unsigned j = 0; j < m_r_A.column_count(); ++j ) { if (lower_bound_is_set(j)) update_delta(delta, m_r_lower_bounds[j], m_r_x[j]); if (upper_bound_is_set(j)) diff --git a/src/math/lp/lar_core_solver_def.h b/src/math/lp/lar_core_solver_def.h index 64138e9ee..7c8e48189 100644 --- a/src/math/lp/lar_core_solver_def.h +++ b/src/math/lp/lar_core_solver_def.h @@ -66,7 +66,7 @@ void lar_core_solver::fill_not_improvable_zero_sum() { m_infeasible_linear_combination.push_back(std::make_pair(cost_j, j)); } // m_costs are expressed by m_d ( additional costs), substructing the latter gives 0 - for (unsigned j = 0; j < m_r_solver.m_n(); j++) { + for (unsigned j = 0; j < m_r_solver.m_n(); ++j) { if (m_r_solver.m_basis_heading[j] >= 0) continue; const mpq & d_j = m_r_solver.m_d[j]; if (!numeric_traits::is_zero(d_j)) diff --git a/src/math/lp/lar_solver.cpp b/src/math/lp/lar_solver.cpp index b31014d6b..23b219a8a 100644 --- a/src/math/lp/lar_solver.cpp +++ b/src/math/lp/lar_solver.cpp @@ -300,7 +300,7 @@ namespace lp { } std::ostream& lar_solver::print_values(std::ostream& out) const { - for (unsigned i = 0; i < get_core_solver().r_x().size(); i++) { + for (unsigned i = 0; i < get_core_solver().r_x().size(); ++i) { const numeric_pair& rp = get_core_solver().r_x(i); out << this->get_variable_name(i) << " -> " << rp << "\n"; } @@ -564,7 +564,7 @@ namespace lp { SASSERT(get_core_solver().m_r_solver.m_basis.size() == A_r().row_count()); SASSERT(get_core_solver().m_r_solver.basis_heading_is_correct()); SASSERT(A_r().column_count() == n); - TRACE(lar_solver_details, for (unsigned j = 0; j < n; j++) print_column_info(j, tout) << "\n";); + TRACE(lar_solver_details, for (unsigned j = 0; j < n; ++j) print_column_info(j, tout) << "\n";); get_core_solver().pop(k); remove_non_fixed_from_fixed_var_table(); @@ -689,13 +689,13 @@ namespace lp { } bool lar_solver::costs_are_zeros_for_r_solver() const { - for (unsigned j = 0; j < get_core_solver().m_r_solver.m_costs.size(); j++) { + for (unsigned j = 0; j < get_core_solver().m_r_solver.m_costs.size(); ++j) { SASSERT(is_zero(get_core_solver().m_r_solver.m_costs[j])); } return true; } bool lar_solver::reduced_costs_are_zeroes_for_r_solver() const { - for (unsigned j = 0; j < get_core_solver().m_r_solver.m_d.size(); j++) { + for (unsigned j = 0; j < get_core_solver().m_r_solver.m_d.size(); ++j) { SASSERT(is_zero(get_core_solver().m_r_solver.m_d[j])); } return true; @@ -817,7 +817,7 @@ namespace lp { prepare_costs_for_r_solver(term); ret = maximize_term_on_tableau(term, term_max); if (ret && max_coeffs != nullptr) { - for (unsigned j = 0; j < column_count(); j++) { + for (unsigned j = 0; j < column_count(); ++j) { const mpq& d_j = get_core_solver().m_r_solver.m_d[j]; if (d_j.is_zero()) continue; @@ -871,7 +871,7 @@ namespace lp { impq opt_val = term_max; bool change = false; - for (unsigned j = 0; j < get_core_solver().r_x().size(); j++) { + for (unsigned j = 0; j < get_core_solver().r_x().size(); ++j) { if (!column_is_int(j)) continue; if (column_value_is_integer(j)) @@ -1144,7 +1144,7 @@ namespace lp { } #ifdef Z3DEBUG bool lar_solver::fixed_base_removed_correctly() const { - for (unsigned i = 0; i < A_r().row_count(); i++) { + for (unsigned i = 0; i < A_r().row_count(); ++i) { unsigned j = get_base_column_in_row(i); if (column_is_fixed(j)) { for (const auto & c : A_r().m_rows[i] ) { @@ -1181,7 +1181,7 @@ namespace lp { bool lar_solver::ax_is_correct() const { - for (unsigned i = 0; i < A_r().row_count(); i++) { + for (unsigned i = 0; i < A_r().row_count(); ++i) { if (!row_is_correct(i)) { return false; } @@ -1500,7 +1500,7 @@ namespace lp { unsigned n = get_core_solver().r_x().size(); - for (unsigned j = 0; j < n; j++) + for (unsigned j = 0; j < n; ++j) variable_values[j] = get_value(j); TRACE(lar_solver_model, tout << "delta = " << m_imp->m_delta << "\nmodel:\n"; @@ -1529,7 +1529,7 @@ namespace lp { do { m_imp->m_set_of_different_pairs.clear(); m_imp->m_set_of_different_singles.clear(); - for (j = 0; j < n; j++) { + for (j = 0; j < n; ++j) { const numeric_pair& rp = get_core_solver().r_x(j); mpq x = rp.x + m_imp->m_delta * rp.y; m_imp->m_set_of_different_pairs.insert(rp); @@ -1546,7 +1546,7 @@ namespace lp { void lar_solver::get_model_do_not_care_about_diff_vars(std::unordered_map& variable_values) const { mpq delta = get_core_solver().find_delta_for_strict_bounds(m_imp->m_settings.m_epsilon); - for (unsigned i = 0; i < get_core_solver().r_x().size(); i++) { + for (unsigned i = 0; i < get_core_solver().r_x().size(); ++i) { const impq& rp = get_core_solver().r_x(i); variable_values[i] = rp.x + delta * rp.y; } @@ -1561,7 +1561,7 @@ namespace lp { void lar_solver::get_rid_of_inf_eps() { bool y_is_zero = true; - for (unsigned j = 0; j < number_of_vars(); j++) { + for (unsigned j = 0; j < number_of_vars(); ++j) { if (!get_core_solver().r_x(j).y.is_zero()) { y_is_zero = false; break; @@ -1570,7 +1570,7 @@ namespace lp { if (y_is_zero) return; mpq delta = get_core_solver().find_delta_for_strict_bounds(m_imp->m_settings.m_epsilon); - for (unsigned j = 0; j < number_of_vars(); j++) { + for (unsigned j = 0; j < number_of_vars(); ++j) { auto& v = get_core_solver().r_x(j); if (!v.y.is_zero()) { v = impq(v.x + delta * v.y); @@ -1608,7 +1608,7 @@ namespace lp { out << constraints(); print_terms(out); pp(out).print(); - for (unsigned j = 0; j < number_of_vars(); j++) + for (unsigned j = 0; j < number_of_vars(); ++j) print_column_info(j, out); return out; } @@ -1666,7 +1666,7 @@ namespace lp { void lar_solver::fill_var_set_for_random_update(unsigned sz, lpvar const* vars, vector& column_list) { TRACE(lar_solver_rand, tout << "sz = " << sz << "\n";); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { lpvar var = vars[i]; if (column_has_term(var)) { if (m_imp->m_columns[var].associated_with_row()) { @@ -1848,7 +1848,7 @@ namespace lp { bool lar_solver::model_is_int_feasible() const { unsigned n = A_r().column_count(); - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { if (column_is_int(j) && !column_value_is_integer(j)) return false; } @@ -2571,7 +2571,7 @@ namespace lp { void lar_solver::round_to_integer_solution() { - for (unsigned j = 0; j < column_count(); j++) { + for (unsigned j = 0; j < column_count(); ++j) { if (!column_is_int(j)) continue; if (column_has_term(j)) continue; impq & v = get_core_solver().r_x(j); diff --git a/src/math/lp/lar_solver.h b/src/math/lp/lar_solver.h index 0f84df63b..6d3f5ff4e 100644 --- a/src/math/lp/lar_solver.h +++ b/src/math/lp/lar_solver.h @@ -302,7 +302,7 @@ public: void collect_more_rows_for_lp_propagation(); template void check_missed_propagations(lp_bound_propagator& bp) { - for (unsigned i = 0; i < A_r().row_count(); i++) + for (unsigned i = 0; i < A_r().row_count(); ++i) if (!touched_rows().contains(i)) if (0 < calculate_implied_bounds_for_row(i, bp)) { verbose_stream() << i << ": " << get_row(i) << "\n"; @@ -522,7 +522,7 @@ public: bool has_int_var() const; inline bool has_inf_int() const { - for (unsigned j = 0; j < column_count(); j++) { + for (unsigned j = 0; j < column_count(); ++j) { if (column_is_int(j) && !column_value_is_int(j)) return true; } diff --git a/src/math/lp/lar_term.h b/src/math/lp/lar_term.h index 0ae419469..d60d84f55 100644 --- a/src/math/lp/lar_term.h +++ b/src/math/lp/lar_term.h @@ -310,7 +310,7 @@ public: auto it = m_coeffs.begin(); r.add_var(it->m_key); it++; - for(;it != m_coeffs.end(); it++) { + for(;it != m_coeffs.end(); ++it) { r.add_monomial(it->m_value / a, it->m_key); } return r; diff --git a/src/math/lp/lp_core_solver_base.h b/src/math/lp/lp_core_solver_base.h index 99d9dcef0..92042f7b8 100644 --- a/src/math/lp/lp_core_solver_base.h +++ b/src/math/lp/lp_core_solver_base.h @@ -40,7 +40,7 @@ template X dot_product(const vector & a, const vector & b) { SASSERT(a.size() == b.size()); auto r = zero_of_type(); - for (unsigned i = 0; i < a.size(); i++) { + for (unsigned i = 0; i < a.size(); ++i) { r += a[i] * b[i]; } return r; @@ -176,7 +176,7 @@ public: bool need_to_pivot_to_basis_tableau() const { unsigned m = m_A.row_count(); - for (unsigned i = 0; i < m; i++) { + for (unsigned i = 0; i < m; ++i) { unsigned bj = m_basis[i]; SASSERT(m_A.m_columns[bj].size() > 0); if (m_A.m_columns[bj].size() > 1) @@ -198,7 +198,7 @@ public: unsigned n = m_A.column_count(); - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { if (m_basis_heading[j] >= 0) { if (!is_zero(m_d[j])) { return false; @@ -337,7 +337,7 @@ public: bool pivot_column_general(unsigned j, unsigned j_basic, indexed_vector & w); void init_basic_part_of_basis_heading() { unsigned m = m_basis.size(); - for (unsigned i = 0; i < m; i++) { + for (unsigned i = 0; i < m; ++i) { unsigned column = m_basis[i]; m_basis_heading[column] = i; } @@ -491,7 +491,7 @@ public: } bool bounds_for_boxed_are_set_correctly() const { - for (unsigned j = 0; j < m_column_types.size(); j++) { + for (unsigned j = 0; j < m_column_types.size(); ++j) { if (m_column_types[j] != column_type::boxed) continue; if (m_lower_bounds[j] > m_upper_bounds[j]) return false; @@ -588,7 +588,7 @@ public: bool costs_on_nbasis_are_zeros() const { SASSERT(this->basis_heading_is_correct()); - for (unsigned j = 0; j < this->m_n(); j++) { + for (unsigned j = 0; j < this->m_n(); ++j) { if (this->m_basis_heading[j] < 0) SASSERT(is_zero(this->m_costs[j])); } diff --git a/src/math/lp/lp_core_solver_base_def.h b/src/math/lp/lp_core_solver_base_def.h index 2a1f76afd..c4c41c26e 100644 --- a/src/math/lp/lp_core_solver_base_def.h +++ b/src/math/lp/lp_core_solver_base_def.h @@ -209,7 +209,7 @@ template bool lp_core_solver_base::calc_current_x } template bool lp_core_solver_base::inf_heap_is_correct() const { - for (unsigned j = 0; j < this->m_n(); j++) { + for (unsigned j = 0; j < this->m_n(); ++j) { bool belongs_to_set = m_inf_heap.contains(j); bool is_feas = column_is_feasible(j); if (is_feas == belongs_to_set) { @@ -226,7 +226,7 @@ divide_row_by_pivot(unsigned pivot_row, unsigned pivot_col) { int pivot_index = -1; auto & row = m_A.m_rows[pivot_row]; unsigned size = static_cast(row.size()); - for (unsigned j = 0; j < size; j++) { + for (unsigned j = 0; j < size; ++j) { auto & c = row[j]; if (c.var() == pivot_col) { pivot_index = static_cast(j); @@ -241,7 +241,7 @@ divide_row_by_pivot(unsigned pivot_row, unsigned pivot_col) { return false; // this->m_b[pivot_row] /= coeff; - for (unsigned j = 0; j < size; j++) { + for (unsigned j = 0; j < size; ++j) { auto & c = row[j]; if (c.var() != pivot_col) { c.coeff() /= coeff; @@ -257,7 +257,7 @@ pivot_column_tableau(unsigned j, unsigned piv_row_index) { return false; auto &column = m_A.m_columns[j]; int pivot_col_cell_index = -1; - for (unsigned k = 0; k < column.size(); k++) { + for (unsigned k = 0; k < column.size(); ++k) { if (column[k].var() == piv_row_index) { pivot_col_cell_index = k; break; @@ -295,7 +295,7 @@ pivot_column_tableau(unsigned j, unsigned piv_row_index) { template bool lp_core_solver_base:: basis_has_no_doubles() const { std::set bm; - for (unsigned i = 0; i < m_m(); i++) { + for (unsigned i = 0; i < m_m(); ++i) { bm.insert(m_basis[i]); } return bm.size() == m_m(); @@ -311,18 +311,18 @@ non_basis_has_no_doubles() const { template bool lp_core_solver_base:: basis_is_correctly_represented_in_heading() const { - for (unsigned i = 0; i < m_m(); i++) + for (unsigned i = 0; i < m_m(); ++i) if (m_basis_heading[m_basis[i]] != static_cast(i)) return false; return true; } template bool lp_core_solver_base:: non_basis_is_correctly_represented_in_heading(std::list* non_basis_list) const { - for (unsigned i = 0; i < m_nbasis.size(); i++) + for (unsigned i = 0; i < m_nbasis.size(); ++i) if (m_basis_heading[m_nbasis[i]] != - static_cast(i) - 1) return false; - for (unsigned j = 0; j < m_A.column_count(); j++) + for (unsigned j = 0; j < m_A.column_count(); ++j) if (m_basis_heading[j] >= 0) SASSERT(static_cast(m_basis_heading[j]) < m_A.row_count() && m_basis[m_basis_heading[j]] == j); @@ -336,7 +336,7 @@ non_basis_is_correctly_represented_in_heading(std::list* non_basis_lis TRACE(lp_core, tout << "non_basis_list.size() = " << non_basis_list->size() << ", nbasis_set.size() = " << nbasis_set.size() << "\n";); return false; } - for (auto it = non_basis_list->begin(); it != non_basis_list->end(); it++) { + for (auto it = non_basis_list->begin(); it != non_basis_list->end(); ++it) { if (nbasis_set.find(*it) == nbasis_set.end()) { TRACE(lp_core, tout << "column " << *it << " is in m_non_basis_list but not in m_nbasis\n";); return false; @@ -345,7 +345,7 @@ non_basis_is_correctly_represented_in_heading(std::list* non_basis_lis // check for duplicates in m_non_basis_list nbasis_set.clear(); - for (auto it = non_basis_list->begin(); it != non_basis_list->end(); it++) { + for (auto it = non_basis_list->begin(); it != non_basis_list->end(); ++it) { if (nbasis_set.find(*it) != nbasis_set.end()) { TRACE(lp_core, tout << "column " << *it << " is in m_non_basis_list twice\n";); return false; diff --git a/src/math/lp/lp_primal_core_solver.h b/src/math/lp/lp_primal_core_solver.h index cb7454c14..729b5cebc 100644 --- a/src/math/lp/lp_primal_core_solver.h +++ b/src/math/lp/lp_primal_core_solver.h @@ -195,7 +195,7 @@ namespace lp { unsigned best_col_sz = -1; unsigned bj = this->m_basis[i]; bool bj_needs_to_grow = needs_to_grow(bj); - for (unsigned k = 0; k < this->m_A.m_rows[i].size(); k++) { + for (unsigned k = 0; k < this->m_A.m_rows[i].size(); ++k) { const row_cell &rc = this->m_A.m_rows[i][k]; unsigned j = rc.var(); if (j == bj) diff --git a/src/math/lp/lp_primal_core_solver_def.h b/src/math/lp/lp_primal_core_solver_def.h index fd7c91457..51e023cf3 100644 --- a/src/math/lp/lp_primal_core_solver_def.h +++ b/src/math/lp/lp_primal_core_solver_def.h @@ -44,7 +44,7 @@ void lp_primal_core_solver::sort_non_basis() { // initialize m_non_basis_list from m_nbasis by using an iterator on m_non_basis_list auto it = m_non_basis_list.begin(); unsigned j = 0; - for (; j < this->m_nbasis.size(); j++, ++it) { + for (; j < this->m_nbasis.size(); ++j, ++it) { unsigned col = *it = this->m_nbasis[j]; this->m_basis_heading[col] = -static_cast(j) - 1; } @@ -183,7 +183,7 @@ template void lp_primal_core_solver::check_Ax_e delete [] ls; } template void lp_primal_core_solver::check_the_bounds() { - for (unsigned i = 0; i < this->m_n(); i++) { + for (unsigned i = 0; i < this->m_n(); ++i) { check_bound(i); } } diff --git a/src/math/lp/lp_primal_core_solver_tableau_def.h b/src/math/lp/lp_primal_core_solver_tableau_def.h index 417db0191..275a8f79f 100644 --- a/src/math/lp/lp_primal_core_solver_tableau_def.h +++ b/src/math/lp/lp_primal_core_solver_tableau_def.h @@ -202,7 +202,7 @@ template int lp_primal_core_solver::find_leaving_ m_leaving_candidates.clear(); auto & col = this->m_A.m_columns[entering]; unsigned col_size = static_cast(col.size()); - for (;k < col_size && unlimited; k++) { + for (;k < col_size && unlimited; ++k) { const column_cell & c = col[k]; unsigned i = c.var(); const T & ed = this->m_A.get_val(c); @@ -221,7 +221,7 @@ template int lp_primal_core_solver::find_leaving_ } X ratio; - for (;k < col_size; k++) { + for (;k < col_size; ++k) { const column_cell & c = col[k]; unsigned i = c.var(); const T & ed = this->m_A.get_val(c); @@ -290,7 +290,7 @@ update_x_tableau(unsigned entering, const X& delta) { template void lp_primal_core_solver::init_reduced_costs_tableau() { unsigned size = this->m_basis_heading.size(); - for (unsigned j = 0; j < size; j++) { + for (unsigned j = 0; j < size; ++j) { if (this->m_basis_heading[j] >= 0) this->m_d[j] = zero_of_type(); else { diff --git a/src/math/lp/lp_settings.h b/src/math/lp/lp_settings.h index d86b7d70e..9c1345e1b 100644 --- a/src/math/lp/lp_settings.h +++ b/src/math/lp/lp_settings.h @@ -350,7 +350,7 @@ template bool vectors_are_equal_(const T & a, const K &b) { if (a.size() != b.size()) return false; - for (unsigned i = 0; i < a.size(); i++){ + for (unsigned i = 0; i < a.size(); ++i){ if (a[i] != b[i]) { return false; } diff --git a/src/math/lp/lp_utils.h b/src/math/lp/lp_utils.h index f0657763c..fca2cff32 100644 --- a/src/math/lp/lp_utils.h +++ b/src/math/lp/lp_utils.h @@ -44,7 +44,7 @@ bool contains(const C & collection, const D & key) { template std::ostream& print_vector(const C * t, unsigned size, std::ostream & out) { - for (unsigned i = 0; i < size; i++ ) + for (unsigned i = 0; i < size; ++i ) out << t[i] << " "; out << std::endl; return out; @@ -77,7 +77,7 @@ bool is_non_decreasing(const K& v) { return true; // v is empty auto b = v.begin(); b++; - for (; b != v.end(); a++, b++) { + for (; b != v.end(); ++a, ++b) { if (*a > *b) return false; } diff --git a/src/math/lp/matrix.h b/src/math/lp/matrix.h index 88a405614..a0b00e594 100644 --- a/src/math/lp/matrix.h +++ b/src/math/lp/matrix.h @@ -47,7 +47,7 @@ void print_matrix(matrix const * m, std::ostream & out); template void print_matrix(const vector> & A, std::ostream & out, unsigned blanks_in_front = 0) { vector> s(A.size()); - for (unsigned i = 0; i < A.size(); i++) { + for (unsigned i = 0; i < A.size(); ++i) { for (const auto & v : A[i]) { s[i].push_back(T_to_string(v)); } diff --git a/src/math/lp/matrix_def.h b/src/math/lp/matrix_def.h index e3ac08f7e..94dc60cbd 100644 --- a/src/math/lp/matrix_def.h +++ b/src/math/lp/matrix_def.h @@ -28,8 +28,8 @@ template bool matrix::is_equal(const matrix& other) { if (other.row_count() != row_count() || other.column_count() != column_count()) return false; - for (unsigned i = 0; i < row_count(); i++) { - for (unsigned j = 0; j < column_count(); j++) { + for (unsigned i = 0; i < row_count(); ++i) { + for (unsigned j = 0; j < column_count(); ++j) { auto a = get_elem(i, j); auto b = other.get_elem(i, j); @@ -47,13 +47,13 @@ void apply_to_vector(matrix & m, T * w) { T * wc = new T[dim]; - for (unsigned i = 0; i < dim; i++) { + for (unsigned i = 0; i < dim; ++i) { wc[i] = w[i]; } - for (unsigned i = 0; i < dim; i++) { + for (unsigned i = 0; i < dim; ++i) { T t = numeric_traits::zero(); - for (unsigned j = 0; j < dim; j++) { + for (unsigned j = 0; j < dim; ++j) { t += m(i, j) * wc[j]; } w[i] = t; @@ -65,7 +65,7 @@ void apply_to_vector(matrix & m, T * w) { unsigned get_width_of_column(unsigned j, vector> & A) { unsigned r = 0; - for (unsigned i = 0; i < A.size(); i++) { + for (unsigned i = 0; i < A.size(); ++i) { vector & t = A[i]; std::string str = t[j]; unsigned s = static_cast(str.size()); @@ -77,8 +77,8 @@ unsigned get_width_of_column(unsigned j, vector> & A) { } void print_matrix_with_widths(vector> & A, vector & ws, std::ostream & out, unsigned blanks_in_front) { - for (unsigned i = 0; i < A.size(); i++) { - for (unsigned j = 0; j < static_cast(A[i].size()); j++) { + for (unsigned i = 0; i < A.size(); ++i) { + for (unsigned j = 0; j < static_cast(A[i].size()); ++j) { if (i != 0 && j == 0) print_blanks(blanks_in_front, out); print_blanks(ws[j] - static_cast(A[i][j].size()), out); @@ -92,7 +92,7 @@ void print_string_matrix(vector> & A, std::ostream & out, un vector widths; if (!A.empty()) - for (unsigned j = 0; j < A[0].size(); j++) { + for (unsigned j = 0; j < A[0].size(); ++j) { widths.push_back(get_width_of_column(j, A)); } @@ -103,7 +103,7 @@ void print_string_matrix(vector> & A, std::ostream & out, un template void print_matrix(vector> & A, std::ostream & out, unsigned blanks_in_front = 0) { vector> s(A.size()); - for (unsigned i = 0; i < A.size(); i++) { + for (unsigned i = 0; i < A.size(); ++i) { for (const auto & v : A[i]) { s[i].push_back(T_to_string(v)); } @@ -116,8 +116,8 @@ void print_matrix(vector> & A, std::ostream & out, unsigned blanks_in_ template void print_matrix(matrix const * m, std::ostream & out) { vector> A(m->row_count()); - for (unsigned i = 0; i < m->row_count(); i++) { - for (unsigned j = 0; j < m->column_count(); j++) { + for (unsigned i = 0; i < m->row_count(); ++i) { + for (unsigned j = 0; j < m->column_count(); ++j) { A[i].push_back(T_to_string(m->get_elem(i, j))); } } diff --git a/src/math/lp/monic.h b/src/math/lp/monic.h index b51134166..65bd4bdc9 100644 --- a/src/math/lp/monic.h +++ b/src/math/lp/monic.h @@ -40,7 +40,7 @@ public: const svector& vars() const { return m_vs; } bool empty() const { return m_vs.empty(); } bool is_sorted() const { - for (unsigned i = 0; i + 1 < size(); i++) + for (unsigned i = 0; i + 1 < size(); ++i) if (m_vs[i] > m_vs[i + 1]) return false; return true; diff --git a/src/math/lp/nex_creator.cpp b/src/math/lp/nex_creator.cpp index 30a8b2477..1869aee87 100644 --- a/src/math/lp/nex_creator.cpp +++ b/src/math/lp/nex_creator.cpp @@ -179,7 +179,7 @@ bool nex_creator::gt_on_mul_nex(nex_mul const& m, nex const& b) const { bool nex_creator::gt_on_sum_sum(const nex_sum& a, const nex_sum& b) const { unsigned size = std::min(a.size(), b.size()); - for (unsigned j = 0; j < size; j++) { + for (unsigned j = 0; j < size; ++j) { if (gt(a[j], b[j])) return true; if (gt(b[j], a[j])) @@ -248,7 +248,7 @@ bool nex_creator::gt(const nex& a, const nex& b) const { } bool nex_creator::is_sorted(const nex_mul& e) const { - for (unsigned j = 0; j < e.size() - 1; j++) { + for (unsigned j = 0; j < e.size() - 1; ++j) { if (!(gt_on_nex_pow(e[j], e[j+1]))) { TRACE(grobner_d, tout << "not sorted e " << e << "\norder is incorrect " << e[j] << " >= " << e[j + 1]<< "\n";); @@ -442,7 +442,7 @@ void nex_creator::sort_join_sum(nex_sum& sum) { void nex_creator::simplify_children_of_sum(nex_sum& s) { ptr_vector to_promote; unsigned k = 0; - for (unsigned j = 0; j < s.size(); j++) { + for (unsigned j = 0; j < s.size(); ++j) { nex* e = s[j] = simplify(s[j]); if (e->is_sum()) { to_promote.push_back(e); @@ -594,7 +594,7 @@ bool nex_creator::is_simplified(const nex& e) const { } unsigned nex_creator::find_sum_in_mul(const nex_mul* a) const { - for (unsigned j = 0; j < a->size(); j++) + for (unsigned j = 0; j < a->size(); ++j) if ((*a)[j].e()->is_sum()) return j; @@ -617,7 +617,7 @@ nex* nex_creator::canonize_mul(nex_mul *a) { if (power > 1) mf *= nex_pow(sclone, power - 1); mf *= nex_pow(e, 1); - for (unsigned k = 0; k < a->size(); k++) { + for (unsigned k = 0; k < a->size(); ++k) { if (k == j) continue; mf *= nex_pow(clone((*a)[k].e()), (*a)[k].pow()); @@ -636,7 +636,7 @@ nex* nex_creator::canonize(const nex *a) { nex *t = simplify(clone(a)); if (t->is_sum()) { nex_sum & s = t->to_sum(); - for (unsigned j = 0; j < s.size(); j++) { + for (unsigned j = 0; j < s.size(); ++j) { s[j] = canonize(s[j]); } t = simplify(&s); @@ -657,7 +657,7 @@ bool nex_creator::equal(const nex* a, const nex* b) { n = std::max(j + 1, n); } cn.set_number_of_vars(n); - for (lpvar j = 0; j < n; j++) { + for (lpvar j = 0; j < n; ++j) { cn.set_var_weight(j, j); } nex * ca = cn.canonize(a); diff --git a/src/math/lp/nex_creator.h b/src/math/lp/nex_creator.h index 396855375..7bf3ef14d 100644 --- a/src/math/lp/nex_creator.h +++ b/src/math/lp/nex_creator.h @@ -139,7 +139,7 @@ public: // NSB: we can use region allocation, but still need to invoke destructor // because of 'rational' (and m_children in nex_mul unless we get rid of this) void pop(unsigned sz) { - for (unsigned j = sz; j < m_allocated.size(); j++) + for (unsigned j = sz; j < m_allocated.size(); ++j) dealloc(m_allocated[j]); m_allocated.resize(sz); TRACE(grobner_stats_d, tout << "m_allocated.size() = " << m_allocated.size() << "\n";); diff --git a/src/math/lp/nla_core.cpp b/src/math/lp/nla_core.cpp index c58a887c4..34f2f0a1b 100644 --- a/src/math/lp/nla_core.cpp +++ b/src/math/lp/nla_core.cpp @@ -133,7 +133,7 @@ bool core::canonize_sign(const factorization& f) const { void core::add_monic(lpvar v, unsigned sz, lpvar const* vs) { m_add_buffer.resize(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_add_buffer[i] = vs[i]; } m_emons.add(v, m_add_buffer); @@ -635,7 +635,7 @@ void core::init_to_refine() { TRACE(nla_solver_details, tout << "emons:" << pp_emons(*this, m_emons);); m_to_refine.reset(); unsigned r = random(), sz = m_emons.number_of_monics(); - for (unsigned k = 0; k < sz; k++) { + for (unsigned k = 0; k < sz; ++k) { auto const & m = *(m_emons.begin() + (k + r)% sz); if (!check_monic(m)) insert_to_refine(m.var()); @@ -811,7 +811,7 @@ bool core::find_bfc_to_refine_on_monic(const monic& m, factorization & bf) { bool core::find_bfc_to_refine(const monic* & m, factorization & bf){ m = nullptr; unsigned r = random(), sz = m_to_refine.size(); - for (unsigned k = 0; k < sz; k++) { + for (unsigned k = 0; k < sz; ++k) { lpvar i = m_to_refine[(k + r) % sz]; m = &m_emons[i]; SASSERT (!check_monic(*m)); @@ -1143,7 +1143,7 @@ bool in_power(const svector& vs, unsigned l) { } bool core::to_refine_is_correct() const { - for (unsigned j = 0; j < lra.number_of_vars(); j++) { + for (unsigned j = 0; j < lra.number_of_vars(); ++j) { if (!is_monic_var(j)) continue; bool valid = check_monic(emon(j)); if (valid == m_to_refine.contains(j)) { @@ -1193,7 +1193,7 @@ void core::patch_monomial(lpvar j) { rational r = val(j) / v; SASSERT((*m_patched_monic).is_sorted()); TRACE(nla_solver, tout << "r = " << r << ", v = " << v << "\n";); - for (unsigned l = 0; l < (*m_patched_monic).size(); l++) { + for (unsigned l = 0; l < (*m_patched_monic).size(); ++l) { m_patched_var = (*m_patched_monic).vars()[l]; if (!in_power((*m_patched_monic).vars(), l) && !var_breaks_correct_monic(m_patched_var) && @@ -1216,7 +1216,7 @@ void core::patch_monomials_on_to_refine() { unsigned sz = to_refine.size(); unsigned start = random(); - for (unsigned i = 0; i < sz && !m_to_refine.empty(); i++) + for (unsigned i = 0; i < sz && !m_to_refine.empty(); ++i) patch_monomial(to_refine[(start + i) % sz]); TRACE(nla_solver, tout << "sz = " << sz << ", m_to_refine = " << m_to_refine.size() << @@ -1264,7 +1264,7 @@ void core::check_bounded_divisions() { // looking for a free variable inside of a monic to split void core::add_bounds() { unsigned r = random(), sz = m_to_refine.size(); - for (unsigned k = 0; k < sz; k++) { + for (unsigned k = 0; k < sz; ++k) { lpvar i = m_to_refine[(k + r) % sz]; auto const& m = m_emons[i]; for (lpvar j : m.vars()) { diff --git a/src/math/lp/nla_defs.h b/src/math/lp/nla_defs.h index 7eac3be16..00b922b4d 100644 --- a/src/math/lp/nla_defs.h +++ b/src/math/lp/nla_defs.h @@ -73,7 +73,7 @@ bool uniform_le(const T& a, const T& b, unsigned & strict_i) { strict_i = -1; bool z_b = false; - for (unsigned i = 0; i < a.size(); i++) { + for (unsigned i = 0; i < a.size(); ++i) { if (a[i] > b[i]){ return false; } diff --git a/src/math/lp/nla_grobner.cpp b/src/math/lp/nla_grobner.cpp index cbb941882..5df8439a9 100644 --- a/src/math/lp/nla_grobner.cpp +++ b/src/math/lp/nla_grobner.cpp @@ -307,7 +307,7 @@ namespace nla { continue; bool gcd_fail = true; dd::pdd kx = m.mk_var(x) * m.mk_val(k); - for (unsigned r = 0; gcd_fail && r < k; r++) { + for (unsigned r = 0; gcd_fail && r < k; ++r) { dd::pdd kx_plus_r = kx + m.mk_val(r); auto q = p.subst_pdd(x, kx_plus_r); if (!fails_gcd_test(q)) @@ -917,13 +917,13 @@ namespace nla { void grobner::set_level2var() { unsigned n = lra.column_count(); unsigned_vector sorted_vars(n), weighted_vars(n); - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { sorted_vars[j] = j; weighted_vars[j] = c().get_var_weight(j); } #if 1 // potential update to weights - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { if (c().is_monic_var(j) && c().m_to_refine.contains(j)) { for (lpvar k : c().m_emons[j].vars()) { weighted_vars[k] += 6; @@ -938,7 +938,7 @@ namespace nla { return wa < wb || (wa == wb && a < b); }); unsigned_vector l2v(n); - for (unsigned j = 0; j < n; j++) + for (unsigned j = 0; j < n; ++j) l2v[j] = sorted_vars[j]; m_pdd_manager.reset(l2v); diff --git a/src/math/lp/nla_intervals.cpp b/src/math/lp/nla_intervals.cpp index b0edb256b..f6c15bd8b 100644 --- a/src/math/lp/nla_intervals.cpp +++ b/src/math/lp/nla_intervals.cpp @@ -159,7 +159,7 @@ lp::lar_term intervals::expression_to_normalized_term(const nex_sum* e, rational t.add_monomial(p.first, p.second); } } else { - for (unsigned k = 0; k < v.size(); k++) { + for (unsigned k = 0; k < v.size(); ++k) { auto& p = v[k]; if (k != a_index) t.add_monomial(p.first/a, p.second); @@ -314,7 +314,7 @@ bool intervals::interval_of_sum_no_term(const nex_sum& e, scoped_dep_interval & if (!interval_of_expr(e[0], 1, sdi, f)) return false; - for (unsigned k = 1; k < e.size(); k++) { + for (unsigned k = 1; k < e.size(); ++k) { TRACE(nla_intervals_details, tout << "e[" << k << "]= " << *e[k] << "\n";); scoped_dep_interval b(get_dep_intervals()); if (!interval_of_expr(e[k], 1, b, f)) { diff --git a/src/math/lp/nla_monotone_lemmas.cpp b/src/math/lp/nla_monotone_lemmas.cpp index be5a82ffa..a28075a97 100644 --- a/src/math/lp/nla_monotone_lemmas.cpp +++ b/src/math/lp/nla_monotone_lemmas.cpp @@ -14,7 +14,7 @@ monotone::monotone(core * c) : common(c) {} void monotone::monotonicity_lemma() { unsigned shift = random(); unsigned size = c().m_to_refine.size(); - for (unsigned i = 0; i < size && !done(); i++) { + for (unsigned i = 0; i < size && !done(); ++i) { lpvar v = c().m_to_refine[(i + shift) % size]; monotonicity_lemma(c().emons()[v]); } diff --git a/src/math/lp/nla_order_lemmas.cpp b/src/math/lp/nla_order_lemmas.cpp index 81714f697..bb413f4c4 100644 --- a/src/math/lp/nla_order_lemmas.cpp +++ b/src/math/lp/nla_order_lemmas.cpp @@ -226,14 +226,14 @@ void order::order_lemma_on_factorization(const monic& m, const factorization& ab if (mv != fv && !c().has_real(m)) { bool gt = mv > fv; - for (unsigned j = 0, k = 1; j < 2; j++, k--) { + for (unsigned j = 0, k = 1; j < 2; ++j, k--) { lemma_builder lemma(_(), __FUNCTION__); order_lemma_on_ab(lemma, m, rsign, var(ab[k]), var(ab[j]), gt); lemma &= ab; lemma &= m; } } - for (unsigned j = 0, k = 1; j < 2; j++, k--) { + for (unsigned j = 0, k = 1; j < 2; ++j, k--) { order_lemma_on_ac_explore(m, ab, j == 1); } } diff --git a/src/math/lp/nla_pp.cpp b/src/math/lp/nla_pp.cpp index 567171119..7d7e8ec7c 100644 --- a/src/math/lp/nla_pp.cpp +++ b/src/math/lp/nla_pp.cpp @@ -89,7 +89,7 @@ std::ostream& core::print_monic_with_vars(lpvar v, std::ostream& out) const { template std::ostream& core::print_product_with_vars(const T& m, std::ostream& out) const { print_product(m, out) << "\n"; - for (unsigned k = 0; k < m.size(); k++) { + for (unsigned k = 0; k < m.size(); ++k) { print_var(m[k], out); } return out; @@ -153,7 +153,7 @@ std::ostream& core::print_ineqs(const lemma& l, std::ostream& out) const { if (l.ineqs().size() == 0) { out << "conflict\n"; } else { - for (unsigned i = 0; i < l.ineqs().size(); i++) { + for (unsigned i = 0; i < l.ineqs().size(); ++i) { auto& in = l.ineqs()[i]; print_ineq(in, out); if (i + 1 < l.ineqs().size()) out << " or "; @@ -173,7 +173,7 @@ std::ostream& core::print_factorization(const factorization& f, std::ostream& ou if (f.is_mon()) { out << "is_mon " << pp_mon(*this, f.mon()); } else { - for (unsigned k = 0; k < f.size(); k++) { + for (unsigned k = 0; k < f.size(); ++k) { out << "(" << pp(f[k]) << ")"; if (k < f.size() - 1) out << "*"; @@ -202,7 +202,7 @@ void core::trace_print_rms(const T& p, std::ostream& out) { void core::print_monic_stats(const monic& m, std::ostream& out) { if (m.size() == 2) return; monic_coeff mc = canonize_monic(m); - for (unsigned i = 0; i < mc.vars().size(); i++) { + for (unsigned i = 0; i < mc.vars().size(); ++i) { if (abs(val(mc.vars()[i])) == rational(1)) { auto vv = mc.vars(); vv.erase(vv.begin() + i); diff --git a/src/math/lp/nla_throttle.h b/src/math/lp/nla_throttle.h index 59178a49a..f0b84e0c3 100644 --- a/src/math/lp/nla_throttle.h +++ b/src/math/lp/nla_throttle.h @@ -39,7 +39,7 @@ private: struct signature_hash { unsigned operator()(const signature& s) const { unsigned hash = 0; - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 8; ++i) { hash = combine_hash(hash, s.m_values[i]); } return hash; diff --git a/src/math/lp/permutation_matrix.h b/src/math/lp/permutation_matrix.h index 98d69ad1a..67270acc4 100644 --- a/src/math/lp/permutation_matrix.h +++ b/src/math/lp/permutation_matrix.h @@ -92,7 +92,7 @@ class permutation_matrix unsigned old_size = m_permutation.size(); m_permutation.resize(size); m_rev.resize(size); - for (unsigned i = old_size; i < size; i++) { + for (unsigned i = old_size; i < size; ++i) { m_permutation[i] = m_rev[i] = i; } } diff --git a/src/math/lp/permutation_matrix_def.h b/src/math/lp/permutation_matrix_def.h index 5ab2651ac..453bc6870 100644 --- a/src/math/lp/permutation_matrix_def.h +++ b/src/math/lp/permutation_matrix_def.h @@ -23,13 +23,13 @@ Revision History: #include "math/lp/permutation_matrix.h" namespace lp { template permutation_matrix::permutation_matrix(unsigned length): m_permutation(length), m_rev(length) { - for (unsigned i = 0; i < length; i++) { // do not change the direction of the loop because of the vectorization bug in clang3.3 + for (unsigned i = 0; i < length; ++i) { // do not change the direction of the loop because of the vectorization bug in clang3.3 m_permutation[i] = m_rev[i] = i; } } template permutation_matrix::permutation_matrix(unsigned length, vector const & values): m_permutation(length), m_rev(length) { - for (unsigned i = 0; i < length; i++) { + for (unsigned i = 0; i < length; ++i) { set_val(i, values[i]); } } @@ -37,7 +37,7 @@ template permutation_matrix::permutation_matrix(u template void permutation_matrix::init(unsigned length) { m_permutation.resize(length); m_rev.resize(length); - for (unsigned i = 0; i < length; i++) { + for (unsigned i = 0; i < length; ++i) { m_permutation[i] = m_rev[i] = i; } } @@ -45,7 +45,7 @@ template void permutation_matrix::init(unsigned l #ifdef Z3DEBUG template void permutation_matrix::print(std::ostream & out) const { out << "["; - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { out << m_permutation[i]; if (i < size() - 1) { out << ","; diff --git a/src/math/lp/static_matrix.h b/src/math/lp/static_matrix.h index ee42c793b..415d3f1a2 100644 --- a/src/math/lp/static_matrix.h +++ b/src/math/lp/static_matrix.h @@ -206,7 +206,7 @@ public: unsigned number_of_non_zeroes() const { unsigned ret = 0; - for (unsigned i = 0; i < row_count(); i++) + for (unsigned i = 0; i < row_count(); ++i) ret += number_of_non_zeroes_in_row(i); return ret; } diff --git a/src/math/lp/static_matrix_def.h b/src/math/lp/static_matrix_def.h index aa3fff3dc..b28d67740 100644 --- a/src/math/lp/static_matrix_def.h +++ b/src/math/lp/static_matrix_def.h @@ -33,17 +33,17 @@ namespace lp { template void static_matrix::init_row_columns(unsigned m, unsigned n) { SASSERT(m_rows.size() == 0 && m_columns.size() == 0); - for (unsigned i = 0; i < m; i++) { + for (unsigned i = 0; i < m; ++i) { m_rows.push_back(row_strip()); } - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { m_columns.push_back(column_strip()); } } template void static_matrix:: scan_row_strip_to_work_vector(const row_strip & rvals) { - for (unsigned j = 0; j < rvals.size(); j++) + for (unsigned j = 0; j < rvals.size(); ++j) m_work_vector_of_row_offsets[rvals[j].var()] = j; } @@ -73,7 +73,7 @@ namespace lp { } } // clean the work vector - for (unsigned k = 0; k < prev_size_ii; k++) { + for (unsigned k = 0; k < prev_size_ii; ++k) { m_work_vector_of_row_offsets[rowii[k].var()] = -1; } @@ -104,7 +104,7 @@ namespace lp { } } // clean the work vector - for (unsigned k = 0; k < prev_size_k; k++) { + for (unsigned k = 0; k < prev_size_k; ++k) { m_work_vector_of_row_offsets[rowk[k].var()] = -1; } @@ -142,7 +142,7 @@ namespace lp { } } // clean the work vector - for (unsigned k = 0; k < prev_size_ii; k++) { + for (unsigned k = 0; k < prev_size_ii; ++k) { m_work_vector_of_row_offsets[rowii[k].var()] = -1; } @@ -175,7 +175,7 @@ namespace lp { } } // clean the work vector - for (unsigned k = 0; k < prev_size_ii; k++) { + for (unsigned k = 0; k < prev_size_ii; ++k) { m_work_vector_of_row_offsets[rowii[k].var()] = -1; } @@ -211,7 +211,7 @@ namespace lp { } } // clean the work vector - for (unsigned k = 0; k < prev_size_ii; k++) { + for (unsigned k = 0; k < prev_size_ii; ++k) { m_work_vector_of_row_offsets[rowii[k].var()] = -1; } @@ -265,7 +265,7 @@ namespace lp { template std::set> static_matrix::get_domain() { std::set> ret; - for (unsigned i = 0; i < m_rows.size(); i++) { + for (unsigned i = 0; i < m_rows.size(); ++i) { for (auto &cell : m_rows[i]) { ret.insert(std::make_pair(i, cell.var())); } @@ -330,7 +330,7 @@ namespace lp { #ifdef Z3DEBUG template void static_matrix::check_consistency() { std::unordered_map, T> by_rows; - for (unsigned i = 0; i < m_rows.size(); i++) { + for (unsigned i = 0; i < m_rows.size(); ++i) { for (auto & t : m_rows[i]) { std::pair p(i, t.var()); SASSERT(by_rows.find(p) == by_rows.end()); @@ -338,7 +338,7 @@ namespace lp { } } std::unordered_map, T> by_cols; - for (unsigned i = 0; i < m_columns.size(); i++) { + for (unsigned i = 0; i < m_columns.size(); ++i) { for (auto & t : m_columns[i]) { std::pair p(t.var(), i); SASSERT(by_cols.find(p) == by_cols.end()); @@ -384,7 +384,7 @@ namespace lp { template void static_matrix::cross_out_row_from_column(unsigned col, unsigned k) { auto & s = m_columns[col]; - for (unsigned i = 0; i < s.size(); i++) { + for (unsigned i = 0; i < s.size(); ++i) { if (s[i].var() == k) { s.erase(s.begin() + i); break; @@ -403,7 +403,7 @@ namespace lp { template T static_matrix::get_balance() const { T ret = zero_of_type(); - for (unsigned i = 0; i < row_count(); i++) { + for (unsigned i = 0; i < row_count(); ++i) { ret += get_row_balance(i); } return ret; diff --git a/src/math/lp/test_bound_analyzer.h b/src/math/lp/test_bound_analyzer.h index 6cc78526f..72a5d2076 100644 --- a/src/math/lp/test_bound_analyzer.h +++ b/src/math/lp/test_bound_analyzer.h @@ -75,7 +75,7 @@ public : void analyze() { // We have the equality sum by j of row[j]*x[j] = m_rs // We try to pin a var by pushing the total of the partial sum down, denoting the variable of this process by _u. - for (unsigned i = 0; i < m_index.size(); i++) { + for (unsigned i = 0; i < m_index.size(); ++i) { analyze_i(i); } } @@ -90,7 +90,7 @@ public : mpq l; bool strict = false; SASSERT(is_zero(l)); - for (unsigned k = 0; k < m_index.size(); k++) { + for (unsigned k = 0; k < m_index.size(); ++k) { if (k == i) continue; mpq lb; @@ -181,7 +181,7 @@ public : mpq l; SASSERT(is_zero(l)); bool strict = false; - for (unsigned k = 0; k < m_index.size(); k++) { + for (unsigned k = 0; k < m_index.size(); ++k) { if (k == i) continue; mpq lb; diff --git a/src/math/lp/var_eqs.h b/src/math/lp/var_eqs.h index 223b0d81b..48f5ec61a 100644 --- a/src/math/lp/var_eqs.h +++ b/src/math/lp/var_eqs.h @@ -35,7 +35,7 @@ public: for (auto c: cs) { m_cs[i++] = c; } - for (; i < 4; i++) { + for (; i < 4; ++i) { m_cs[i] = nullptr; } } diff --git a/src/math/polynomial/algebraic_numbers.cpp b/src/math/polynomial/algebraic_numbers.cpp index 7f6df1e20..24cb3c782 100644 --- a/src/math/polynomial/algebraic_numbers.cpp +++ b/src/math/polynomial/algebraic_numbers.cpp @@ -183,7 +183,7 @@ namespace algebraic_numbers { } void del_poly(algebraic_cell * c) { - for (unsigned i = 0; i < c->m_p_sz; i++) + for (unsigned i = 0; i < c->m_p_sz; ++i) qm().del(c->m_p[i]); m_allocator.deallocate(sizeof(mpz)*c->m_p_sz, c->m_p); c->m_p = nullptr; @@ -406,7 +406,7 @@ namespace algebraic_numbers { algebraic_cell * c = new (mem) algebraic_cell(); c->m_p_sz = sz; c->m_p = static_cast(m_allocator.allocate(sizeof(mpz)*sz)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { new (c->m_p + i) mpz(); qm().set(c->m_p[i], p[i]); } @@ -450,7 +450,7 @@ namespace algebraic_numbers { SASSERT(c->m_p_sz == 0); c->m_p_sz = sz; c->m_p = static_cast(m_allocator.allocate(sizeof(mpz)*sz)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { new (c->m_p + i) mpz(); qm().set(c->m_p[i], p[i]); } @@ -618,7 +618,7 @@ namespace algebraic_numbers { } unsigned num_factors = fs.distinct_factors(); - for (unsigned i = 0; i < num_factors; i++) { + for (unsigned i = 0; i < num_factors; ++i) { upolynomial::numeral_vector const & f = fs[i]; // polynomial f contains the non zero roots unsigned d = upm().degree(f); @@ -641,14 +641,14 @@ namespace algebraic_numbers { // collect rational/basic roots unsigned sz = m_isolate_roots.size(); TRACE(algebraic, tout << "isolated roots: " << sz << "\n";); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { to_mpq(qm(), m_isolate_roots[i], r); roots.push_back(numeral(mk_basic_cell(r))); } SASSERT(m_isolate_uppers.size() == m_isolate_lowers.size()); // collect non-basic roots sz = m_isolate_lowers.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mpbq & lower = m_isolate_lowers[i]; mpbq & upper = m_isolate_uppers[i]; if (!upm().isolating2refinable(f.size(), f.data(), bqm(), lower, upper)) { @@ -689,7 +689,7 @@ namespace algebraic_numbers { isolate_roots(up, roots); unsigned num_roots = roots.size(); TRACE(algebraic, tout << "num-roots: " << num_roots << "\n"; - for (unsigned i = 0; i < num_roots; i++) { + for (unsigned i = 0; i < num_roots; ++i) { display_interval(tout, roots[i]); tout << "\n"; }); @@ -799,7 +799,7 @@ namespace algebraic_numbers { } bool refine(numeral & a, unsigned k) { - for (unsigned i = 0; i < k; i++) + for (unsigned i = 0; i < k; ++i) if (!refine(a)) return false; return true; @@ -1058,7 +1058,7 @@ namespace algebraic_numbers { bool full_fact = factor(p, fs); unsigned num_fs = fs.distinct_factors(); scoped_ptr_vector seqs; - for (unsigned i = 0; i < num_fs; i++) { + for (unsigned i = 0; i < num_fs; ++i) { TRACE(anum_mk_binary, tout << "factor " << i << "\n"; upm().display(tout, fs[i]); tout << "\n";); typename upolynomial::scoped_upolynomial_sequence * seq = alloc(typename upolynomial::scoped_upolynomial_sequence, upm()); upm().sturm_seq(fs[i].size(), fs[i].data(), *seq); @@ -1079,7 +1079,7 @@ namespace algebraic_numbers { unsigned num_rem = 0; // number of remaining sequences unsigned target_i = UINT_MAX; // index of sequence that is isolating int target_lV = 0, target_uV = 0; - for (unsigned i = 0; i < num_fs; i++) { + for (unsigned i = 0; i < num_fs; ++i) { if (seqs[i] == nullptr) continue; // sequence was discarded because it does not contain the root. TRACE(anum_mk_binary, tout << "sequence " << i << "\n"; upm().display(tout, *(seqs[i])); tout << "\n";); @@ -1139,7 +1139,7 @@ namespace algebraic_numbers { bool full_fact = factor(p, fs); unsigned num_fs = fs.distinct_factors(); scoped_ptr_vector seqs; - for (unsigned i = 0; i < num_fs; i++) { + for (unsigned i = 0; i < num_fs; ++i) { typename upolynomial::scoped_upolynomial_sequence * seq = alloc(typename upolynomial::scoped_upolynomial_sequence, upm()); upm().sturm_seq(fs[i].size(), fs[i].data(), *seq); seqs.push_back(seq); @@ -1157,7 +1157,7 @@ namespace algebraic_numbers { unsigned num_rem = 0; // number of remaining sequences unsigned target_i = UINT_MAX; // index of sequence that is isolating int target_lV = 0, target_uV = 0; - for (unsigned i = 0; i < num_fs; i++) { + for (unsigned i = 0; i < num_fs; ++i) { if (seqs[i] == nullptr) continue; // sequence was discarded because it does not contain the root. int lV = upm().sign_variations_at(*(seqs[i]), r_i.lower()); @@ -1334,7 +1334,7 @@ namespace algebraic_numbers { p.push_back(mpz()); qm().set(p.back(), a_val.numerator()); qm().neg(p.back()); - for (unsigned i = 0; i < k; i++) + for (unsigned i = 0; i < k; ++i) p.push_back(mpz()); qm().set(p.back(), a_val.denominator()); @@ -1841,7 +1841,7 @@ namespace algebraic_numbers { } if (target_m > m_min_magnitude) { int num_refinements = target_m - m_min_magnitude; - for (int i = 0; i < num_refinements; i++) { + for (int i = 0; i < num_refinements; ++i) { if (!refine(a) || !refine(b)) return compare(a, b); m_compare_refine++; @@ -2131,7 +2131,7 @@ namespace algebraic_numbers { } // refine intervals if magnitude > m_min_magnitude bool refined = false; - for (unsigned i = 0; i < xs.size(); i++) { + for (unsigned i = 0; i < xs.size(); ++i) { polynomial::var x = xs[i]; SASSERT(x2v.contains(x)); anum const & v = x2v(x); @@ -2220,7 +2220,7 @@ namespace algebraic_numbers { // compute the resultants polynomial_ref q_i(pm()); std::stable_sort(xs.begin(), xs.end(), var_degree_lt(*this, x2v)); - for (unsigned i = 0; i < xs.size(); i++) { + for (unsigned i = 0; i < xs.size(); ++i) { checkpoint(); polynomial::var x_i = xs[i]; SASSERT(x2v.contains(x_i)); @@ -2249,7 +2249,7 @@ namespace algebraic_numbers { // The invervals (for the values of the variables in xs) are going to get too small. // So, we save them before refining... scoped_ptr_vector saved_intervals; - for (unsigned i = 0; i < xs.size(); i++) { + for (unsigned i = 0; i < xs.size(); ++i) { polynomial::var x_i = xs[i]; SASSERT(x2v.contains(x_i)); anum const & v_i = x2v(x_i); @@ -2334,13 +2334,13 @@ namespace algebraic_numbers { // Remove from roots any solution r such that p does not evaluate to 0 at x2v extended with x->r. void filter_roots(polynomial_ref const & p, polynomial::var2anum const & x2v, polynomial::var x, numeral_vector & roots) { TRACE(isolate_roots, tout << "before filtering roots, x: x" << x << "\n"; - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { display_root(tout, roots[i]); tout << "\n"; }); unsigned sz = roots.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); ext_var2num ext_x2v(m_wrapper, x2v, x, roots[i]); TRACE(isolate_roots, tout << "filter_roots i: " << i << ", ext_x2v: x" << x << " -> "; display_root(tout, roots[i]); tout << "\n";); @@ -2352,12 +2352,12 @@ namespace algebraic_numbers { set(roots[j], roots[i]); j++; } - for (unsigned i = j; i < sz; i++) + for (unsigned i = j; i < sz; ++i) del(roots[i]); roots.shrink(j); TRACE(isolate_roots, tout << "after filtering roots:\n"; - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { display_root(tout, roots[i]); tout << "\n"; }); } @@ -2366,7 +2366,7 @@ namespace algebraic_numbers { static polynomial::var get_max_var(polynomial::var_vector const & xs) { SASSERT(!xs.empty()); polynomial::var x = xs[0]; - for (unsigned i = 1; i < xs.size(); i++) { + for (unsigned i = 1; i < xs.size(); ++i) { if (xs[i] > x) x = xs[i]; } @@ -2445,7 +2445,7 @@ namespace algebraic_numbers { polynomial_ref q(ext_pm); q = p_prime; polynomial_ref p_y(ext_pm); - for (unsigned i = 0; i + 1 < xs.size(); i++) { + for (unsigned i = 0; i + 1 < xs.size(); ++i) { checkpoint(); polynomial::var y = xs[i]; SASSERT(x2v.contains(y)); @@ -2678,7 +2678,7 @@ namespace algebraic_numbers { TRACE(isolate_roots_bug, tout << "p: " << p << "\n"; polynomial::var_vector xs; p.m().vars(p, xs); - for (unsigned i = 0; i < xs.size(); i++) { + for (unsigned i = 0; i < xs.size(); ++i) { if (x2v.contains(xs[i])) { tout << "x" << xs[i] << " -> "; display_root(tout, x2v(xs[i])); @@ -2687,10 +2687,10 @@ namespace algebraic_numbers { tout << "\n"; } } - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { tout << "root[i]: "; display_root(tout, roots[i]); tout << "\n"; }); - for (unsigned i = 0; i < num_roots; i++) + for (unsigned i = 0; i < num_roots; ++i) refine_until_prec(roots[i], DEFAULT_PRECISION); scoped_anum w(m_wrapper); @@ -2703,7 +2703,7 @@ namespace algebraic_numbers { signs.push_back(s); } - for (unsigned i = 1; i < num_roots; i++) { + for (unsigned i = 1; i < num_roots; ++i) { numeral & prev = roots[i-1]; numeral & curr = roots[i]; select(prev, curr, w); diff --git a/src/math/polynomial/linear_eq_solver.h b/src/math/polynomial/linear_eq_solver.h index 75e860e75..9e12c2630 100644 --- a/src/math/polynomial/linear_eq_solver.h +++ b/src/math/polynomial/linear_eq_solver.h @@ -35,11 +35,11 @@ public: void flush() { SASSERT(b.size() == A.size()); auto sz = A.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { svector & as = A[i]; m.del(b[i]); SASSERT(as.size() == n); - for (unsigned j = 0; j < n; j++) + for (unsigned j = 0; j < n; ++j) m.del(as[j]); } A.reset(); @@ -51,10 +51,10 @@ public: if (n != _n) { flush(); n = _n; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { A.push_back(svector()); svector & as = A.back(); - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { as.push_back(numeral()); } b.push_back(numeral()); @@ -63,9 +63,9 @@ public: } void reset() { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { svector & A_i = A[i]; - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { m.set(A_i[j], 0); } m.set(b[i], 0); @@ -77,7 +77,7 @@ public: SASSERT(i < n); m.set(b[i], _b); svector & A_i = A[i]; - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { m.set(A_i[j], _as[j]); } } @@ -85,11 +85,11 @@ public: // Return true if the system of equations has a solution. // Return false if the matrix is singular bool solve(numeral * xs) { - for (unsigned k = 0; k < n; k++) { + for (unsigned k = 0; k < n; ++k) { TRACE(linear_eq_solver, tout << "iteration " << k << "\n"; display(tout);); // find pivot unsigned i = k; - for (; i < n; i++) { + for (; i < n; ++i) { if (!m.is_zero(A[i][k])) break; } @@ -100,17 +100,17 @@ public: numeral & A_k_k = A_k[k]; SASSERT(!m.is_zero(A_k_k)); // normalize row - for (unsigned i = k+1; i < n; i++) + for (unsigned i = k+1; i < n; ++i) m.div(A_k[i], A_k_k, A_k[i]); m.div(b[k], A_k_k, b[k]); m.set(A_k_k, 1); // check if first k-1 positions are zero - DEBUG_CODE({ for (unsigned i = 0; i < k; i++) { SASSERT(m.is_zero(A_k[i])); } }); + DEBUG_CODE({ for (unsigned i = 0; i < k; ++i) { SASSERT(m.is_zero(A_k[i])); } }); // for all rows below pivot - for (unsigned i = k+1; i < n; i++) { + for (unsigned i = k+1; i < n; ++i) { svector & A_i = A[i]; numeral & A_i_k = A_i[k]; - for (unsigned j = k+1; j < n; j++) { + for (unsigned j = k+1; j < n; ++j) { m.submul(A_i[j], A_i_k, A_k[j], A_i[j]); } m.submul(b[i], A_i_k, b[k], b[i]); @@ -136,9 +136,9 @@ public: } void display(std::ostream & out) const { - for (unsigned i = 0; i < A.size(); i++) { + for (unsigned i = 0; i < A.size(); ++i) { SASSERT(A[i].size() == n); - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { m.display(out, A[i][j]); out << " "; } diff --git a/src/math/polynomial/polynomial.cpp b/src/math/polynomial/polynomial.cpp index bf0e3005b..006b35df5 100644 --- a/src/math/polynomial/polynomial.cpp +++ b/src/math/polynomial/polynomial.cpp @@ -134,7 +134,7 @@ namespace polynomial { \brief Return true if the variables in pws are sorted in increasing order and are distinct. */ bool is_valid_power_product(unsigned sz, power const * pws) { - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { if (pws[i-1].get_var() >= pws[i].get_var()) return false; } @@ -146,7 +146,7 @@ namespace polynomial { */ unsigned power_product_total_degree(unsigned sz, power const * pws) { unsigned r = 0; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) r += pws[i].degree(); return r; } @@ -182,7 +182,7 @@ namespace polynomial { if (m1->size() != m2->size() || m1->hash() != m2->hash()) return false; // m_total_degree must not be used as a filter, because it is not updated in temporary monomials. - for (unsigned i = 0; i < m1->m_size; i++) { + for (unsigned i = 0; i < m1->m_size; ++i) { if (m1->get_power(i) != m2->get_power(i)) return false; } @@ -362,7 +362,7 @@ namespace polynomial { var y = max_smaller_than_core(x); DEBUG_CODE({ bool found = false; - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (get_var(i) < x) { CTRACE(poly_bug, !(y != null_var && get_var(i) <= y), tout << "m: "; display(tout); tout << "\n"; @@ -385,7 +385,7 @@ namespace polynomial { out << "1"; return out; } - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (i > 0) { if (use_star) out << "*"; @@ -408,11 +408,11 @@ namespace polynomial { } else { out << "(*"; - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { var x = get_var(i); unsigned k = degree(i); SASSERT(k > 0); - for (unsigned j = 0; j < k; j++) { + for (unsigned j = 0; j < k; ++j) { out << " "; proc(out, x); } @@ -427,7 +427,7 @@ namespace polynomial { \brief Return true if the degree of every variable is even. */ bool is_power_of_two() const { - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (degree(i) % 2 == 1) return false; } @@ -435,7 +435,7 @@ namespace polynomial { } bool is_square() const { - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (degree(i) % 2 != 0) return false; } @@ -443,7 +443,7 @@ namespace polynomial { } void rename(unsigned sz, var const * xs) { - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { power & pw = m_powers[i]; pw.set_var(xs[pw.get_var()]); } @@ -487,7 +487,7 @@ namespace polynomial { template void set(Poly const * p) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { set(p->m(i), i); } } @@ -498,7 +498,7 @@ namespace polynomial { template void reset(Poly const * p) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { reset(p->m(i)); } } @@ -891,7 +891,7 @@ namespace polynomial { monomial * convert(monomial const * src) { unsigned sz = src->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = src->get_var(i); while (x >= num_vars()) { mk_var(); @@ -924,7 +924,7 @@ namespace polynomial { std::sort(xs, xs+sz); SASSERT(is_valid(xs[0])); m_powers_tmp.push_back(power(xs[0], 1)); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { var x = xs[i]; SASSERT(is_valid(x)); power & last = m_powers_tmp.back(); @@ -943,13 +943,13 @@ namespace polynomial { while (true) { if (i1 == sz1) { // copy 2 - for (; i2 < sz2; i2++, j++) + for (; i2 < sz2; ++i2, ++j) product_tmp.set_power(j, pws2[i2]); break; } if (i2 == sz2) { // copy 1 - for (; i1 < sz1; i1++, j++) + for (; i1 < sz1; ++i1, ++j) product_tmp.set_power(j, pws1[i1]); break; } @@ -983,16 +983,16 @@ namespace polynomial { mul(sz1, pws1, sz2, pws2, product_tmp); TRACE(monomial_mul_bug, tout << "before mk_monomial\n"; - tout << "pws1: "; for (unsigned i = 0; i < sz1; i++) tout << pws1[i] << " "; tout << "\n"; - tout << "pws2: "; for (unsigned i = 0; i < sz2; i++) tout << pws2[i] << " "; tout << "\n"; - tout << "product_tmp: "; for (unsigned i = 0; i < product_tmp.size(); i++) tout << product_tmp.get_power(i) << " "; + tout << "pws1: "; for (unsigned i = 0; i < sz1; ++i) tout << pws1[i] << " "; tout << "\n"; + tout << "pws2: "; for (unsigned i = 0; i < sz2; ++i) tout << pws2[i] << " "; tout << "\n"; + tout << "product_tmp: "; for (unsigned i = 0; i < product_tmp.size(); ++i) tout << product_tmp.get_power(i) << " "; tout << "\n";); monomial * r = mk_monomial(product_tmp); TRACE(monomial_mul_bug, tout << "r: "; r->display(tout); tout << "\n"; - tout << "pws1: "; for (unsigned i = 0; i < sz1; i++) tout << pws1[i] << " "; tout << "\n"; - tout << "pws2: "; for (unsigned i = 0; i < sz2; i++) tout << pws2[i] << " "; tout << "\n"; - tout << "product_tmp: "; for (unsigned i = 0; i < product_tmp.size(); i++) tout << product_tmp.get_power(i) << " "; + tout << "pws1: "; for (unsigned i = 0; i < sz1; ++i) tout << pws1[i] << " "; tout << "\n"; + tout << "pws2: "; for (unsigned i = 0; i < sz2; ++i) tout << pws2[i] << " "; tout << "\n"; + tout << "product_tmp: "; for (unsigned i = 0; i < product_tmp.size(); ++i) tout << product_tmp.get_power(i) << " "; tout << "\n";); SASSERT(r->is_valid()); SASSERT(r->total_degree() == power_product_total_degree(sz1, pws1) + power_product_total_degree(sz2, pws2)); @@ -1020,7 +1020,7 @@ namespace polynomial { while (true) { if (i2 == sz2) { if (STORE_RESULT) { - for (; i1 < sz1; i1++, j++) + for (; i1 < sz1; ++i1, ++j) r.set_power(j, pws1[i1]); r.set_size(j); } @@ -1100,7 +1100,7 @@ namespace polynomial { while (true) { if (i1 == sz1) { if (found) { - for (; i2 < sz2; i2++, j2++) + for (; i2 < sz2; ++i2, ++j2) r2.set_power(j2, pws2[i2]); r1.set_size(j1); r2.set_size(j2); @@ -1111,7 +1111,7 @@ namespace polynomial { } if (i2 == sz2) { if (found) { - for (; i1 < sz1; i1++, j1++) + for (; i1 < sz1; ++i1, ++j1) r1.set_power(j1, pws1[i1]); r1.set_size(j1); r2.set_size(j2); @@ -1193,7 +1193,7 @@ namespace polynomial { unsigned sz = m->size(); tmp_monomial & pw_tmp = m_tmp1; pw_tmp.reserve(sz); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) pw_tmp.set_power(i, power(m->get_var(i), m->degree(i)*k)); pw_tmp.set_size(sz); return mk_monomial(pw_tmp); @@ -1206,7 +1206,7 @@ namespace polynomial { unsigned sz = m->size(); tmp_monomial & sqrt_tmp = m_tmp1; sqrt_tmp.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m->degree(i) % 2 == 1) return nullptr; sqrt_tmp.set_power(i, power(m->get_var(i), m->degree(i) / 2)); @@ -1224,7 +1224,7 @@ namespace polynomial { tmp_monomial & elim_tmp = m_tmp1; elim_tmp.reserve(sz); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { power const & pw = m->get_power(i); var y = pw.get_var(); if (x != y) { @@ -1253,7 +1253,7 @@ namespace polynomial { tmp_monomial & elim_tmp = m_tmp1; elim_tmp.reserve(sz); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { power const & pw = m->get_power(i); var y = pw.get_var(); if (x != y) { @@ -1271,7 +1271,7 @@ namespace polynomial { tmp_monomial & derivative_tmp = m_tmp1; derivative_tmp.reserve(sz); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { power const & pw = m->get_power(i); var y = pw.get_var(); if (x == y) { @@ -1297,7 +1297,7 @@ namespace polynomial { // check whether xs is really a permutation bool_vector found; found.resize(num_vars(), false); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(xs[i] < num_vars()); SASSERT(!found[xs[i]]); found[xs[i]] = true; @@ -1335,7 +1335,7 @@ namespace polynomial { void lex_sort(unsigned start, unsigned end, var x, vector & buckets, unsigned_vector & p) { SASSERT(end > start); unsigned max_degree = 0; - for (unsigned i = start, j = 0; i < end; i++, j++) { + for (unsigned i = start, j = 0; i < end; ++i, ++j) { monomial * m = m_ms[i]; unsigned d = m->degree_of(x); buckets.reserve(d+1); @@ -1367,7 +1367,7 @@ namespace polynomial { return; } unsigned j = i + 1; - for (; j < end; j++) { + for (; j < end; ++j) { unsigned d_j = m_ms[j]->degree_of(x); SASSERT(d_j <= d); // it is sorted if (d_j < d) @@ -1429,7 +1429,7 @@ namespace polynomial { m_ms(ms_mem) { if (sz > 0) { unsigned max_pos = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { new (m_as + i) numeral(); // initialize the big number at m_as[i] swap(m_as[i], as[i]); SASSERT(ms[i]->ref_count() > 0); @@ -1444,7 +1444,7 @@ namespace polynomial { // Return the maximal variable y occurring in [m_ms + start, m_ms + end) that is smaller than x var max_smaller_than(unsigned start, unsigned end, var x) { var max = null_var; - for (unsigned i = start; i < end; i++) { + for (unsigned i = start; i < end; ++i) { var y = m_ms[i]->max_smaller_than(x); if (y != null_var && (max == null_var || y > max)) max = y; @@ -1467,7 +1467,7 @@ namespace polynomial { lex_sort(0, size(), m(0)->max_var(), buckets, p); m_lex_sorted = true; DEBUG_CODE({ - for (unsigned i = 0; i < m_size - 1; i++) { + for (unsigned i = 0; i < m_size - 1; ++i) { CTRACE(poly_bug, lex_compare(m_ms[i], m_ms[i+1]) <= 0, tout << "i: " << i << "\npoly: "; display(tout, nm); tout << "\n";); SASSERT(lex_compare(m_ms[i], m_ms[i+1]) > 0); @@ -1483,7 +1483,7 @@ namespace polynomial { if (m_size <= 1) return; unsigned max_pos = 0; - for (unsigned i = 1; i < m_size; i++) { + for (unsigned i = 1; i < m_size; ++i) { if (po_gt(m_ms[i], m_ms[max_pos])) max_pos = i; } @@ -1500,7 +1500,7 @@ namespace polynomial { if (m_size == 0) return UINT_MAX; unsigned max_pos = 0; - for (unsigned i = 1; i < m_size; i++) { + for (unsigned i = 1; i < m_size; ++i) { if (graded_lex_compare(m_ms[i], m_ms[max_pos]) > 0) max_pos = i; } @@ -1516,7 +1516,7 @@ namespace polynomial { if (m_size == 0) return UINT_MAX; unsigned min_pos = 0; - for (unsigned i = 1; i < m_size; i++) { + for (unsigned i = 1; i < m_size; ++i) { if (graded_lex_compare(m_ms[i], m_ms[min_pos]) < 0) min_pos = i; } @@ -1540,7 +1540,7 @@ namespace polynomial { return out; } - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { numeral const & a_i = a(i); _scoped_numeral abs_a_i(nm); nm.set(abs_a_i, a_i); @@ -1623,7 +1623,7 @@ namespace polynomial { } else { out << "(+"; - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { out << " "; display_mon_smt2(out, nm, proc, i); } @@ -1739,7 +1739,7 @@ namespace polynomial { return true; monomial * m = p->m(0); var x = max_var(p); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m = p->m(i); if (m->size() == 1 && m->get_var(0) == x) continue; @@ -1762,7 +1762,7 @@ namespace polynomial { static numeral zero(0); SASSERT(is_univariate(p)); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (p->m(i)->total_degree() == k) return p->a(i); } @@ -1818,7 +1818,7 @@ namespace polynomial { } unsigned r = 0; // use slow (linear) scan. - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned d = p->m(i)->degree_of(x); if (d > r) r = d; @@ -1837,7 +1837,7 @@ namespace polynomial { // use linear scan... if it turns out to be too slow, I should cache total_degree in polynomial unsigned r = 0; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned t = p->m(i)->total_degree(); if (t > r) r = t; @@ -1876,7 +1876,7 @@ namespace polynomial { bool consistent_coeffs(polynomial const * p) { scoped_numeral a(m_manager); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_manager.set(a, p->a(i)); SASSERT(m_manager.eq(a, p->a(i))); } @@ -1896,7 +1896,7 @@ namespace polynomial { if (m.is_one(g)) return false; SASSERT(m.is_pos(g)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m.div(as[i], g, as[i]); } return true; @@ -1925,7 +1925,7 @@ namespace polynomial { SASSERT(m_tmp_ms.size() == m_tmp_as.size()); unsigned sz = m_tmp_ms.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = m_tmp_ms[i]; m_m2pos.reset(m); if (mng.is_zero(m_tmp_as[i])) { @@ -1942,7 +1942,7 @@ namespace polynomial { } } DEBUG_CODE({ - for (unsigned i = j; i < sz; i++) { + for (unsigned i = j; i < sz; ++i) { SASSERT(mng.is_zero(m_tmp_as[i])); } }); @@ -1960,7 +1960,7 @@ namespace polynomial { numeral_manager & mng = m_owner->m_manager; SASSERT(m_tmp_ms.size() == m_tmp_as.size()); unsigned sz = m_tmp_ms.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = m_tmp_ms[i]; m_m2pos.reset(m); mng.reset(m_tmp_as[i]); @@ -1990,7 +1990,7 @@ namespace polynomial { numeral_manager & mng = m_owner->m_manager; unsigned max_pos = UINT_MAX; unsigned sz = m_tmp_as.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!mng.is_zero(m_tmp_as[i])) { if (max_pos == UINT_MAX) { max_pos = i; @@ -2016,7 +2016,7 @@ namespace polynomial { if (mng.is_zero(a)) return; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (CheckZeros && mng.is_zero(p->a(i))) continue; monomial * m2 = p->m(i); @@ -2073,7 +2073,7 @@ namespace polynomial { void add(polynomial const * p) { numeral_manager & mng = m_owner->m_manager; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m2 = p->m(i); unsigned pos = m_m2pos.get(m2); if (pos == UINT_MAX) { @@ -2126,7 +2126,7 @@ namespace polynomial { std::sort(m_tmp_ms.begin(), m_tmp_ms.end(), graded_lex_gt()); numeral_vector new_as; unsigned sz = m_tmp_ms.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = m_tmp_ms[i]; unsigned pos = m_m2pos.get(m); new_as.push_back(numeral()); @@ -2142,13 +2142,13 @@ namespace polynomial { void mod_d(var2degree const & x2d) { numeral_manager & mng = m_owner->m_manager; unsigned sz = m_tmp_ms.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (mng.is_zero(m_tmp_as[i])) continue; monomial * m = m_tmp_ms[i]; unsigned msz = m->size(); unsigned j; - for (j = 0; j < msz; j++) { + for (j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned dx = x2d.degree(x); if (dx == 0) @@ -2173,7 +2173,7 @@ namespace polynomial { void display(std::ostream & out) const { SASSERT(m_tmp_ms.size() == m_tmp_as.size()); numeral_manager & mng = m_owner->m_manager; - for (unsigned i = 0; i < m_tmp_as.size(); i++) { + for (unsigned i = 0; i < m_tmp_as.size(); ++i) { if (i > 0) out << " + "; out << mng.to_string(m_tmp_as[i]) << "*"; m_tmp_ms[i]->display(out); } @@ -2187,7 +2187,7 @@ namespace polynomial { void ensure_capacity(unsigned sz) { unsigned old_sz = m_buffers.size(); - for (unsigned i = old_sz; i < sz; i++) { + for (unsigned i = old_sz; i < sz; ++i) { som_buffer * new_buffer = alloc(som_buffer); if (m_owner) new_buffer->set_owner(m_owner); @@ -2208,7 +2208,7 @@ namespace polynomial { void clear() { reset(); unsigned sz = m_buffers.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { dealloc(m_buffers[i]); } m_buffers.reset(); @@ -2219,7 +2219,7 @@ namespace polynomial { if (m_owner == nullptr) { m_owner = owner; unsigned sz = m_buffers.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_buffers[i]->set_owner(m_owner); } } @@ -2233,7 +2233,7 @@ namespace polynomial { void reset(unsigned sz) { if (sz > m_buffers.size()) sz = m_buffers.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_buffers[i]->reset(); } } @@ -2292,7 +2292,7 @@ namespace polynomial { if (mng.is_zero(a)) return; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m2 = p->m(i); m2 = m_owner->mul(m, m2); // m2 is not in m_tmp_ms @@ -2313,7 +2313,7 @@ namespace polynomial { return; numeral_manager & mng = m_owner->m_manager; unsigned sz = m_tmp_ms.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mng.del(m_tmp_as[i]); m_owner->dec_ref(m_tmp_ms[i]); } @@ -2346,7 +2346,7 @@ namespace polynomial { bool operator<(entry const& other) const { unsigned i = 0; - for (; i < m_monomial.size() && i < other.m_monomial.size(); i++) { + for (; i < m_monomial.size() && i < other.m_monomial.size(); ++i) { if (m_monomial[i].get_var() < other.m_monomial[i].get_var()) return true; if (m_monomial[i].get_var() > other.m_monomial[i].get_var()) @@ -2398,13 +2398,13 @@ namespace polynomial { std::swap(p1, p2); } unsigned sz = sz1 * sz2; - for (unsigned i = m_buffer.size(); i < sz; i++) { + for (unsigned i = m_buffer.size(); i < sz; ++i) { m_buffer.push_back(new (m_region) entry()); m_owner->m_manager.set(m_buffer.back()->m_coeff, 0); } unsigned start = 0, index = 0; - for (unsigned i = 0; i < sz1; i++) { - for (unsigned j = 0; j < sz2; j++) { + for (unsigned i = 0; i < sz1; ++i) { + for (unsigned j = 0; j < sz2; ++j) { entry& e = *m_buffer[index++]; merge(p1->m(i), p2->m(j), e.m_monomial); m_owner->m().mul(p1->a(i), p2->a(j), e.m_coeff); @@ -2606,7 +2606,7 @@ namespace polynomial { } unsigned sz = p->size(); unsigned obj_sz = polynomial::get_obj_size(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_manager.del(p->a(i)); dec_ref(p->m(i)); } @@ -2674,7 +2674,7 @@ namespace polynomial { if (sz == 0) return; unsigned g = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!m.is_int(p->a(i))) { gcd_simplify_slow(p, t); return; @@ -2790,7 +2790,7 @@ namespace polynomial { unsigned sz = p->size(); scoped_mpz g(m); m.set(g, 0); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { auto const& a = p->a(i); if (m.is_one(a) || m.is_minus_one(a)) return; @@ -2857,7 +2857,7 @@ namespace polynomial { polynomial * mk_polynomial(unsigned sz, numeral * as, monomial * const * ms) { m_som_buffer.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_som_buffer.add(as[i], ms[i]); } return m_som_buffer.mk(); @@ -2868,7 +2868,7 @@ namespace polynomial { */ void rational2numeral(unsigned sz, rational const * as) { SASSERT(m_rat2numeral.empty()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(as[i].is_int()); m_rat2numeral.push_back(numeral()); m_manager.set(m_rat2numeral.back(), as[i].to_mpq().numerator()); @@ -2877,7 +2877,7 @@ namespace polynomial { void reset_tmp_as2() { DEBUG_CODE({ - for (unsigned i = 0; i < m_rat2numeral.size(); i++) { + for (unsigned i = 0; i < m_rat2numeral.size(); ++i) { SASSERT(m_manager.is_zero(m_rat2numeral[i])); } }); @@ -2916,7 +2916,7 @@ namespace polynomial { polynomial * mk_linear(unsigned sz, numeral * as, var const * xs, numeral & c) { SASSERT(m_tmp_linear_as.empty()); SASSERT(m_tmp_linear_ms.empty()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_manager.is_zero(as[i])) continue; m_tmp_linear_as.push_back(numeral()); @@ -3016,7 +3016,7 @@ namespace polynomial { } m_som_buffer.reset(); unsigned sz1 = p1->size(); - for (unsigned i = 0; i < sz1; i++) { + for (unsigned i = 0; i < sz1; ++i) { checkpoint(); numeral const & a1 = p1->a(i); monomial * m1 = p1->m(i); @@ -3078,7 +3078,7 @@ namespace polynomial { scoped_numeral new_a1(m_manager); m_som_buffer.reset(); unsigned sz1 = p1->size(); - for (unsigned i = 0; i < sz1; i++) { + for (unsigned i = 0; i < sz1; ++i) { checkpoint(); numeral const & a1 = p1->a(i); m_manager.mul(a, a1, new_a1); @@ -3094,7 +3094,7 @@ namespace polynomial { SASSERT(m_cheap_som_buffer.empty()); unsigned sz = p->size(); scoped_numeral a(m_manager); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_manager.div(p->a(i), d, a); m_cheap_som_buffer.add(a, p->m(i)); } @@ -3124,7 +3124,7 @@ namespace polynomial { } bool is_p_normalized(polynomial const * p) const { - for (unsigned i = 0; i < p->size(); i++) { + for (unsigned i = 0; i < p->size(); ++i) { SASSERT(m().is_p_normalized(p->a(i))); } return true; @@ -3176,7 +3176,7 @@ namespace polynomial { scoped_numeral aux(m()); SASSERT(!m().eq(input, m_inputs[0])); m().sub(input, m_inputs[0], product); - for (unsigned i = 1; i <= k - 1; i++) { + for (unsigned i = 1; i <= k - 1; ++i) { SASSERT(!m().eq(input, m_inputs[i])); m().sub(input, m_inputs[i], aux); m().mul(product, aux, product); @@ -3251,7 +3251,7 @@ namespace polynomial { void newton_interpolation(var x, unsigned d, numeral const * inputs, polynomial * const * outputs, polynomial_ref & r) { SASSERT(m().modular()); newton_interpolator interpolator(*this); - for (unsigned i = 0; i <= d; i++) + for (unsigned i = 0; i <= d; ++i) interpolator.add(inputs[i], outputs[i]); interpolator.mk(x, r); } @@ -3266,7 +3266,7 @@ namespace polynomial { void flush() { unsigned sz = m_data.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) dealloc(m_data[i]); m_data.reset(); } @@ -3313,12 +3313,12 @@ namespace polynomial { m_max_powers = 0; ptr_buffer ms; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ms.push_back(p->m(i)); } std::sort(ms.begin(), ms.end(), lex_lt2(x)); monomial * prev = nullptr; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * orig_m = ms[i]; monomial * m; unsigned k = orig_m->degree_of(x); @@ -3350,7 +3350,7 @@ namespace polynomial { tout << "skeleton: "; display(tout); tout << "\n";); DEBUG_CODE({ unsigned sz = m_entries.size(); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { SASSERT(lex_compare(m_entries[i-1].m_monomial, m_entries[i].m_monomial) < 0); } }); @@ -3358,18 +3358,18 @@ namespace polynomial { ~skeleton() { unsigned sz = m_entries.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { pm.dec_ref(m_entries[i].m_monomial); } sz = m_orig_monomials.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { pm.dec_ref(m_orig_monomials[i]); } } unsigned get_entry_idx(monomial * m) { unsigned sz = m_entries.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_entries[i].m_monomial == m) return i; } @@ -3388,11 +3388,11 @@ namespace polynomial { void display(std::ostream & out) { unsigned sz = m_entries.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { entry & e = m_entries[i]; if (i > 0) out << " "; out << "("; - for (unsigned j = 0; j < e.m_num_powers; j++) { + for (unsigned j = 0; j < e.m_num_powers; ++j) { if (j > 0) out << " "; out << "x" << m_x << "^"; out << m_powers[e.m_first_power_idx + j]; @@ -3412,9 +3412,9 @@ namespace polynomial { // reserve space output values associated with each entry if (sk) { unsigned sz = sk->num_entries(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned num_powers = (*sk)[i].num_powers(); - for (unsigned j = 0; j < num_powers; j++) { + for (unsigned j = 0; j < num_powers; ++j) { m_outputs.push_back(numeral()); } } @@ -3424,16 +3424,16 @@ namespace polynomial { ~sparse_interpolator() { if (m_skeleton) { numeral_manager & m = m_skeleton->pm.m(); - for (unsigned i = 0; i < m_inputs.size(); i++) + for (unsigned i = 0; i < m_inputs.size(); ++i) m.del(m_inputs[i]); - for (unsigned i = 0; i < m_outputs.size(); i++) + for (unsigned i = 0; i < m_outputs.size(); ++i) m.del(m_outputs[i]); } } void reset() { numeral_manager & m = m_skeleton->pm.m(); - for (unsigned i = 0; i < m_inputs.size(); i++) { + for (unsigned i = 0; i < m_inputs.size(); ++i) { m.del(m_inputs[i]); } m_inputs.reset(); @@ -3451,7 +3451,7 @@ namespace polynomial { m_inputs.push_back(numeral()); m.set(m_inputs.back(), in); unsigned sz = q->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * mon = q->m(i); unsigned entry_idx = m_skeleton->get_entry_idx(mon); if (entry_idx == UINT_MAX) @@ -3475,21 +3475,21 @@ namespace polynomial { scoped_numeral aux(m); linear_eq_solver solver(m); unsigned sz = m_skeleton->num_entries(); - for (unsigned k = 0; k < sz; k++) { + for (unsigned k = 0; k < sz; ++k) { skeleton::entry const & e = (*m_skeleton)[k]; unsigned num_pws = e.num_powers(); solver.resize(num_pws); new_as.resize(num_pws); - for (unsigned i = 0; i < num_pws; i++) { + for (unsigned i = 0; i < num_pws; ++i) { numeral & in = m_inputs[i]; cs.reset(); - for (unsigned j = 0; j < num_pws; j++) { + for (unsigned j = 0; j < num_pws; ++j) { m.power(in, m_skeleton->ith_power(e, j), aux); cs.push_back(aux); } unsigned output_idx = e.m_first_power_idx + i; TRACE(sparse_interpolator, tout << "adding new equation:\n"; - for (unsigned i = 0; i < num_pws; i++) { + for (unsigned i = 0; i < num_pws; ++i) { tout << m.to_string(cs[i]) << " "; } tout << "\n";); @@ -3497,14 +3497,14 @@ namespace polynomial { } TRACE(sparse_interpolator, tout << "find coefficients of:\n"; - for (unsigned i = 0; i < num_pws; i++) { + for (unsigned i = 0; i < num_pws; ++i) { m_skeleton->ith_orig_monomial(e, i)->display(tout); tout << "\n"; } tout << "system of equations:\n"; solver.display(tout);); if (!solver.solve(new_as.data())) return false; - for (unsigned i = 0; i < num_pws; i++) { + for (unsigned i = 0; i < num_pws; ++i) { if (!m.is_zero(new_as[i])) { as.push_back(new_as[i]); mons.push_back(m_skeleton->ith_orig_monomial(e, i)); @@ -3523,15 +3523,15 @@ namespace polynomial { void end_vars_incremental(var_vector& xs) { // reset m_found_vars unsigned sz = xs.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m_found_vars[xs[i]] = false; } void vars(polynomial const * p, var_vector & xs) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); if (!m_found_vars[x]) { m_found_vars[x] = true; @@ -3556,10 +3556,10 @@ namespace polynomial { var2pos.reserve(num_vars(), UINT_MAX); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned k = m->degree(j); unsigned pos = var2pos[x]; @@ -3577,14 +3577,14 @@ namespace polynomial { } sz = pws.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(var2pos[pws[i].get_var()] != UINT_MAX); var2pos[pws[i].get_var()] = UINT_MAX; } DEBUG_CODE({ - for (unsigned i = 0; i < pws.size(); i++) { - for (unsigned j = i + 1; j < pws.size(); j++) + for (unsigned i = 0; i < pws.size(); ++i) { + for (unsigned j = i + 1; j < pws.size(); ++j) SASSERT(pws[i].first != pws[j].first); } }); @@ -3603,7 +3603,7 @@ namespace polynomial { SASSERT(m_cheap_som_buffer.empty()); TRACE(coeff_bug, tout << "p: "; p->display(tout, m_manager); tout << "\nx: " << x << ", k: " << k << "\n";); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned d = m->degree_of(x); if (d == k) @@ -3619,7 +3619,7 @@ namespace polynomial { void coeffs(polynomial const * p, var x, som_buffer_vector & cs) { cs.set_owner(this); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned d = m->degree_of(x); som_buffer * c = cs[d]; @@ -3636,7 +3636,7 @@ namespace polynomial { SASSERT(m_cheap_som_buffer.empty()); SASSERT(m_cheap_som_buffer2.empty()); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned d = m->degree_of(x); if (d == k) @@ -3656,7 +3656,7 @@ namespace polynomial { SASSERT(is_valid(x)); m_manager.reset(c); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned d = m->degree_of(x); if (d == k) { @@ -3688,7 +3688,7 @@ namespace polynomial { } m_manager.set(a, p->a(0)); unsigned sz = p->size(); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { if (m_manager.is_one(a)) return; m_manager.gcd(a, p->a(i), a); @@ -3759,7 +3759,7 @@ namespace polynomial { } m_cheap_som_buffer.reset(); scoped_numeral ai(m_manager); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); m_manager.div(p->a(i), a, ai); m_cheap_som_buffer.add_reset(ai, m); @@ -3821,10 +3821,10 @@ namespace polynomial { sbuffer iccp_powers; iccp_filter.resize(d+1, 0); iccp_powers.reset(); - for (unsigned j = 0; j <= d; j++) + for (unsigned j = 0; j <= d; ++j) iccp_filter[j] = 0; unsigned sz = p->size(); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { monomial * m = p->m(j); unsigned k = m->degree_of(x); TRACE(polynomial, tout << "degree of x" << x << " at "; m->display(tout); tout << " is " << k << "\n";); @@ -3837,7 +3837,7 @@ namespace polynomial { } SASSERT(!iccp_powers.empty()); unsigned num_powers = iccp_powers.size(); - for (unsigned j = 0; j < num_powers; j++) { + for (unsigned j = 0; j < num_powers; ++j) { SASSERT(iccp_filter[iccp_powers[j]] > 0); if (iccp_filter[iccp_powers[j]] == 1) { ic(p, i, pp); @@ -3851,7 +3851,7 @@ namespace polynomial { // Compute c using the gcd of coeffs of x^k for k's in iccp_powers polynomial_ref ci(pm()); c = coeff(pp, x, iccp_powers[0]); - for (unsigned j = 1; j < num_powers; j++) { + for (unsigned j = 1; j < num_powers; ++j) { ci = coeff(pp, x, iccp_powers[j]); gcd(c, ci, c); if (is_const(c)) { @@ -3947,15 +3947,15 @@ namespace polynomial { // pp_v <- rem/g*h^{delta} pp_v = exact_div(rem, g); // delta is usually a small number, so I do not compute h^delta - for (unsigned i = 0; i < delta; i++) + for (unsigned i = 0; i < delta; ++i) pp_v = exact_div(pp_v, h); g = lc(pp_u, x); // h <- h^{1-delta}*g^{delta} new_h = mk_one(); - for (unsigned i = 0; i < delta; i++) + for (unsigned i = 0; i < delta; ++i) new_h = mul(new_h, g); if (delta > 1) { - for (unsigned i = 0; i < delta - 1; i++) + for (unsigned i = 0; i < delta - 1; ++i) new_h = exact_div(new_h, h); } h = new_h; @@ -4138,7 +4138,7 @@ namespace polynomial { polynomial_ref candidate(m_wrapper); scoped_numeral p(m()); - for (unsigned i = 0; i < NUM_BIG_PRIMES; i++) { + for (unsigned i = 0; i < NUM_BIG_PRIMES; ++i) { m().set(p, g_big_primes[i]); TRACE(mgcd, tout << "trying prime: " << p << "\n";); { @@ -4239,7 +4239,7 @@ namespace polynomial { ref_buffer no_x_ms(m_wrapper); // monomials that do not contains x unsigned min_degree = UINT_MAX; // min degree of x in p unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned k = m->degree_of(x); if (k == 0) { @@ -4271,7 +4271,7 @@ namespace polynomial { unsigned num_marked = no_x_ms.size(); unsigned num_unmarked = 0; monomial_ref tmp_m(m_wrapper); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned k = m->degree_of(x); if (k == 0) @@ -4287,7 +4287,7 @@ namespace polynomial { SASSERT(num_unmarked <= num_marked); if (num_unmarked < num_marked) { // reset remaining marks - for (unsigned i = 0; i < num_marked; i++) + for (unsigned i = 0; i < num_marked; ++i) m_m2pos.reset(no_x_ms[i]); TRACE(mgcd_detail, tout << "iccp_ZpX, cheap case... invoking ic\n";); ic(p, ci, pp); @@ -4303,7 +4303,7 @@ namespace polynomial { no_x_ms.reset(); som_buffer_vector & som_buffers = m_iccp_ZpX_buffers; som_buffers.set_owner(this); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = pp->m(i); unsigned k = m->degree_of(x); if (k != 0) { @@ -4320,14 +4320,14 @@ namespace polynomial { som->add(pp->a(i), mk_monomial(x, k)); } unsigned num_ms = no_x_ms.size(); - for (unsigned i = 0; i < num_ms; i++) + for (unsigned i = 0; i < num_ms; ++i) m_m2pos.reset(no_x_ms[i]); SASSERT(num_ms > 0); // Compute GCD of all som_buffers polynomial_ref g(m_wrapper); polynomial_ref new_g(m_wrapper); g = som_buffers[0]->mk(); - for (unsigned i = 1; i < num_ms; i++) { + for (unsigned i = 1; i < num_ms; ++i) { polynomial_ref a(m_wrapper); a = som_buffers[i]->mk(); SASSERT(is_univariate(a)); @@ -4358,7 +4358,7 @@ namespace polynomial { monomial_ref max_m(m_wrapper); monomial_ref tmp_m(m_wrapper); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned k = m->degree_of(x); if (k != 0) { @@ -4396,7 +4396,7 @@ namespace polynomial { m().set(r, rand() % p); // check if fresh value... unsigned k = 0; - for (; k < sz; k++) { + for (; k < sz; ++k) { if (m().eq(vals[k], r)) break; } @@ -4468,7 +4468,7 @@ namespace polynomial { unsigned min_deg_q = UINT_MAX; unsigned counter = 0; - for (;; counter++) { + for (;; ++counter) { (void) counter; while (true) { peek_fresh(interpolator.inputs(), p, val); @@ -4584,7 +4584,7 @@ namespace polynomial { SASSERT(num_vars > 1); // should use uni_mod_gcd if univariate var_buffer vars; power_buffer var_min_degrees; - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { SASSERT(u_var_degrees[i].get_var() == v_var_degrees[i].get_var()); var x = u_var_degrees[i].get_var(); unsigned d = std::min(u_var_degrees[i].degree(), v_var_degrees[i].degree()); @@ -4592,7 +4592,7 @@ namespace polynomial { } std::sort(var_min_degrees.begin(), var_min_degrees.end(), power::lt_degree()); m_mgcd_skeletons.reset(); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { vars.push_back(var_min_degrees[i].get_var()); m_mgcd_skeletons.push_back(nullptr); } @@ -4622,7 +4622,7 @@ namespace polynomial { polynomial_ref candidate(m_wrapper); scoped_numeral p(m()); - for (unsigned i = 0; i < NUM_BIG_PRIMES; i++) { + for (unsigned i = 0; i < NUM_BIG_PRIMES; ++i) { m().set(p, g_big_primes[i]); TRACE(mgcd, tout << "trying prime: " << p << "\n";); { @@ -4727,8 +4727,8 @@ namespace polynomial { var_max_degrees(v, v_var_degrees); std::sort(v_var_degrees.begin(), v_var_degrees.end(), power::lt_var()); TRACE(polynomial_gcd, - tout << "u var info\n"; for (unsigned i = 0; i < u_var_degrees.size(); i++) tout << u_var_degrees[i] << " "; tout << "\n"; - tout << "v var info\n"; for (unsigned i = 0; i < v_var_degrees.size(); i++) tout << v_var_degrees[i] << " "; tout << "\n";); + tout << "u var info\n"; for (unsigned i = 0; i < u_var_degrees.size(); ++i) tout << u_var_degrees[i] << " "; tout << "\n"; + tout << "v var info\n"; for (unsigned i = 0; i < v_var_degrees.size(); ++i) tout << v_var_degrees[i] << " "; tout << "\n";); var x = null_var; bool u_found = false; bool v_found = false; @@ -4736,7 +4736,7 @@ namespace polynomial { unsigned u_sz = u_var_degrees.size(); unsigned v_sz = v_var_degrees.size(); unsigned sz = std::min(u_sz, v_sz); - for (; i < sz; i++) { + for (; i < sz; ++i) { var xu = u_var_degrees[i].get_var(); var xv = v_var_degrees[i].get_var(); if (xu < xv) { @@ -4851,7 +4851,7 @@ namespace polynomial { SASSERT(is_valid(x)); SASSERT(m_cheap_som_buffer.empty()); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned d = m->degree_of(x); TRACE(polynomial, m->display(tout); tout << " degree_of x" << x << ": " << d << "\n";); @@ -4947,7 +4947,7 @@ namespace polynomial { } polynomial_ref result(pm()); result = const_cast(p); - for (unsigned i = 1; i < k; i++) + for (unsigned i = 1; i < k; ++i) result = mul(result, const_cast(p)); r = result; #if 0 @@ -4979,7 +4979,7 @@ namespace polynomial { if (max_var(p1) != max_var(p2)) return false; m_m2pos.set(p1); - for (unsigned i = 0; i < sz2; i++) { + for (unsigned i = 0; i < sz2; ++i) { unsigned pos1 = m_m2pos.get(p2->m(i)); if (pos1 == UINT_MAX || !m_manager.eq(p1->a(pos1), p2->a(i))) { m_m2pos.reset(p1); @@ -4998,7 +4998,7 @@ namespace polynomial { var x = max_var(p); unsigned n = degree(p, x); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); SASSERT(m->size() <= 1); monomial * new_m = mk_monomial(x, n - m->degree_of(x)); @@ -5022,7 +5022,7 @@ namespace polynomial { unsigned n = degree(p, x); unsigned sz = p->size(); sbuffer pws; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned k = p->m(i)->degree_of(x); pws.reset(); if (x < y) { @@ -5046,7 +5046,7 @@ namespace polynomial { return const_cast(p); SASSERT(m_cheap_som_buffer.empty()); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); SASSERT(m->size() <= 1); monomial * new_m; @@ -5066,7 +5066,7 @@ namespace polynomial { SASSERT(m_cheap_som_buffer.empty()); scoped_numeral a(m_manager); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); if (m->total_degree() % 2 == 0) { m_cheap_som_buffer.add(p->a(i), p->m(i)); @@ -5089,7 +5089,7 @@ namespace polynomial { unsigned n = degree(p, x); m_degree2pos.reserve(n+1, UINT_MAX); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); SASSERT(m->size() <= 1); SASSERT(m_degree2pos[m->total_degree()] == UINT_MAX); @@ -5103,7 +5103,7 @@ namespace polynomial { void reset_degree2pos(polynomial const * p) { SASSERT(is_univariate(p)); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); SASSERT(m->size() <= 1); SASSERT(m_degree2pos[m->total_degree()] == i); @@ -5146,7 +5146,7 @@ namespace polynomial { scoped_numeral a(m()); m_manager.set(a, p->a(m_degree2pos[d])); r = mk_const(a); - for (unsigned i = 1; i <= d; i++) { + for (unsigned i = 1; i <= d; ++i) { unsigned pos = m_degree2pos[d-i]; if (pos != UINT_MAX) m_manager.set(a, p->a(pos)); @@ -5341,7 +5341,7 @@ namespace polynomial { m_som_buffer2.reset(); // unsigned sz = R->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (sz > 100 && i % 100 == 0) checkpoint(); monomial * m = R->m(i); @@ -5373,7 +5373,7 @@ namespace polynomial { // We have already copied S to m_som_buffer2. // To add l_B * Q, we just traverse Q executing addmul(Q->a(i), Q->m(i), l_B) unsigned sz = Q->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_som_buffer2.addmul(Q->a(i), Q->m(i), l_B); } if (ModD) @@ -5775,7 +5775,7 @@ namespace polynomial { A = B; // B <- R/g*h^{delta} B = exact_div(R, g); - for (unsigned i = 0; i < delta; i++) + for (unsigned i = 0; i < delta; ++i) B = exact_div(B, h); // g <- lc(A) g = lc(A, x); @@ -5783,7 +5783,7 @@ namespace polynomial { new_h = mk_one(); pw(g, delta, new_h); if (delta > 1) { - for (unsigned i = 0; i < delta - 1; i++) + for (unsigned i = 0; i < delta - 1; ++i) new_h = exact_div(new_h, h); } h = new_h; @@ -5793,7 +5793,7 @@ namespace polynomial { new_h = lc(B, x); pw(new_h, degA, new_h); if (degA > 1) { - for (unsigned i = 0; i < degA - 1; i++) + for (unsigned i = 0; i < degA - 1; ++i) new_h = exact_div(new_h, h); } h = new_h; @@ -5890,7 +5890,7 @@ namespace polynomial { newS = lc(sRes.get(j), x); pw(newS, j-r, newS); newS = mul(newS, sRes.get(j)); - for (unsigned i = 0; i < j-r; i++) + for (unsigned i = 0; i < j-r; ++i) newS = exact_div(newS, R_j_plus_1); sRes.set(r, newS); @@ -5899,7 +5899,7 @@ namespace polynomial { exact_pseudo_remainder(sRes.get(j+1), sRes.get(j), x, prem); // sRes_{r-1} = prem/(-R_j_plus_1)^{j-r+2} newS = prem; - for (unsigned i = 0; i < j-r+2; i++) + for (unsigned i = 0; i < j-r+2; ++i) newS = exact_div(newS, R_j_plus_1); if ((j-r+2)%2 == 1) newS = neg(newS); @@ -5961,7 +5961,7 @@ namespace polynomial { s_e = lc(S_e, x); polynomial_ref_buffer H(pm()); x_j = mk_one(); - for (unsigned j = 0; j <= e - 1; j++) { + for (unsigned j = 0; j <= e - 1; ++j) { // H_j <- s_e * x^j x_j = mk_polynomial(x, j); H.push_back(mul(s_e, x_j)); @@ -5974,7 +5974,7 @@ namespace polynomial { SASSERT(H.size() == e+1); polynomial_ref x_pol(pm()), xH(pm()), xHe(pm()); x_pol = mk_polynomial(x, 1); - for (unsigned j = e + 1; j <= d - 1; j++) { + for (unsigned j = e + 1; j <= d - 1; ++j) { // H_j <- x H_{j-1} - (coeff(x H_{j-1}, e) * S_{d-1})/c_{d-1} xH = mul(x_pol, H[j-1]); xHe = coeff(xH, x, e); @@ -5986,7 +5986,7 @@ namespace polynomial { // D <- (Sum coeff(A,j) * H[j])/lc(A) polynomial_ref D(pm()); D = mk_zero(); - for (unsigned j = 0; j < d; j++) { + for (unsigned j = 0; j < d; ++j) { tmp = coeff(A, x, j); tmp = mul(tmp, H[j]); D = add(D, tmp); @@ -6083,14 +6083,14 @@ namespace polynomial { unsigned sz = p->size(); if (m().modular()) { unsigned i = 0; - for (; i < sz; i++) { + for (; i < sz; ++i) { if (!m().is_p_normalized(p->a(i))) break; } if (i < sz) { m_cheap_som_buffer.reset(); scoped_numeral a(m_manager); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); m_manager.set(a, p->a(i)); m_cheap_som_buffer.add_reset(a, m); @@ -6105,7 +6105,7 @@ namespace polynomial { return const_cast(p); m_cheap_som_buffer.reset(); scoped_numeral a(m_manager); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); m_manager.div(p->a(i), g, a); m_cheap_som_buffer.add_reset(a, m); @@ -6117,7 +6117,7 @@ namespace polynomial { SASSERT(m_cheap_som_buffer.empty()); scoped_numeral minus_a(m_manager); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_manager.set(minus_a, p->a(i)); m_manager.neg(minus_a); m_cheap_som_buffer.add(minus_a, p->m(i)); @@ -6195,7 +6195,7 @@ namespace polynomial { R.add(a, m1); // C <- p - m1*m1 unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i == max_pos) continue; C.add(p->a(i), p->m(i)); @@ -6226,7 +6226,7 @@ namespace polynomial { // C <- C - 2*R*a_i*m_i - a_i*a_i*m_i*m_i unsigned R_sz = R.size(); - for (unsigned j = 0; j < R_sz; j++) { + for (unsigned j = 0; j < R_sz; ++j) { if (m_manager.is_zero(R.a(j))) continue; m_manager.mul(R.a(j), a_i, aux); @@ -6245,9 +6245,9 @@ namespace polynomial { } void rename(unsigned sz, var const * xs) { - TRACE(rename, for (unsigned i = 0; i < sz; i++) tout << xs[i] << " "; tout << "\n"; + TRACE(rename, for (unsigned i = 0; i < sz; ++i) tout << xs[i] << " "; tout << "\n"; tout << "polynomials before rename\n"; - for (unsigned i = 0; i < m_polynomials.size(); i++) { + for (unsigned i = 0; i < m_polynomials.size(); ++i) { if (m_polynomials[i] == 0) continue; m_polynomials[i]->display(tout, m_manager); @@ -6263,7 +6263,7 @@ namespace polynomial { } TRACE(rename, tout << "polynomials after rename\n"; - for (unsigned i = 0; i < m_polynomials.size(); i++) { + for (unsigned i = 0; i < m_polynomials.size(); ++i) { if (m_polynomials[i] == 0) continue; m_polynomials[i]->display(tout, m_manager); @@ -6301,7 +6301,7 @@ namespace polynomial { bool is_pos(polynomial const * p) { bool found_unit = false; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!p->m(i)->is_power_of_two()) return false; if (p->m(i) == mk_unit()) @@ -6315,7 +6315,7 @@ namespace polynomial { bool is_neg(polynomial const * p) { bool found_unit = false; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!p->m(i)->is_power_of_two()) return false; if (p->m(i) == mk_unit()) @@ -6328,7 +6328,7 @@ namespace polynomial { bool is_nonpos(polynomial const * p) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!p->m(i)->is_power_of_two()) return false; if (!m_manager.is_neg(p->a(i))) @@ -6339,7 +6339,7 @@ namespace polynomial { bool is_nonneg(polynomial const * p) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!p->m(i)->is_power_of_two()) return false; if (!m_manager.is_pos(p->a(i))) @@ -6398,10 +6398,10 @@ namespace polynomial { public: void init(polynomial const * p) { unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned k = m->degree(j); unsigned max_k = m_max_degree.get(x, 0); @@ -6416,7 +6416,7 @@ namespace polynomial { void reset() { auto sz = m_xs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_max_degree[m_xs[i]] = 0; } m_xs.reset(); @@ -6455,7 +6455,7 @@ namespace polynomial { unsigned xs_sz = var2max_degree.num_vars(); var const * xs = var2max_degree.vars(); bool found = false; - for (unsigned i = 0; i < xs_sz; i++) { + for (unsigned i = 0; i < xs_sz; ++i) { var x = xs[i]; if (x2v.contains(x) && var2max_degree(x) > 0) { found = true; @@ -6471,13 +6471,13 @@ namespace polynomial { som_buffer & R = m_som_buffer; tmp_monomial & new_m = m_tmp1; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); unsigned new_msz = 0; m_manager.set(new_a, p->a(i)); new_m.reserve(msz); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned k = m->degree(j); if (x2v.contains(x)) { @@ -6498,7 +6498,7 @@ namespace polynomial { } // For each variable x in xs that does not occur in m, I // should include (x2v(x).denominator())^{var2max_degree(x)} to new_a - for (unsigned j = 0; j < xs_sz; j++) { + for (unsigned j = 0; j < xs_sz; ++j) { var x = xs[j]; if (m_found_vars[x]) continue; @@ -6508,7 +6508,7 @@ namespace polynomial { } } // Reset m_found_vars - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); m_found_vars[x] = false; } @@ -6525,14 +6525,14 @@ namespace polynomial { unsigned_vector m_pos; void init(unsigned sz, var const * xs) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(m_pos.get(xs[i], UINT_MAX) == UINT_MAX); m_pos.setx(xs[i], i, UINT_MAX); } } void reset(unsigned sz, var const * xs) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(m_pos.get(xs[i], UINT_MAX) != UINT_MAX); m_pos[xs[i]] = UINT_MAX; } @@ -6578,7 +6578,7 @@ namespace polynomial { polynomial * substitute(polynomial const * p, unsigned xs_sz, var const * xs, numeral const * vs) { TRACE(polynomial, tout << "substitute num_vars: " << xs_sz << "\n"; - for (unsigned i = 0; i < xs_sz; i++) { tout << "x" << xs[i] << " -> " << m_manager.to_string(vs[i]) << "\n"; }); + for (unsigned i = 0; i < xs_sz; ++i) { tout << "x" << xs[i] << " -> " << m_manager.to_string(vs[i]) << "\n"; }); scoped_var_pos var2pos(m_var_pos, xs_sz, xs); scoped_numeral new_a(m_manager); scoped_numeral tmp(m_manager); @@ -6586,13 +6586,13 @@ namespace polynomial { som_buffer & R = m_som_buffer; tmp_monomial & new_m = m_tmp1; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); unsigned new_msz = 0; m_manager.set(new_a, p->a(i)); new_m.reserve(msz); - for (unsigned j = 0; j < msz; j++) { + for (unsigned j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned k = m->degree(j); unsigned pos = var2pos(x); @@ -6645,7 +6645,7 @@ namespace polynomial { polynomial_ref p1(pm()), q1(pm()); polynomial_ref_buffer ps(pm()); unsigned sz = r->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m0 = r->m(i); unsigned dm = m0->degree_of(x); SASSERT(md >= dm); @@ -6683,7 +6683,7 @@ namespace polynomial { monomial * m = p->m(start); SASSERT(m->degree_of(x) > 0); unsigned sz = m->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var y = m->get_var(i); if (y > x) break; @@ -6715,7 +6715,7 @@ namespace polynomial { } unsigned j = i+1; unsigned next_d = 0; - for (; j < end; j++) { + for (; j < end; ++j) { unsigned d_j = p->m(j)->degree_of(x); SASSERT(d_j <= d); if (d_j < d) { @@ -6800,7 +6800,7 @@ namespace polynomial { var const * xs = var2max_degree.vars(); var min_x = null_var; unsigned deg_min = UINT_MAX; - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { var x_i = xs[i]; unsigned deg_x_i = var2max_degree(x_i); if (deg_x_i < deg_min) { @@ -6945,7 +6945,7 @@ namespace polynomial { p->display(tout, m()); tout << "\n";); polynomial_ref f(pm()); unsigned num_factors = fs.distinct_factors(); - for (unsigned i = 0; i < num_factors; i++) { + for (unsigned i = 0; i < num_factors; ++i) { numeral_vector const & f1 = fs[i]; unsigned k1 = fs.get_degree(i); f = to_polynomial(f1.size(), f1.data(), x); @@ -7070,7 +7070,7 @@ namespace polynomial { if (sz == 0) return mk_zero(); _scoped_numeral_buffer coeffs(m_manager); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { coeffs.push_back(numeral()); m_manager.set(coeffs.back(), p[i]); } @@ -7091,7 +7091,7 @@ namespace polynomial { m_cheap_som_buffer.reset(); cheap_som_buffer & R = m_cheap_som_buffer; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().set(new_a, p->a(i)); m().mul(new_a, inv_c, new_a); R.add(new_a, p->m(i)); @@ -7107,16 +7107,16 @@ namespace polynomial { som_buffer_vector & as = m_translate_buffers; m_translate_buffers.reset(deg_x+1); coeffs(p, x, as); - for (unsigned i = 1; i <= deg_x; i++) { + for (unsigned i = 1; i <= deg_x; ++i) { checkpoint(); - for (unsigned k = deg_x-i; k <= deg_x-1; k++) { + for (unsigned k = deg_x-i; k <= deg_x-1; ++k) { as[k]->addmul(v, as[k+1]); } } monomial_ref xk(pm()); som_buffer & R = m_som_buffer; R.reset(); - for (unsigned k = 0; k <= deg_x; k++) { + for (unsigned k = 0; k <= deg_x; ++k) { xk = mk_monomial(x, k); R.addmul(xk, as[k]); } @@ -7128,7 +7128,7 @@ namespace polynomial { r = const_cast(p); if (xs_sz == 0 || is_const(p)) return; - for (unsigned i = 0; i < xs_sz; i++) + for (unsigned i = 0; i < xs_sz; ++i) r = translate(r, xs[i], vs[i]); } @@ -7139,11 +7139,11 @@ namespace polynomial { cheap_som_buffer & R = m_cheap_som_buffer; R.reset(); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial * m = p->m(i); unsigned msz = m->size(); unsigned j; - for (j = 0; j < msz; j++) { + for (j = 0; j < msz; ++j) { var x = m->get_var(j); unsigned dx = x2d.degree(x); if (dx == 0) @@ -7710,7 +7710,7 @@ polynomial::polynomial * convert(polynomial::manager & sm, polynomial::polynomia else if (&(sm.mm()) == &(tm.mm())) { // polynomial managers share the same monomial manager. // So, we don't need to convert monomials. - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { polynomial::monomial * m = sm.get_monomial(p, i); if (x == polynomial::null_var || sm.degree_of(m, x) <= max_d) { ms.push_back(m); @@ -7720,7 +7720,7 @@ polynomial::polynomial * convert(polynomial::manager & sm, polynomial::polynomia } } else { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { polynomial::monomial * m = sm.get_monomial(p, i); if (x == polynomial::null_var || sm.degree_of(m, x) <= max_d) { ms.push_back(tm.convert(m)); @@ -7734,7 +7734,7 @@ polynomial::polynomial * convert(polynomial::manager & sm, polynomial::polynomia std::ostream & operator<<(std::ostream & out, polynomial_ref_vector const & seq) { unsigned sz = seq.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { seq.m().display(out, seq.get(i)); out << "\n"; } diff --git a/src/math/polynomial/polynomial_cache.cpp b/src/math/polynomial/polynomial_cache.cpp index d5953243c..ef407023d 100644 --- a/src/math/polynomial/polynomial_cache.cpp +++ b/src/math/polynomial/polynomial_cache.cpp @@ -151,7 +151,7 @@ namespace polynomial { entry->~psc_chain_entry(); m_allocator.deallocate(sizeof(psc_chain_entry), entry); S.reset(); - for (unsigned i = 0; i < old_entry->m_result_sz; i++) { + for (unsigned i = 0; i < old_entry->m_result_sz; ++i) { S.push_back(old_entry->m_result[i]); } } @@ -160,7 +160,7 @@ namespace polynomial { unsigned sz = S.size(); entry->m_result_sz = sz; entry->m_result = static_cast(m_allocator.allocate(sizeof(polynomial*)*sz)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { polynomial * h = mk_unique(S.get(i)); S.set(i, h); entry->m_result[i] = h; @@ -178,7 +178,7 @@ namespace polynomial { entry->~factor_entry(); m_allocator.deallocate(sizeof(factor_entry), entry); distinct_factors.reset(); - for (unsigned i = 0; i < old_entry->m_result_sz; i++) { + for (unsigned i = 0; i < old_entry->m_result_sz; ++i) { distinct_factors.push_back(old_entry->m_result[i]); } } @@ -188,7 +188,7 @@ namespace polynomial { unsigned sz = fs.distinct_factors(); entry->m_result_sz = sz; entry->m_result = static_cast(m_allocator.allocate(sizeof(polynomial*)*sz)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { polynomial * h = mk_unique(fs[i]); distinct_factors.push_back(h); entry->m_result[i] = h; diff --git a/src/math/polynomial/polynomial_var2value.h b/src/math/polynomial/polynomial_var2value.h index 42edc852b..11e8c3bb8 100644 --- a/src/math/polynomial/polynomial_var2value.h +++ b/src/math/polynomial/polynomial_var2value.h @@ -34,7 +34,7 @@ namespace polynomial { ValManager & m() const override { return m_vs.m(); } bool contains(var x) const override { return std::find(m_xs.begin(), m_xs.end(), x) != m_xs.end(); } typename ValManager::numeral const & operator()(var x) const override { - for (unsigned i = 0; i < m_xs.size(); i++) + for (unsigned i = 0; i < m_xs.size(); ++i) if (m_xs[i] == x) return m_vs[i]; UNREACHABLE(); diff --git a/src/math/polynomial/rpolynomial.cpp b/src/math/polynomial/rpolynomial.cpp index dd1b82994..67b882525 100644 --- a/src/math/polynomial/rpolynomial.cpp +++ b/src/math/polynomial/rpolynomial.cpp @@ -105,7 +105,7 @@ namespace rpolynomial { p = todo.back(); todo.pop_back(); unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn = p->arg(i); if (pn == nullptr) continue; @@ -152,7 +152,7 @@ namespace rpolynomial { if (is_const(p)) return false; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn = p->arg(i); if (pn == nullptr) continue; @@ -168,7 +168,7 @@ namespace rpolynomial { unsigned sz = p->size(); SASSERT(sz > 0); SASSERT(p->arg(sz - 1) != 0); - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { if (p->arg(i) != nullptr) return false; } @@ -192,7 +192,7 @@ namespace rpolynomial { if (p1->max_var() != p2->max_var()) return false; unsigned sz = p1->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn1 = p1->arg(i); poly_or_num * pn2 = p2->arg(i); if (pn1 == nullptr && pn2 == nullptr) @@ -215,7 +215,7 @@ namespace rpolynomial { } void inc_ref_args(unsigned sz, poly_or_num * const * args) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn = args[i]; if (pn == nullptr || is_num(pn)) continue; @@ -224,7 +224,7 @@ namespace rpolynomial { } void dec_ref_args(unsigned sz, poly_or_num * const * args) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn = args[i]; if (pn == nullptr || is_num(pn)) continue; @@ -251,7 +251,7 @@ namespace rpolynomial { new_pol->m_ref_count = 0; new_pol->m_var = max_var; new_pol->m_size = sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly_or_num * pn = args[i]; if (is_poly(pn)) { inc_ref(to_poly(pn)); @@ -313,7 +313,7 @@ namespace rpolynomial { return mk_const(one); } ptr_buffer new_args; - for (unsigned i = 0; i < k; i++) + for (unsigned i = 0; i < k; ++i) new_args.push_back(0); numeral * new_arg = mk_numeral(); m_manager.set(*new_arg, 1); @@ -358,7 +358,7 @@ namespace rpolynomial { unsigned sz = _p->size(); SASSERT(sz > 1); ptr_buffer new_args; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { new_args.push_back(mul_core(c, _p->arg(i))); } return mk_poly_core(new_args.size(), new_args.data(), _p->max_var()); @@ -399,7 +399,7 @@ namespace rpolynomial { SASSERT(sz > 1); ptr_buffer new_args; new_args.push_back(add_core(c, _p->arg(0))); - for (unsigned i = 1; i < sz; i++) + for (unsigned i = 1; i < sz; ++i) new_args.push_back(_p->arg(1)); return mk_poly_core(new_args.size(), new_args.data(), _p->max_var()); } @@ -434,7 +434,7 @@ namespace rpolynomial { polynomial * new_arg = add(p1, to_poly(pn0)); new_args.push_back(to_poly_or_num(new_arg)); } - for (unsigned i = 1; i < sz; i++) + for (unsigned i = 1; i < sz; ++i) new_args.push_back(p2->arg(i)); return mk_poly(sz, new_args.c_ptr(), p2->max_var()); } @@ -463,7 +463,7 @@ namespace rpolynomial { unsigned sz2 = p2->size(); unsigned msz = std::min(sz1, sz2); ptr_buffer new_args; - for (unsigned i = 0; i < msz; i++) { + for (unsigned i = 0; i < msz; ++i) { poly_or_num * pn1 = p1->arg(i); poly_or_num * pn2 = p2->arg(i); if (pn1 == 0) { @@ -506,10 +506,10 @@ namespace rpolynomial { } } SASSERT(new_args.size() == sz1 || new_args.size() == sz2); - for (unsigned i = msz; i < sz1; i++) { + for (unsigned i = msz; i < sz1; ++i) { new_args.push_back(p1->arg(i)); } - for (unsigned i = msz; i < sz2; i++) { + for (unsigned i = msz; i < sz2; ++i) { new_args.push_back(p2->arg(i)); } SASSERT(new_args.size() == std::max(sz1, sz2)); @@ -612,11 +612,11 @@ namespace rpolynomial { mul_buffer.resize(sz); unsigned sz1 = p1->size(); unsigned sz2 = p2->size(); - for (unsigned i1 = 0; i1 < sz1; i1++) { + for (unsigned i1 = 0; i1 < sz1; ++i1) { poly_or_num * pn1 = p1->arg(i1); if (pn1 == 0) continue; - for (unsigned i2 = 0; i2 < sz2; i2++) { + for (unsigned i2 = 0; i2 < sz2; ++i2) { poly_or_num * pn2 = p2->arg(i2); if (pn2 == 0) continue; diff --git a/src/math/polynomial/sexpr2upolynomial.cpp b/src/math/polynomial/sexpr2upolynomial.cpp index 25c85a0ab..ea50ce7c0 100644 --- a/src/math/polynomial/sexpr2upolynomial.cpp +++ b/src/math/polynomial/sexpr2upolynomial.cpp @@ -42,7 +42,7 @@ void sexpr2upolynomial(upolynomial::manager & m, sexpr const * s, upolynomial::n throw sexpr2upolynomial_exception("invalid univariate polynomial, '+' operator expects at least one argument", s); sexpr2upolynomial(m, s->get_child(1), p, depth+1); upolynomial::scoped_numeral_vector arg(m); - for (unsigned i = 2; i < num; i++) { + for (unsigned i = 2; i < num; ++i) { m.reset(arg); sexpr2upolynomial(m, s->get_child(i), arg, depth+1); m.add(arg.size(), arg.data(), p.size(), p.data(), p); @@ -57,7 +57,7 @@ void sexpr2upolynomial(upolynomial::manager & m, sexpr const * s, upolynomial::n return; } upolynomial::scoped_numeral_vector arg(m); - for (unsigned i = 2; i < num; i++) { + for (unsigned i = 2; i < num; ++i) { m.reset(arg); sexpr2upolynomial(m, s->get_child(i), arg, depth+1); m.sub(p.size(), p.data(), arg.size(), arg.data(), p); @@ -68,7 +68,7 @@ void sexpr2upolynomial(upolynomial::manager & m, sexpr const * s, upolynomial::n throw sexpr2upolynomial_exception("invalid univariate polynomial, '*' operator expects at least one argument", s); sexpr2upolynomial(m, s->get_child(1), p, depth+1); upolynomial::scoped_numeral_vector arg(m); - for (unsigned i = 2; i < num; i++) { + for (unsigned i = 2; i < num; ++i) { m.reset(arg); sexpr2upolynomial(m, s->get_child(i), arg, depth+1); m.mul(arg.size(), arg.data(), p.size(), p.data(), p); diff --git a/src/math/polynomial/upolynomial.cpp b/src/math/polynomial/upolynomial.cpp index 241f48b20..2cf2a7b4e 100644 --- a/src/math/polynomial/upolynomial.cpp +++ b/src/math/polynomial/upolynomial.cpp @@ -147,7 +147,7 @@ namespace upolynomial { reset(m_gcd_tmp1); reset(m_gcd_tmp2); reset(m_CRA_tmp); - for (unsigned i = 0; i < UPOLYNOMIAL_MGCD_TMPS; i++) reset(m_mgcd_tmp[i]); + for (unsigned i = 0; i < UPOLYNOMIAL_MGCD_TMPS; ++i) reset(m_mgcd_tmp[i]); reset(m_sqf_tmp1); reset(m_sqf_tmp2); reset(m_pw_tmp); @@ -174,7 +174,7 @@ namespace upolynomial { unsigned old_sz = buffer.size(); SASSERT(old_sz >= sz); // delete old entries - for (unsigned i = sz; i < old_sz; i++) { + for (unsigned i = sz; i < old_sz; ++i) { m().del(buffer[i]); } buffer.shrink(sz); @@ -193,7 +193,7 @@ namespace upolynomial { return; } buffer.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().set(buffer[i], p[i]); } set_size(sz, buffer); @@ -201,7 +201,7 @@ namespace upolynomial { void core_manager::set(unsigned sz, rational const * p, numeral_vector & buffer) { buffer.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(p[i].is_int()); m().set(buffer[i], p[i].to_mpq().numerator()); } @@ -217,7 +217,7 @@ namespace upolynomial { } else { pp.reserve(f_sz); - for (unsigned i = 0; i < f_sz; i++) { + for (unsigned i = 0; i < f_sz; ++i) { if (!m().is_zero(f[i])) { m().div(f[i], cont, pp[i]); } @@ -231,7 +231,7 @@ namespace upolynomial { // Negate coefficients of p. void core_manager::neg(unsigned sz, numeral * p) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().neg(p[i]); } } @@ -240,7 +240,7 @@ namespace upolynomial { void core_manager::neg_core(unsigned sz, numeral const * p, numeral_vector & buffer) { SASSERT(!is_alias(p, buffer)); buffer.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().set(buffer[i], p[i]); m().neg(buffer[i]); } @@ -260,13 +260,13 @@ namespace upolynomial { unsigned max_sz = std::max(sz1, sz2); unsigned i = 0; buffer.reserve(max_sz); - for (; i < min_sz; i++) { + for (; i < min_sz; ++i) { m().add(p1[i], p2[i], buffer[i]); } - for (; i < sz1; i++) { + for (; i < sz1; ++i) { m().set(buffer[i], p1[i]); } - for (; i < sz2; i++) { + for (; i < sz2; ++i) { m().set(buffer[i], p2[i]); } set_size(max_sz, buffer); @@ -285,13 +285,13 @@ namespace upolynomial { unsigned max_sz = std::max(sz1, sz2); unsigned i = 0; buffer.reserve(max_sz); - for (; i < min_sz; i++) { + for (; i < min_sz; ++i) { m().sub(p1[i], p2[i], buffer[i]); } - for (; i < sz1; i++) { + for (; i < sz1; ++i) { m().set(buffer[i], p1[i]); } - for (; i < sz2; i++) { + for (; i < sz2; ++i) { m().set(buffer[i], p2[i]); m().neg(buffer[i]); } @@ -317,19 +317,19 @@ namespace upolynomial { else { unsigned new_sz = sz1 + sz2 - 1; buffer.reserve(new_sz); - for (unsigned i = 0; i < new_sz; i++) { + for (unsigned i = 0; i < new_sz; ++i) { m().reset(buffer[i]); } if (sz1 < sz2) { std::swap(sz1, sz2); std::swap(p1, p2); } - for (unsigned i = 0; i < sz1; i++) { + for (unsigned i = 0; i < sz1; ++i) { checkpoint(); numeral const & a_i = p1[i]; if (m().is_zero(a_i)) continue; - for (unsigned j = 0; j < sz2; j++) { + for (unsigned j = 0; j < sz2; ++j) { numeral const & b_j = p2[j]; if (m().is_zero(b_j)) continue; @@ -352,7 +352,7 @@ namespace upolynomial { return; } buffer.reserve(sz - 1); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { numeral d; m().set(d, i); m().mul(p[i], d, buffer[i-1]); @@ -375,7 +375,7 @@ namespace upolynomial { m().gcd(sz, p, g); if (m().is_one(g)) return; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { #ifdef Z3DEBUG scoped_numeral old_p_i(m()); old_p_i = p[i]; @@ -402,7 +402,7 @@ namespace upolynomial { SASSERT(!m().is_zero(b)); if (m().is_one(b)) return; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { CTRACE(upolynomial, !m().divides(b, p[i]), tout << "b: " << m().to_string(b) << ", p[i]: " << m().to_string(p[i]) << "\n";); SASSERT(m().divides(b, p[i])); m().div(p[i], b, p[i]); @@ -413,7 +413,7 @@ namespace upolynomial { SASSERT(!m().is_zero(b)); if (m().is_one(b)) return; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().mul(p[i], b, p[i]); } } @@ -468,21 +468,21 @@ namespace upolynomial { numeral & ratio = a_m; m().div(r[sz1 - 1], b_n, ratio); m().add(q[m_n], ratio, q[m_n]); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { m().submul(r[i + m_n], ratio, p2[i], r[i + m_n]); } } else { d++; m().set(a_m, r[sz1 - 1]); - for (unsigned i = 0; i < sz1 - 1; i++) { + for (unsigned i = 0; i < sz1 - 1; ++i) { m().mul(r[i], b_n, r[i]); } - for (unsigned i = 0; i < qsz; i++) { + for (unsigned i = 0; i < qsz; ++i) { m().mul(q[i], b_n, q[i]); } m().add(q[m_n], a_m, q[m_n]); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { m().submul(r[i + m_n], a_m, p2[i], r[i + m_n]); } } @@ -537,7 +537,7 @@ namespace upolynomial { if (field()) { numeral & ratio = a_m; m().div(buffer[sz1 - 1], b_n, ratio); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { m().submul(buffer[i + m_n], ratio, p2[i], buffer[i + m_n]); } } @@ -548,12 +548,12 @@ namespace upolynomial { m().set(a_m, buffer[sz1 - 1]); TRACE(rem_bug, tout << "a_m: " << m().to_string(a_m) << ", b_n: " << m().to_string(b_n) << "\n";); // don't need to update position sz1 - 1, since it will become 0 - for (unsigned i = 0; i < sz1 - 1; i++) { + for (unsigned i = 0; i < sz1 - 1; ++i) { m().mul(buffer[i], b_n, buffer[i]); } // buffer: a_m * x^m + b_n * a_{m-1} * x^{m-1} + ... + b_n * a_0 // don't need to process i = sz2 - 1, because buffer[sz1 - 1] will become 0. - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { m().submul(buffer[i + m_n], a_m, p2[i], buffer[i + m_n]); } } @@ -591,7 +591,7 @@ namespace upolynomial { return false; unsigned delta = sz1 - sz2; m().div(_p1[sz1-1], p2[sz2-1], b); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { if (!m().is_zero(p2[i])) m().submul(_p1[i+delta], b, p2[i], _p1[i+delta]); } @@ -637,7 +637,7 @@ namespace upolynomial { unsigned delta = sz1 - sz2; numeral & a_r = _r[delta]; m().div(_p1[sz1-1], p2[sz2-1], a_r); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { if (!m().is_zero(p2[i])) m().submul(_p1[i+delta], a_r, p2[i], _p1[i+delta]); } @@ -653,7 +653,7 @@ namespace upolynomial { if (sz == 0) return; if (m().is_neg(buffer[sz - 1])) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m().neg(buffer[i]); } } @@ -705,13 +705,13 @@ namespace upolynomial { unsigned sz1 = C1.size(); unsigned sz2 = C2.size(); unsigned sz = std::min(sz1, sz2); - for (; i < sz; i++) { + for (; i < sz; ++i) { ADD(C1[i], C2[i]); } - for (; i < sz1; i++) { + for (; i < sz1; ++i) { ADD(C1[i], zero); } - for (; i < sz2; i++) { + for (; i < sz2; ++i) { ADD(zero, C2[i]); } m().set(b2, new_bound); @@ -745,7 +745,7 @@ namespace upolynomial { numeral_vector & q = m_mgcd_tmp[4]; numeral_vector & C = m_mgcd_tmp[5]; - for (unsigned i = 0; i < NUM_BIG_PRIMES; i++) { + for (unsigned i = 0; i < NUM_BIG_PRIMES; ++i) { m().set(p, polynomial::g_big_primes[i]); TRACE(mgcd, tout << "trying prime: " << p << "\n";); { @@ -1005,7 +1005,7 @@ namespace upolynomial { numeral_vector & result = m_pw_tmp; set(sz, p, result); - for (unsigned i = 1; i < k; i++) + for (unsigned i = 1; i < k; ++i) mul(m_pw_tmp.size(), m_pw_tmp.data(), sz, p, m_pw_tmp); r.swap(result); #if 0 @@ -1205,7 +1205,7 @@ namespace upolynomial { unsigned non_zero_idx = UINT_MAX; unsigned num_non_zeros = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (cm.m().is_zero(p[i])) continue; non_zero_idx = i; @@ -1245,7 +1245,7 @@ namespace upolynomial { bool core_manager::eq(unsigned sz1, numeral const * p1, unsigned sz2, numeral const * p2) { if (sz1 != sz2) return false; - for (unsigned i = 0; i < sz1; i++) { + for (unsigned i = 0; i < sz1; ++i) { if (!m().eq(p1[i], p2[i])) return false; } @@ -1255,7 +1255,7 @@ namespace upolynomial { void upolynomial_sequence::push(unsigned sz, numeral * p) { m_begins.push_back(m_seq_coeffs.size()); m_szs.push_back(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_seq_coeffs.push_back(numeral()); swap(m_seq_coeffs.back(), p[i]); } @@ -1264,7 +1264,7 @@ namespace upolynomial { void upolynomial_sequence::push(numeral_manager & m, unsigned sz, numeral const * p) { m_begins.push_back(m_seq_coeffs.size()); m_szs.push_back(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_seq_coeffs.push_back(numeral()); m.set(m_seq_coeffs.back(), p[i]); } @@ -1310,7 +1310,7 @@ namespace upolynomial { } unsigned new_sz = sz - i; buffer.reserve(new_sz); - for (unsigned j = 0; j < new_sz; j++) { + for (unsigned j = 0; j < new_sz; ++j) { m().set(buffer[j], p[j + i]); } set_size(new_sz, buffer); @@ -1363,7 +1363,7 @@ namespace upolynomial { unsigned r = 0; auto prev_sign = sign_zero; unsigned i = 0; - for (; i < sz; i++) { + for (; i < sz; ++i) { auto sign = sign_of(p[i]); if (sign == sign_zero) continue; @@ -1390,7 +1390,7 @@ namespace upolynomial { // slow version unsigned n = Q.size() - 1; unsigned i; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { for (unsigned k = i; k >= 1; k--) { m().add(Q[k], Q[k-1], Q[k]); } @@ -1404,10 +1404,10 @@ namespace upolynomial { // a0 2a0+a1 3a0+2a1+a2 // a0 3a0+a1 // a0 - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); unsigned k; - for (k = 1; k < sz - i; k++) { + for (k = 1; k < sz - i; ++k) { m().add(Q[k], Q[k-1], Q[k]); } auto sign = sign_of(Q[k-1]); @@ -1480,9 +1480,9 @@ namespace upolynomial { if (sz <= 1) return; unsigned n = sz - 1; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { checkpoint(); - for (unsigned k = n-i; k <= n-1; k++) + for (unsigned k = n-i; k <= n-1; ++k) m().add(p[k], p[k+1], p[k]); } } @@ -1493,9 +1493,9 @@ namespace upolynomial { return; scoped_numeral aux(m()); unsigned n = sz - 1; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { checkpoint(); - for (unsigned k = n-i; k <= n-1; k++) { + for (unsigned k = n-i; k <= n-1; ++k) { m().mul2k(p[k+1], k, aux); m().add(p[k], aux, p[k]); } @@ -1507,9 +1507,9 @@ namespace upolynomial { if (sz <= 1) return; unsigned n = sz - 1; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { checkpoint(); - for (unsigned k = n-i; k <= n-1; k++) + for (unsigned k = n-i; k <= n-1; ++k) m().addmul(p[k], c, p[k+1], p[k]); } } @@ -1564,10 +1564,10 @@ namespace upolynomial { // Step 2 numeral const & c = b.numerator(); unsigned n = sz - 1; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { checkpoint(); m().addmul(p[n - i], c, p[n - i + 1], p[n - i]); - for (unsigned k = n - i + 1; k <= n - 1; k++) { + for (unsigned k = n - i + 1; k <= n - 1; ++k) { m().mul2k(p[k], b.k()); m().addmul(p[k], c, p[k + 1], p[k]); } @@ -1586,10 +1586,10 @@ namespace upolynomial { // Step 2 numeral const & c = b.numerator(); unsigned n = sz - 1; - for (unsigned i = 1; i <= n; i++) { + for (unsigned i = 1; i <= n; ++i) { checkpoint(); m().addmul(p[n - i], c, p[n - i + 1], p[n - i]); - for (unsigned k = n - i + 1; k <= n - 1; k++) { + for (unsigned k = n - i + 1; k <= n - 1; ++k) { m().mul(p[k], b.denominator(), p[k]); m().addmul(p[k], c, p[k + 1], p[k]); } @@ -1604,7 +1604,7 @@ namespace upolynomial { return; // a_n * x^n + 2 * a_{n-1} * x^{n-1} + ... + (2^n)*a_0 unsigned k = sz-1; // k = n - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { m().mul2k(p[i], k); k--; } @@ -1612,7 +1612,7 @@ namespace upolynomial { // p(x) := p(-x) void manager::p_minus_x(unsigned sz, numeral * p) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m().is_zero(p[i])) continue; if (i % 2 == 0) @@ -1642,7 +1642,7 @@ namespace upolynomial { if (sz <= 1) return; unsigned k_i = k; - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { m().mul2k(p[i], k_i); k_i += k; } @@ -1659,7 +1659,7 @@ namespace upolynomial { if (sz <= 1) return; unsigned k_i = k*sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { k_i -= k; if (!m().is_zero(p[i])) m().mul2k(p[i], k_i); @@ -1688,7 +1688,7 @@ namespace upolynomial { return; scoped_numeral b_i(m()); m().set(b_i, b); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { if (!m().is_zero(p[i])) m().mul(p[i], b_i, p[i]); m().mul(b_i, b, b_i); @@ -1711,7 +1711,7 @@ namespace upolynomial { scoped_numeral c_i(m()); m().set(c_i, 1); unsigned k_i = k*sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { k_i -= k; if (!m().is_zero(p[i])) { m().mul2k(p[i], k_i); @@ -1739,7 +1739,7 @@ namespace upolynomial { numeral const & c = q.denominator(); scoped_numeral bc(m()); m().power(c, sz-1, bc); // bc = b^n - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!m().is_zero(p[i])) m().mul(p[i], bc, p[i]); if (i < sz - 1) { @@ -1871,7 +1871,7 @@ namespace upolynomial { sign = 0; prev_sign = 0; unsigned i = 0; - for (; i < sz; i++) { + for (; i < sz; ++i) { // find next nonzero unsigned psz = seq.size(i); numeral const * p = seq.coeffs(i); @@ -1940,7 +1940,7 @@ namespace upolynomial { m().set(a_n, p[sz - 1]); m().abs(a_n); scoped_numeral c(m()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m().is_zero(p[i])) continue; m().set(c, p[i]); @@ -2019,7 +2019,7 @@ namespace upolynomial { unsigned n = sz - 1; bool pos_a_n = m().is_pos(p[n]); unsigned log2_a_n = pos_a_n ? m().log2(p[n]) : m().mlog2(p[n]); - for (unsigned k = 1; k <= n; k++) { + for (unsigned k = 1; k <= n; ++k) { numeral const & a_n_k = p[n - k]; if (m().is_zero(a_n_k)) continue; @@ -2116,7 +2116,7 @@ namespace upolynomial { SASSERT(!frame_stack.empty()); unsigned sz = frame_stack.back().m_size; SASSERT(sz <= p_stack.size()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().del(p_stack.back()); p_stack.pop_back(); } @@ -2142,7 +2142,7 @@ namespace upolynomial { set(sz, p, p_aux); compose_2n_p_x_div_2(p_aux.size(), p_aux.data()); normalize(p_aux); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p_stack.push_back(numeral()); m().set(p_stack.back(), p_aux[i]); } @@ -2150,7 +2150,7 @@ namespace upolynomial { // right child translate(sz, p_stack.data() + p_stack.size() - sz, p_aux); normalize(p_aux); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p_stack.push_back(numeral()); swap(p_stack.back(), p_aux[i]); } @@ -2286,14 +2286,14 @@ namespace upolynomial { // Foreach i in [starting_at, v.size()) v[i] := 2^k*v[i] static void adjust_pos(mpbq_manager & bqm, mpbq_vector & v, unsigned starting_at, unsigned k) { unsigned sz = v.size(); - for (unsigned i = starting_at; i < sz; i++) + for (unsigned i = starting_at; i < sz; ++i) bqm.mul2k(v[i], k); } // Foreach i in [starting_at, v.size()) v[i] := -2^k*v[i] static void adjust_neg(mpbq_manager & bqm, mpbq_vector & v, unsigned starting_at, unsigned k) { unsigned sz = v.size(); - for (unsigned i = starting_at; i < sz; i++) { + for (unsigned i = starting_at; i < sz; ++i) { bqm.mul2k(v[i], k); bqm.neg(v[i]); } @@ -2302,7 +2302,7 @@ namespace upolynomial { static void swap_lowers_uppers(unsigned starting_at, mpbq_vector & lowers, mpbq_vector & uppers) { SASSERT(lowers.size() == uppers.size()); unsigned sz = lowers.size(); - for (unsigned i = starting_at; i < sz; i++) { + for (unsigned i = starting_at; i < sz; ++i) { swap(lowers[i], uppers[i]); } } @@ -2581,7 +2581,7 @@ namespace upolynomial { if (sz == 0) return; unsigned degree = sz - 1; - for (unsigned i = 0; i < degree; i++) { + for (unsigned i = 0; i < degree; ++i) { unsigned sz = seq.size(); derivative(seq.size(sz-1), seq.coeffs(sz-1), p_prime); normalize(p_prime); @@ -3046,7 +3046,7 @@ namespace upolynomial { if (sz == 0) return; if (m().is_neg(p[sz - 1])) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m().neg(p[i]); if (k % 2 == 1) flip_sign(r); @@ -3132,7 +3132,7 @@ namespace upolynomial { } std::ostream& manager::display(std::ostream & out, upolynomial_sequence const & seq, char const * var_name) const { - for (unsigned i = 0; i < seq.size(); i++) { + for (unsigned i = 0; i < seq.size(); ++i) { display(out, seq.size(i), seq.coeffs(i), var_name); out << "\n"; } diff --git a/src/math/polynomial/upolynomial.h b/src/math/polynomial/upolynomial.h index 7f807c0ae..de29a1cdf 100644 --- a/src/math/polynomial/upolynomial.h +++ b/src/math/polynomial/upolynomial.h @@ -406,10 +406,10 @@ namespace upolynomial { unsigned sz = pm.size(p); unsigned deg = pm.total_degree(p); r.reserve(deg+1); - for (unsigned i = 0; i <= deg; i++) { + for (unsigned i = 0; i <= deg; ++i) { m().reset(r[i]); } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned k = pm.total_degree(pm.get_monomial(p, i)); SASSERT(k <= deg); m().set(r[k], pm.coeff(p, i)); @@ -429,10 +429,10 @@ namespace upolynomial { unsigned sz = pm.size(p); unsigned deg = pm.degree(p, x); r.reserve(deg+1); - for (unsigned i = 0; i <= deg; i++) { + for (unsigned i = 0; i <= deg; ++i) { m().reset(r[i]); } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { typename polynomial::monomial * mon = pm.get_monomial(p, i); if (pm.size(mon) == 0) { m().set(r[0], pm.coeff(p, i)); diff --git a/src/math/polynomial/upolynomial_factorization.cpp b/src/math/polynomial/upolynomial_factorization.cpp index c4c06c237..1ab95def3 100644 --- a/src/math/polynomial/upolynomial_factorization.cpp +++ b/src/math/polynomial/upolynomial_factorization.cpp @@ -1038,7 +1038,7 @@ bool factor_square_free(z_manager & upm, numeral_vector const & f, factors & fs, // make sure the leading coefficient is positive if (!f_pp.empty() && nm.is_neg(f_pp[f_pp.size() - 1])) { - for (unsigned i = 0; i < f_pp.size(); i++) + for (unsigned i = 0; i < f_pp.size(); ++i) nm.neg(f_pp[i]); // flip sign constant if k is odd if (k % 2 == 1) { diff --git a/src/math/realclosure/mpz_matrix.cpp b/src/math/realclosure/mpz_matrix.cpp index 6d4c72773..64f477088 100644 --- a/src/math/realclosure/mpz_matrix.cpp +++ b/src/math/realclosure/mpz_matrix.cpp @@ -47,8 +47,8 @@ void mpz_matrix_manager::mk(unsigned m, unsigned n, mpz_matrix & A) { void mpz_matrix_manager::del(mpz_matrix & A) { if (A.a_ij != nullptr) { - for (unsigned i = 0; i < A.m; i++) - for (unsigned j = 0; j < A.n; j++) + for (unsigned i = 0; i < A.m; ++i) + for (unsigned j = 0; j < A.n; ++j) nm().del(A(i,j)); unsigned sz = sizeof(mpz) * A.m * A.n; m_allocator.deallocate(sz, A.a_ij); @@ -66,16 +66,16 @@ void mpz_matrix_manager::set(mpz_matrix & A, mpz_matrix const & B) { mk(B.m, B.n, A); } SASSERT(A.m == B.m && A.n == B.n); - for (unsigned i = 0; i < B.m; i++) - for (unsigned j = 0; j < B.n; j++) + for (unsigned i = 0; i < B.m; ++i) + for (unsigned j = 0; j < B.n; ++j) nm().set(A(i, j), B(i, j)); } void mpz_matrix_manager::tensor_product(mpz_matrix const & A, mpz_matrix const & B, mpz_matrix & C) { scoped_mpz_matrix CC(*this); mk(A.m * B.m, A.n * B.n, CC); - for (unsigned i = 0; i < CC.m(); i++) - for (unsigned j = 0; j < CC.n(); j++) + for (unsigned i = 0; i < CC.m(); ++i) + for (unsigned j = 0; j < CC.n(); ++j) nm().mul(A(i / B.m, j / B.n), B(i % B.m, j % B.n), CC(i, j)); @@ -84,7 +84,7 @@ void mpz_matrix_manager::tensor_product(mpz_matrix const & A, mpz_matrix const & void mpz_matrix_manager::swap_rows(mpz_matrix & A, unsigned i, unsigned j) { if (i != j) { - for (unsigned k = 0; k < A.n; k++) + for (unsigned k = 0; k < A.n; ++k) ::swap(A(i, k), A(j, k)); } } @@ -98,7 +98,7 @@ void mpz_matrix_manager::swap_rows(mpz_matrix & A, unsigned i, unsigned j) { bool mpz_matrix_manager::normalize_row(mpz * A_i, unsigned n, mpz * b_i, bool int_solver) { scoped_mpz g(nm()); bool first = true; - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { if (nm().is_zero(A_i[j])) continue; if (first) { @@ -117,7 +117,7 @@ bool mpz_matrix_manager::normalize_row(mpz * A_i, unsigned n, mpz * b_i, bool in if (!nm().is_one(g)) { if (b_i) { if (nm().divides(g, *b_i)) { - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { nm().div(A_i[j], g, A_i[j]); } nm().div(*b_i, g, *b_i); @@ -128,7 +128,7 @@ bool mpz_matrix_manager::normalize_row(mpz * A_i, unsigned n, mpz * b_i, bool in } } else { - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { nm().div(A_i[j], g, A_i[j]); } } @@ -174,15 +174,15 @@ k1=> 0 0 ... 0 X ... X */ bool mpz_matrix_manager::eliminate(mpz_matrix & A, mpz * b, unsigned k1, unsigned k2, bool int_solver) { // check if first k2-1 positions of row k1 are 0 - DEBUG_CODE(for (unsigned j = 0; j < k2; j++) { SASSERT(nm().is_zero(A(k1, j))); }); + DEBUG_CODE(for (unsigned j = 0; j < k2; ++j) { SASSERT(nm().is_zero(A(k1, j))); }); mpz & a_kk = A(k1, k2); SASSERT(!nm().is_zero(a_kk)); scoped_mpz t1(nm()), t2(nm()); scoped_mpz a_ik_prime(nm()), a_kk_prime(nm()), lcm_a_kk_a_ik(nm()); // for all rows below pivot - for (unsigned i = k1+1; i < A.m; i++) { + for (unsigned i = k1+1; i < A.m; ++i) { // check if first k-1 positions of row k are 0 - DEBUG_CODE(for (unsigned j = 0; j < k2; j++) { SASSERT(nm().is_zero(A(i, j))); }); + DEBUG_CODE(for (unsigned j = 0; j < k2; ++j) { SASSERT(nm().is_zero(A(i, j))); }); mpz & a_ik = A(i, k2); if (!nm().is_zero(a_ik)) { // a_ik' = lcm(a_kk, a_ik)/a_kk @@ -190,7 +190,7 @@ bool mpz_matrix_manager::eliminate(mpz_matrix & A, mpz * b, unsigned k1, unsigne nm().lcm(a_kk, a_ik, lcm_a_kk_a_ik); nm().div(lcm_a_kk_a_ik, a_kk, a_ik_prime); nm().div(lcm_a_kk_a_ik, a_ik, a_kk_prime); - for (unsigned j = k2+1; j < A.n; j++) { + for (unsigned j = k2+1; j < A.n; ++j) { // a_ij <- a_kk' * a_ij - a_ik' * a_kj nm().mul(a_ik_prime, A(k1, j), t1); nm().mul(a_kk_prime, A(i, j), t2); @@ -217,18 +217,18 @@ bool mpz_matrix_manager::solve_core(mpz_matrix const & _A, mpz * b, bool int_sol SASSERT(_A.n == _A.m); scoped_mpz_matrix A(*this); set(A, _A); - for (unsigned k = 0; k < A.m(); k++) { + for (unsigned k = 0; k < A.m(); ++k) { TRACE(mpz_matrix, tout << "k: " << k << "\n" << A; tout << "b:"; - for (unsigned i = 0; i < A.m(); i++) { + for (unsigned i = 0; i < A.m(); ++i) { tout << " "; nm().display(tout, b[i]); } tout << "\n";); // find pivot unsigned i = k; - for (; i < A.m(); i++) { + for (; i < A.m(); ++i) { if (!nm().is_zero(A(i, k))) break; } @@ -245,7 +245,7 @@ bool mpz_matrix_manager::solve_core(mpz_matrix const & _A, mpz * b, bool int_sol unsigned k = A.m(); while (k > 0) { --k; - DEBUG_CODE(for (unsigned j = 0; j < A.n(); j++) { SASSERT(j == k || nm().is_zero(A(k, j))); }); + DEBUG_CODE(for (unsigned j = 0; j < A.n(); ++j) { SASSERT(j == k || nm().is_zero(A(k, j))); }); SASSERT(!nm().is_zero(A(k, k))); if (nm().divides(A(k, k), b[k])) { nm().div(b[k], A(k, k), b[k]); @@ -283,7 +283,7 @@ bool mpz_matrix_manager::solve_core(mpz_matrix const & _A, mpz * b, bool int_sol } bool mpz_matrix_manager::solve(mpz_matrix const & A, mpz * b, mpz const * c) { - for (unsigned i = 0; i < A.n; i++) + for (unsigned i = 0; i < A.n; ++i) nm().set(b[i], c[i]); return solve_core(A, b, true); } @@ -291,11 +291,11 @@ bool mpz_matrix_manager::solve(mpz_matrix const & A, mpz * b, mpz const * c) { bool mpz_matrix_manager::solve(mpz_matrix const & A, int * b, int const * c) { scoped_mpz_matrix _b(*this); mk(A.n, 1, _b); - for (unsigned i = 0; i < A.n; i++) + for (unsigned i = 0; i < A.n; ++i) nm().set(_b(i,0), c[i]); bool r = solve_core(A, _b.A.a_ij, true); if (r) { - for (unsigned i = 0; i < A.n; i++) + for (unsigned i = 0; i < A.n; ++i) b[i] = _b.get_int(i, 0); } return r; @@ -321,8 +321,8 @@ void mpz_matrix_manager::filter_cols(mpz_matrix const & A, unsigned num_cols, un SASSERT(num_cols < A.n); scoped_mpz_matrix C(*this); mk(A.m, num_cols, C); - for (unsigned i = 0; i < A.m; i++) - for (unsigned j = 0; j < num_cols; j++) + for (unsigned i = 0; i < A.m; ++i) + for (unsigned j = 0; j < num_cols; ++j) nm().set(C(i, j), A(i, cols[j])); B.swap(C); } @@ -333,7 +333,7 @@ void mpz_matrix_manager::permute_rows(mpz_matrix const & A, unsigned const * p, DEBUG_CODE({ buffer seen; seen.resize(A.m, false); - for (unsigned i = 0; i < A.m; i++) { + for (unsigned i = 0; i < A.m; ++i) { SASSERT(p[i] < A.m); SASSERT(!seen[p[i]]); seen[p[i]] = true; @@ -341,8 +341,8 @@ void mpz_matrix_manager::permute_rows(mpz_matrix const & A, unsigned const * p, }); scoped_mpz_matrix C(*this); mk(A.m, A.n, C); - for (unsigned i = 0; i < A.m; i++) - for (unsigned j = 0; j < A.n; j++) + for (unsigned i = 0; i < A.m; ++i) + for (unsigned j = 0; j < A.n; ++j) nm().set(C(i, j), A(p[i], j)); B.swap(C); } @@ -356,13 +356,13 @@ unsigned mpz_matrix_manager::linear_independent_rows(mpz_matrix const & _A, unsi set(A, _A); sbuffer rows; rows.resize(A.m(), 0); - for (unsigned i = 0; i < A.m(); i++) + for (unsigned i = 0; i < A.m(); ++i) rows[i] = i; - for (unsigned k1 = 0, k2 = 0; k1 < A.m(); k1++) { + for (unsigned k1 = 0, k2 = 0; k1 < A.m(); ++k1) { TRACE(mpz_matrix, tout << "k1: " << k1 << ", k2: " << k2 << "\n" << A;); // find pivot unsigned pivot = UINT_MAX; - for (unsigned i = k1; i < A.m(); i++) { + for (unsigned i = k1; i < A.m(); ++i) { if (!nm().is_zero(A(i, k2))) { if (pivot == UINT_MAX) { pivot = i; @@ -390,8 +390,8 @@ unsigned mpz_matrix_manager::linear_independent_rows(mpz_matrix const & _A, unsi // Copy linear independent rows to B mpz_matrix & C = A; mk(r_sz, _A.n, C); - for (unsigned i = 0; i < r_sz; i++ ) { - for (unsigned j = 0; j < _A.n; j++) { + for (unsigned i = 0; i < r_sz; ++i ) { + for (unsigned j = 0; j < _A.n; ++j) { nm().set(C(i, j), _A(r[i], j)); } } @@ -401,14 +401,14 @@ unsigned mpz_matrix_manager::linear_independent_rows(mpz_matrix const & _A, unsi void mpz_matrix_manager::display(std::ostream & out, mpz_matrix const & A, unsigned cell_width) const { out << A.m << " x " << A.n << " Matrix\n"; - for (unsigned i = 0; i < A.m; i++) { - for (unsigned j = 0; j < A.n; j++) { + for (unsigned i = 0; i < A.m; ++i) { + for (unsigned j = 0; j < A.n; ++j) { if (j > 0) out << " "; std::string s = nm().to_string(A(i, j)); if (s.size() < cell_width) { unsigned space = cell_width - static_cast(s.size()); - for (unsigned k = 0; k < space; k++) + for (unsigned k = 0; k < space; ++k) out << " "; } out << s; diff --git a/src/math/realclosure/realclosure.cpp b/src/math/realclosure/realclosure.cpp index 0e6cc36f0..80e6420bd 100644 --- a/src/math/realclosure/realclosure.cpp +++ b/src/math/realclosure/realclosure.cpp @@ -689,7 +689,7 @@ namespace realclosure { template void restore_saved_intervals(ptr_vector & to_restore) { unsigned sz = to_restore.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { T * v = to_restore[i]; set_interval(v->m_interval, *(v->m_old_interval)); bqim().del(*(v->m_old_interval)); @@ -772,7 +772,7 @@ namespace realclosure { } void finalize(array & ps) { - for (unsigned i = 0; i < ps.size(); i++) + for (unsigned i = 0; i < ps.size(); ++i) reset_p(ps[i]); ps.finalize(allocator()); } @@ -783,7 +783,7 @@ namespace realclosure { void del_sign_conditions(unsigned sz, sign_condition * const * to_delete) { ptr_buffer all_to_delete; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sign_condition * sc = to_delete[i]; while (sc && sc->m_mark == false) { sc->m_mark = true; @@ -791,7 +791,7 @@ namespace realclosure { sc = sc->m_prev; } } - for (unsigned i = 0; i < all_to_delete.size(); i++) { + for (unsigned i = 0; i < all_to_delete.size(); ++i) { del_sign_condition(all_to_delete[i]); } } @@ -863,7 +863,7 @@ namespace realclosure { } void inc_ref(unsigned sz, value * const * p) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) inc_ref(p[i]); } @@ -877,7 +877,7 @@ namespace realclosure { } void dec_ref(unsigned sz, value * const * p) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) dec_ref(p[i]); } @@ -887,7 +887,7 @@ namespace realclosure { } void del(numeral_vector & v) { - for (unsigned i = 0; i < v.size(); i++) + for (unsigned i = 0; i < v.size(); ++i) del(v[i]); } @@ -1104,7 +1104,7 @@ namespace realclosure { } bool depends_on_infinitesimals(unsigned sz, value * const * p) const { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (depends_on_infinitesimals(p[i])) return true; return false; @@ -1466,7 +1466,7 @@ namespace realclosure { if (!abs_lower_magnitude(interval(p[n-1]), lc_mag)) return false; N = -static_cast(m_ini_precision); - for (unsigned k = 2; k <= n; k++) { + for (unsigned k = 2; k <= n; ++k) { value * a = p[n - k]; if (!is_zero(a) && sign(a) != lc_sign) { int a_mag; @@ -1512,7 +1512,7 @@ namespace realclosure { if (!abs_lower_magnitude(aux, lc_mag)) return false; N = -static_cast(m_ini_precision); - for (unsigned k = 2; k <= n; k++) { + for (unsigned k = 2; k <= n; ++k) { value * a = as[n - k]; if (!is_zero(a)) { neg_root_adjust(interval(as[n-k]), n-k, aux); @@ -1590,7 +1590,7 @@ namespace realclosure { derivative(n, p, p_prime); ds.push(p_prime.size(), p_prime.data()); SASSERT(n >= 3); - for (unsigned i = 0; i < n - 2; i++) { + for (unsigned i = 0; i < n - 2; ++i) { SASSERT(ds.size() > 0); unsigned prev = ds.size() - 1; n = ds.size(prev); @@ -1710,7 +1710,7 @@ namespace realclosure { ) { SASSERT(taqrs.size() == prs.size()); new_taqrs.reset(); new_prs.reset(); - for (unsigned i = 0; i < taqrs.size(); i++) { + for (unsigned i = 0; i < taqrs.size(); ++i) { // Add prs * 1 new_taqrs.push_back(taqrs[i]); new_prs.push(prs.size(i), prs.coeffs(i)); @@ -1776,7 +1776,7 @@ namespace realclosure { void set_array_p(array & ps, scoped_polynomial_seq const & prs) { unsigned sz = prs.size(); ps.set(allocator(), sz, polynomial()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned pi_sz = prs.size(i); value * const * pi = prs.coeffs(i); set_p(ps[i], pi_sz, pi); @@ -1991,12 +1991,12 @@ namespace realclosure { SASSERT(M_s.m() == scs.size()); TRACE(rcf_sign_det, tout << M_s; - for (unsigned j = 0; j < scs.size(); j++) { + for (unsigned j = 0; j < scs.size(); ++j) { display_sign_conditions(tout, scs[j]); tout << " = " << taqrs[j] << "\n"; } tout << "qs:\n"; - for (unsigned j = 0; j < qs.size(); j++) { + for (unsigned j = 0; j < qs.size(); ++j) { display_poly(tout, qs.size(j), qs.coeffs(j)); tout << "\n"; }); // We keep executing this loop until we have only one root for each sign condition in scs. @@ -2028,9 +2028,9 @@ namespace realclosure { // Solve // new_M_s * sc_cardinalities = new_taqrs VERIFY(mm().solve(new_M_s, sc_cardinalities.data(), new_taqrs.data())); - TRACE(rcf_sign_det, tout << "solution: "; for (unsigned i = 0; i < sc_cardinalities.size(); i++) { tout << sc_cardinalities[i] << " "; } tout << "\n";); + TRACE(rcf_sign_det, tout << "solution: "; for (unsigned i = 0; i < sc_cardinalities.size(); ++i) { tout << sc_cardinalities[i] << " "; } tout << "\n";); // The solution must contain only positive values <= num_roots - DEBUG_CODE(for (unsigned j = 0; j < sc_cardinalities.size(); j++) { SASSERT(0 <= sc_cardinalities[j] && sc_cardinalities[j] <= num_roots); }); + DEBUG_CODE(for (unsigned j = 0; j < sc_cardinalities.size(); ++j) { SASSERT(0 <= sc_cardinalities[j] && sc_cardinalities[j] <= num_roots); }); // We should keep q only if it discriminated something. // That is, // If !use_q2, then There is an i s.t. sc_cardinalities[2*i] > 0 && sc_cardinalities[2*i] > 0 @@ -2051,7 +2051,7 @@ namespace realclosure { while (j < sc_cardinalities.size()) { sign_condition * sc = scs[k]; k++; - for (unsigned s = 0; s < step_sz; s++) { + for (unsigned s = 0; s < step_sz; ++s) { // Remark: the second row of M contains the sign for q if (sc_cardinalities[j] > 0) { new_scs.push_back(mk_sign_condition(q_idx, M.get_int(1, s), sc)); @@ -2074,7 +2074,7 @@ namespace realclosure { // Update taqrs and prs prs.reset(); taqrs.reset(); - for (unsigned j = 0; j < new_num_rows; j++) { + for (unsigned j = 0; j < new_num_rows; ++j) { unsigned rid = new_row_idxs[j]; prs.push(new_prs.size(rid), new_prs.coeffs(rid)); taqrs.push_back(new_taqrs[rid]); @@ -2089,21 +2089,21 @@ namespace realclosure { tout << "Final state\n"; display_poly(tout, p_sz, p); tout << "\n"; tout << M_s; - for (unsigned j = 0; j < scs.size(); j++) { + for (unsigned j = 0; j < scs.size(); ++j) { display_sign_conditions(tout, scs[j]); tout << " = " << taqrs[j] << "\n"; } tout << "qs:\n"; - for (unsigned j = 0; j < qs.size(); j++) { + for (unsigned j = 0; j < qs.size(); ++j) { display_poly(tout, qs.size(j), qs.coeffs(j)); tout << "\n"; } tout << "prs:\n"; - for (unsigned j = 0; j < prs.size(); j++) { + for (unsigned j = 0; j < prs.size(); ++j) { display_poly(tout, prs.size(j), prs.coeffs(j)); tout << "\n"; }); SASSERT(M_s.n() == M_s.m()); SASSERT(M_s.n() == static_cast(num_roots)); sign_det * sd = mk_sign_det(M_s, prs, taqrs, qs, scs); - for (unsigned idx = 0; idx < static_cast(num_roots); idx++) { + for (unsigned idx = 0; idx < static_cast(num_roots); ++idx) { add_root(p_sz, p, interval, iso_interval, sd, idx, roots); } } @@ -2115,7 +2115,7 @@ namespace realclosure { SASSERT(n >= 2); SASSERT(!is_zero(p[0])); SASSERT(!is_zero(p[n-1])); - for (unsigned i = 1; i < n - 1; i++) { + for (unsigned i = 1; i < n - 1; ++i) { if (!is_zero(p[i])) return false; } @@ -2410,7 +2410,7 @@ namespace realclosure { \brief Root isolation entry point. */ void isolate_roots(unsigned n, numeral const * p, numeral_vector & roots) { - TRACE(rcf_isolate_bug, tout << "isolate_roots: "; for (unsigned i = 0; i < n; i++) { display(tout, p[i]); tout << " "; } tout << "\n";); + TRACE(rcf_isolate_bug, tout << "isolate_roots: "; for (unsigned i = 0; i < n; ++i) { display(tout, p[i]); tout << " "; } tout << "\n";); SASSERT(n > 0); SASSERT(!is_zero(p[n-1])); if (n == 1) { @@ -2418,14 +2418,14 @@ namespace realclosure { return; } unsigned i = 0; - for (; i < n; i++) { + for (; i < n; ++i) { if (!is_zero(p[i])) break; } SASSERT(i < n); SASSERT(!is_zero(p[i])); ptr_buffer nz_p; - for (; i < n; i++) + for (; i < n; ++i) nz_p.push_back(p[i].m_value); nz_isolate_roots(nz_p.size(), nz_p.data(), roots); if (nz_p.size() < n) { @@ -2705,13 +2705,13 @@ namespace realclosure { value_ref a_i(*this); unsigned min = std::min(sz1, sz2); unsigned i = 0; - for (; i < min; i++) { + for (; i < min; ++i) { add(p1[i], p2[i], a_i); r.push_back(a_i); } - for (; i < sz1; i++) + for (; i < sz1; ++i) r.push_back(p1[i]); - for (; i < sz2; i++) + for (; i < sz2; ++i) r.push_back(p2[i]); SASSERT(r.size() == std::max(sz1, sz2)); adjust_size(r); @@ -2741,13 +2741,13 @@ namespace realclosure { value_ref a_i(*this); unsigned min = std::min(sz1, sz2); unsigned i = 0; - for (; i < min; i++) { + for (; i < min; ++i) { sub(p1[i], p2[i], a_i); r.push_back(a_i); } - for (; i < sz1; i++) + for (; i < sz1; ++i) r.push_back(p1[i]); - for (; i < sz2; i++) { + for (; i < sz2; ++i) { neg(p2[i], a_i); r.push_back(a_i); } @@ -2778,7 +2778,7 @@ namespace realclosure { if (a == nullptr) return; value_ref a_i(*this); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mul(a, p[i], a_i); r.push_back(a_i); } @@ -2798,11 +2798,11 @@ namespace realclosure { std::swap(p1, p2); } value_ref tmp(*this); - for (unsigned i = 0; i < sz1; i++) { + for (unsigned i = 0; i < sz1; ++i) { checkpoint(); if (p1[i] == nullptr) continue; - for (unsigned j = 0; j < sz2; j++) { + for (unsigned j = 0; j < sz2; ++j) { // r[i+j] <- r[i+j] + p1[i]*p2[j] mul(p1[i], p2[j], tmp); add(r[i+j], tmp, tmp); @@ -2821,7 +2821,7 @@ namespace realclosure { return; value_ref a_i(*this); unsigned sz = p.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { div(p[i], a, a_i); p.set(i, a_i); } @@ -2864,7 +2864,7 @@ namespace realclosure { // q[m_n] <- q[m_n] + r[sz1 - 1]/b_n add(q[m_n], ratio, aux); q.set(m_n, aux); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { // r[i + m_n] <- r[i + m_n] - ratio * p2[i] mul(ratio, p2[i], aux); sub(r[i + m_n], aux, aux); @@ -2891,7 +2891,7 @@ namespace realclosure { void div(unsigned sz, value * const * p, value * a, value_ref_buffer & r) { r.reset(); value_ref a_i(*this); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { div(p[i], a, a_i); r.push_back(a_i); } @@ -2927,7 +2927,7 @@ namespace realclosure { } unsigned m_n = sz1 - sz2; div(r[sz1 - 1], b_n, ratio); - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { mul(ratio, p2[i], new_a); sub(r[i + m_n], new_a, new_a); r.set(i + m_n, new_a); @@ -2977,14 +2977,14 @@ namespace realclosure { a_m = r[sz1 - 1]; // don't need to update position sz1 - 1, since it will become 0 if (!is_rational_one(b_n)) { - for (unsigned i = 0; i < sz1 - 1; i++) { + for (unsigned i = 0; i < sz1 - 1; ++i) { mul(r[i], b_n, new_a); r.set(i, new_a); } } // buffer: a_m * x^m + b_n * a_{m-1} * x^{m-1} + ... + b_n * a_0 // don't need to process i = sz2 - 1, because r[sz1 - 1] will become 0. - for (unsigned i = 0; i < sz2 - 1; i++) { + for (unsigned i = 0; i < sz2 - 1; ++i) { mul(a_m, p2[i], new_a); sub(r[i + m_n], new_a, new_a); r.set(i + m_n, new_a); @@ -3006,7 +3006,7 @@ namespace realclosure { SASSERT(p != r.data()); r.reset(); value_ref a_i(*this); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { neg(p[i], a_i); r.push_back(a_i); } @@ -3018,7 +3018,7 @@ namespace realclosure { void neg(value_ref_buffer & r) { value_ref a_i(*this); unsigned sz = r.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { neg(r[i], a_i); r.set(i, a_i); } @@ -3030,7 +3030,7 @@ namespace realclosure { void neg(polynomial & p) { value_ref a_i(*this); unsigned sz = p.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { neg(p[i], a_i); inc_ref(a_i.get()); dec_ref(p[i]); @@ -3106,7 +3106,7 @@ namespace realclosure { bool struct_eq(unsigned sz_a, value * const * p_a, unsigned sz_b, value * const * p_b) const { if (sz_a != sz_b) return false; - for (unsigned i = 0; i < sz_a; i++) { + for (unsigned i = 0; i < sz_a; ++i) { if (!struct_eq(p_a[i], p_b[i])) return false; } @@ -3148,7 +3148,7 @@ namespace realclosure { \brief See comment at has_clean_denominators(value * a) */ bool has_clean_denominators(unsigned sz, value * const * p) const { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!has_clean_denominators(p[i])) return false; } @@ -3218,7 +3218,7 @@ namespace realclosure { value_ref_buffer nums(*this), dens(*this); value_ref a_n(*this), a_d(*this); bool all_one = true; - for (unsigned i = 0; i < p_sz; i++) { + for (unsigned i = 0; i < p_sz; ++i) { if (p[i]) { clean_denominators_core(p[i], a_n, a_d); nums.push_back(a_n); @@ -3243,7 +3243,7 @@ namespace realclosure { bool found_z = false; SASSERT(nums.size() == p_sz); SASSERT(dens.size() == p_sz); - for (unsigned i = 0; i < p_sz; i++) { + for (unsigned i = 0; i < p_sz; ++i) { if (!dens[i]) continue; if (is_nz_rational(dens[i])) { @@ -3278,7 +3278,7 @@ namespace realclosure { d = lcm; value_ref_buffer multipliers(*this); value_ref m(*this); - for (unsigned i = 0; i < p_sz; i++) { + for (unsigned i = 0; i < p_sz; ++i) { if (!nums[i]) { norm_p.push_back(nullptr); } @@ -3297,7 +3297,7 @@ namespace realclosure { is_z = true; } bool found_lt_eq = false; - for (unsigned j = 0; j < p_sz; j++) { + for (unsigned j = 0; j < p_sz; ++j) { TRACE(rcf_clean_bug, tout << "j: " << j << " "; display(tout, m, false); tout << "\n";); if (!dens[j]) continue; @@ -3547,7 +3547,7 @@ namespace realclosure { return false; } else { - for (unsigned i = 0; i < p_sz; i++) { + for (unsigned i = 0; i < p_sz; ++i) { if (p[i]) { if (!gcd_int_coeffs(p[i], g)) return false; @@ -3574,7 +3574,7 @@ namespace realclosure { if (gcd_int_coeffs(p.size(), p.data(), g) && !qm().is_one(g)) { SASSERT(qm().is_pos(g)); value_ref a(*this); - for (unsigned i = 0; i < p.size(); i++) { + for (unsigned i = 0; i < p.size(); ++i) { if (p[i]) { a = p[i]; p.set(i, nullptr); @@ -3608,7 +3608,7 @@ namespace realclosure { value_ref_buffer new_ais(*this); value_ref ai(*this); polynomial const & p = rf->num(); - for (unsigned i = 0; i < p.size(); i++) { + for (unsigned i = 0; i < p.size(); ++i) { if (p[i]) { ai = p[i]; exact_div_z(ai, b); @@ -3649,7 +3649,7 @@ namespace realclosure { value_ref a_i(*this); SASSERT(p[sz-1] != 0); if (!is_rational_one(p[sz-1])) { - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { div(p[i], p[sz-1], a_i); p.set(i, a_i); } @@ -3759,7 +3759,7 @@ namespace realclosure { void derivative(unsigned sz, value * const * p, value_ref_buffer & r) { r.reset(); if (sz > 1) { - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { value_ref a_i(*this); a_i = mk_rational(mpq(i)); mul(a_i, p[i], a_i); @@ -3937,7 +3937,7 @@ namespace realclosure { approximating the coefficients do not have -oo or oo as lower/upper bounds. */ bool has_refineable_approx_coeffs(unsigned n, value * const * p) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (p[i] != nullptr) { mpbqi & a_i = interval(p[i]); if (a_i.lower_is_inf() || a_i.upper_is_inf()) @@ -4021,7 +4021,7 @@ namespace realclosure { */ int find_biggest_interval_magnitude(unsigned n, value * const * p) { int r = INT_MIN; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (p[i] != nullptr) { mpbqi & a_i = interval(p[i]); SASSERT(!a_i.lower_is_inf() && !a_i.upper_is_inf()); @@ -4109,7 +4109,7 @@ namespace realclosure { sign = 0; prev_sign = 0; unsigned i = 0; - for (; i < sz; i++) { + for (; i < sz; ++i) { // find next nonzero unsigned psz = seq.size(i); value * const * p = seq.coeffs(i); @@ -4254,7 +4254,7 @@ namespace realclosure { \brief Refine the interval for each coefficient of in the polynomial p. */ bool refine_coeffs_interval(unsigned n, value * const * p, unsigned prec) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (p[i] != nullptr && !refine_interval(p[i], prec)) return false; } @@ -4517,7 +4517,7 @@ namespace realclosure { */ static unsigned first_non_zero(polynomial const & p) { unsigned sz = p.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (p[i] != 0) return i; } @@ -4531,7 +4531,7 @@ namespace realclosure { int sign_of_first_non_zero(polynomial const & p, unsigned start_idx) { unsigned sz = p.size(); SASSERT(start_idx < sz); - for (unsigned i = start_idx; i < sz; i++) { + for (unsigned i = start_idx; i < sz; ++i) { if (p[i] != 0) return sign(p[i]); } @@ -4810,7 +4810,7 @@ namespace realclosure { int_buffer new_taqrs; value_ref_buffer prq(*this); // fill new_taqrs using taqrs and the new tarski queries containing q (and q^2 when use_q2 == true). - for (unsigned i = 0; i < taqrs.size(); i++) { + for (unsigned i = 0; i < taqrs.size(); ++i) { // Add TaQ(p, prs[i] * 1; x->iso_interval()) new_taqrs.push_back(taqrs[i]); // Add TaQ(p, prs[i] * q; x->iso_interval()) @@ -4832,16 +4832,16 @@ namespace realclosure { // - contains only 0 or 1 // - !use_q2 IMPLIES for all i in [0, taqrs.size()) (sc_cardinalities[2*i] == 1) + (sc_cardinalities[2*i + 1] == 1) == 1 // - use_q2 IMPLIES for all i in [0, taqrs.size()) (sc_cardinalities[3*i] == 1) + (sc_cardinalities[3*i + 1] == 1) + (sc_cardinalities[3*i + 2] == 1) == 1 - for (unsigned i = 0; i < sc_cardinalities.size(); i++) { + for (unsigned i = 0; i < sc_cardinalities.size(); ++i) { SASSERT(sc_cardinalities[i] == 0 || sc_cardinalities[i] == 1); } if (!use_q2) { - for (unsigned i = 0; i < taqrs.size(); i++) { + for (unsigned i = 0; i < taqrs.size(); ++i) { SASSERT((sc_cardinalities[2*i] == 1) + (sc_cardinalities[2*i + 1] == 1) == 1); } } else { - for (unsigned i = 0; i < taqrs.size(); i++) { + for (unsigned i = 0; i < taqrs.size(); ++i) { SASSERT((sc_cardinalities[3*i] == 1) + (sc_cardinalities[3*i + 1] == 1) + (sc_cardinalities[3*i + 2] == 1) == 1); } } @@ -5667,7 +5667,7 @@ namespace realclosure { alpha_val = mk_rational_function_value(alpha); // search for the root that is equal to alpha unsigned i = 0; - for (i = 0; i < roots.size(); i++) { + for (i = 0; i < roots.size(); ++i) { if (compare(alpha_val, roots[i].m_value) == 0) { // found it; break; @@ -5809,7 +5809,7 @@ namespace realclosure { value_ref neg_a(*this); neg(a.m_value, neg_a); p.push_back(neg_a); - for (unsigned i = 0; i < k - 1; i++) + for (unsigned i = 0; i < k - 1; ++i) p.push_back(nullptr); p.push_back(one()); @@ -5904,7 +5904,7 @@ namespace realclosure { } void mark(polynomial const & p) { - for (unsigned i = 0; i < p.size(); i++) { + for (unsigned i = 0; i < p.size(); ++i) { mark(p[i]); } } @@ -5921,7 +5921,7 @@ namespace realclosure { static unsigned num_nz_coeffs(polynomial const & p) { unsigned r = 0; - for (unsigned i = 0; i < p.size(); i++) { + for (unsigned i = 0; i < p.size(); ++i) { if (p[i]) r++; } @@ -6068,11 +6068,11 @@ namespace realclosure { void display_poly(std::ostream & out, unsigned n, value * const * p) const { collect_algebraic_refs c; - for (unsigned i = 0; i < n; i++) + for (unsigned i = 0; i < n; ++i) c.mark(p[i]); display_polynomial(out, n, p, display_free_var_proc(), true, false); std::sort(c.m_found.begin(), c.m_found.end(), rank_lt_proc()); - for (unsigned i = 0; i < c.m_found.size(); i++) { + for (unsigned i = 0; i < c.m_found.size(); ++i) { algebraic * ext = c.m_found[i]; out << "\n r!" << ext->idx() << " := "; display_algebraic_def(out, ext, true, false); @@ -6131,7 +6131,7 @@ namespace realclosure { std::sort(c.m_found.begin(), c.m_found.end(), rank_lt_proc()); out << "["; display(out, a, true, pp); - for (unsigned i = 0; i < c.m_found.size(); i++) { + for (unsigned i = 0; i < c.m_found.size(); ++i) { algebraic * ext = c.m_found[i]; if (pp) out << "; α" << ext->idx() << " := "; @@ -6502,12 +6502,12 @@ void pp(realclosure::manager::imp * imp, realclosure::value * v) { } void pp(realclosure::manager::imp * imp, unsigned sz, realclosure::value * const * p) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) pp(imp, p[i]); } void pp(realclosure::manager::imp * imp, realclosure::manager::imp::value_ref_buffer const & p) { - for (unsigned i = 0; i < p.size(); i++) + for (unsigned i = 0; i < p.size(); ++i) pp(imp, p[i]); } diff --git a/src/math/simplex/sparse_matrix_def.h b/src/math/simplex/sparse_matrix_def.h index 914ab1d94..fd4e7b0c3 100644 --- a/src/math/simplex/sparse_matrix_def.h +++ b/src/math/simplex/sparse_matrix_def.h @@ -93,7 +93,7 @@ namespace simplex { unsigned i = 0; unsigned j = 0; unsigned sz = m_entries.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { _row_entry & t1 = m_entries[i]; if (!t1.is_dead()) { if (i != j) { @@ -178,7 +178,7 @@ namespace simplex { unsigned i = 0; unsigned j = 0; unsigned sz = m_entries.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { col_entry & e1 = m_entries[i]; if (!e1.is_dead()) { if (i != j) { diff --git a/src/math/subpaving/subpaving.cpp b/src/math/subpaving/subpaving.cpp index e9c72e2d7..d531f1baf 100644 --- a/src/math/subpaving/subpaving.cpp +++ b/src/math/subpaving/subpaving.cpp @@ -69,7 +69,7 @@ namespace subpaving { var mk_sum(mpz const & c, unsigned sz, mpz const * as, var const * xs) override { m_as.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_ctx.nm().set(m_as[i], as[i]); } m_ctx.nm().set(m_c, c); @@ -110,7 +110,7 @@ namespace subpaving { var mk_sum(mpz const & c, unsigned sz, mpz const * as, var const * xs) override { try { m_as.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { int2mpf(as[i], m_as[i]); } int2mpf(c, m_c); @@ -165,7 +165,7 @@ namespace subpaving { var mk_sum(mpz const & c, unsigned sz, mpz const * as, var const * xs) override { try { m_as.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { int2hwf(as[i], m_as[i]); } int2hwf(c, m_c); @@ -221,7 +221,7 @@ namespace subpaving { var mk_sum(mpz const & c, unsigned sz, mpz const * as, var const * xs) override { try { m_as.reserve(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { int2fpoint(as[i], m_as[i]); } int2fpoint(c, m_c); diff --git a/src/math/subpaving/subpaving_t_def.h b/src/math/subpaving/subpaving_t_def.h index 1d78037c3..b71b10fae 100644 --- a/src/math/subpaving/subpaving_t_def.h +++ b/src/math/subpaving/subpaving_t_def.h @@ -145,7 +145,7 @@ public: nm.set(penalty, m_penalty); nm.set(one, 1); unsigned num = this->ctx()->num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (m_only_non_def && this->ctx()->is_definition(x)) continue; typename context_t::bound * l = n->lower(x); @@ -283,7 +283,7 @@ void context_t::bound::display(std::ostream & out, numeral_manager & nm, disp template void context_t::clause::display(std::ostream & out, numeral_manager & nm, display_var_proc const & proc) { - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { if (i > 0) out << " or "; m_atoms[i]->display(out, nm, proc); @@ -305,7 +305,7 @@ context_t::node::node(context_t & s, unsigned id): m_next = nullptr; bm().mk(m_lowers); bm().mk(m_uppers); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { bm().push_back(m_lowers, nullptr); bm().push_back(m_uppers, nullptr); } @@ -378,7 +378,7 @@ context_t::monomial::monomial(unsigned sz, power const * pws): template void context_t::monomial::display(std::ostream & out, display_var_proc const & proc, bool use_star) const { SASSERT(m_size > 0); - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (i > 0) { if (use_star) out << "*"; @@ -399,7 +399,7 @@ void context_t::polynomial::display(std::ostream & out, numeral_manager & nm, first = false; } - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { if (first) first = false; else @@ -637,7 +637,7 @@ void context_t::display(std::ostream & out, constraint * c, bool use_star) co template void context_t::display_bounds(std::ostream & out, node * n) const { unsigned num = num_vars(); - for (unsigned x = 0; x < num; x++) { + for (unsigned x = 0; x < num; ++x) { bound * l = n->lower(x); bound * u = n->upper(x); if (l != nullptr) { @@ -657,7 +657,7 @@ void context_t::display_bounds(std::ostream & out, node * n) const { */ template bool context_t::is_int(monomial const * m) const { - for (unsigned i = 0; i < m->size(); i++) { + for (unsigned i = 0; i < m->size(); ++i) { if (is_int(m->x(i))) return true; } @@ -669,7 +669,7 @@ bool context_t::is_int(monomial const * m) const { */ template bool context_t::is_int(polynomial const * p) const { - for (unsigned i = 0; i < p->size(); i++) { + for (unsigned i = 0; i < p->size(); ++i) { if (!is_int(p->x(i)) || !nm().is_int(p->a(i))) { TRACE(subpaving_is_int, tout << "polynomial is not integer due to monomial at i: " << i << "\n"; tout.flush(); display(tout, p->x(i)); tout << " "; nm().display(tout, p->a(i)); tout << "\n";); @@ -703,7 +703,7 @@ var context_t::mk_monomial(unsigned sz, power const * pws) { m_pws.append(sz, pws); std::sort(m_pws.begin(), m_pws.end(), power::lt_proc()); unsigned j = 0; - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { if (m_pws[j].x() == m_pws[i].x()) { m_pws[j].degree() += m_pws[i].degree(); } @@ -720,7 +720,7 @@ var context_t::mk_monomial(unsigned sz, power const * pws) { monomial * r = new (mem) monomial(sz, pws); var new_var = mk_var(is_int(r)); m_defs[new_var] = r; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = pws[i].x(); m_wlist[x].push_back(watched(new_var)); } @@ -731,7 +731,7 @@ template void context_t::del_sum(polynomial * p) { unsigned sz = p->size(); unsigned mem_sz = polynomial::get_obj_size(sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { nm().del(p->m_as[i]); } nm().del(p->m_c); @@ -742,7 +742,7 @@ void context_t::del_sum(polynomial * p) { template var context_t::mk_sum(numeral const & c, unsigned sz, numeral const * as, var const * xs) { m_num_buffer.reserve(num_vars()); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(xs[i] < num_vars()); nm().set(m_num_buffer[xs[i]], as[i]); } @@ -755,7 +755,7 @@ var context_t::mk_sum(numeral const & c, unsigned sz, numeral const * as, var p->m_xs = reinterpret_cast(reinterpret_cast(p->m_as) + sizeof(numeral)*sz); memcpy(p->m_xs, xs, sizeof(var)*sz); std::sort(p->m_xs, p->m_xs+sz); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { numeral * curr = p->m_as + i; new (curr) numeral(); var x = p->m_xs[i]; @@ -763,7 +763,7 @@ var context_t::mk_sum(numeral const & c, unsigned sz, numeral const * as, var } TRACE(subpaving_mk_sum, tout << "new variable is integer: " << is_int(p) << "\n";); var new_var = mk_var(is_int(p)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = p->m_xs[i]; m_wlist[x].push_back(watched(new_var)); } @@ -819,13 +819,13 @@ void context_t::add_clause_core(unsigned sz, ineq * const * atoms, bool lemma void * mem = allocator().allocate(clause::get_obj_size(sz)); clause * c = new (mem) clause(); c->m_size = sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { inc_ref(atoms[i]); c->m_atoms[i] = atoms[i]; } std::stable_sort(c->m_atoms, c->m_atoms + sz, typename ineq::lt_var_proc()); if (watch) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = c->m_atoms[i]->x(); if (x != null_var && (i == 0 || x != c->m_atoms[i-1]->x())) m_wlist[x].push_back(watched(c)); @@ -849,7 +849,7 @@ void context_t::del_clause(clause * c) { bool watch = c->watched(); var prev_x = null_var; unsigned sz = c->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = c->m_atoms[i]->x(); if (watch) { if (x != prev_x) @@ -1092,7 +1092,7 @@ void context_t::collect_leaves(ptr_vector & leaves) const { template void context_t::del_unit_clauses() { unsigned sz = m_unit_clauses.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) dec_ref(UNTAG(ineq*, m_unit_clauses[i])); m_unit_clauses.reset(); } @@ -1100,7 +1100,7 @@ void context_t::del_unit_clauses() { template void context_t::del_clauses(ptr_vector & cs) { unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { del_clause(cs[i]); } cs.reset(); @@ -1115,7 +1115,7 @@ void context_t::del_clauses() { template void context_t::del_definitions() { unsigned sz = num_vars(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { definition * d = m_defs[i]; if (d == nullptr) continue; @@ -1136,7 +1136,7 @@ void context_t::del_definitions() { template void context_t::display_constraints(std::ostream & out, bool use_star) const { // display definitions - for (unsigned i = 0; i < num_vars(); i++) { + for (unsigned i = 0; i < num_vars(); ++i) { if (is_definition(i)) { (*m_display_proc)(out, i); out << " = "; @@ -1145,12 +1145,12 @@ void context_t::display_constraints(std::ostream & out, bool use_star) const } } // display units - for (unsigned i = 0; i < m_unit_clauses.size(); i++) { + for (unsigned i = 0; i < m_unit_clauses.size(); ++i) { ineq * a = UNTAG(ineq*, m_unit_clauses[i]); a->display(out, nm(), *m_display_proc); out << "\n"; } // display clauses - for (unsigned i = 0; i < m_clauses.size(); i++) { + for (unsigned i = 0; i < m_clauses.size(); ++i) { m_clauses[i]->display(out, nm(), *m_display_proc); out << "\n"; } } @@ -1380,7 +1380,7 @@ void context_t::propagate_clause(clause * c, node * n) { c->set_visited(m_timestamp); unsigned sz = c->size(); unsigned j = UINT_MAX; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ineq * atom = (*c)[i]; switch (value(atom, n)) { case l_true: @@ -1416,7 +1416,7 @@ void context_t::propagate_polynomial(var x, node * n, var y) { interval & v = m_i_tmp2; interval & av = m_i_tmp3; av.set_mutable(); if (x == y) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var z = p->x(i); v.set_constant(n, z); im().mul(p->a(i), v, av); @@ -1431,7 +1431,7 @@ void context_t::propagate_polynomial(var x, node * n, var y) { v.set_constant(n, x); numeral & a = m_tmp1; im().set(r, v); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var z = p->x(i); if (z != y) { v.set_constant(n, z); @@ -1475,7 +1475,7 @@ void context_t::propagate_polynomial(var x, node * n) { if (is_unbounded(x, n)) unbounded_var = x; unsigned sz = p->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var y = p->x(i); if (is_unbounded(y, n)) { if (unbounded_var != null_var) @@ -1490,7 +1490,7 @@ void context_t::propagate_polynomial(var x, node * n) { } else { propagate_polynomial(x, n, x); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (inconsistent(n)) return; propagate_polynomial(x, n, p->x(i)); @@ -1509,7 +1509,7 @@ void context_t::propagate_monomial(var x, node * n) { bool found_zero = false; bool x_is_unbounded = false; unsigned sz = m->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var y = m->x(i); if (is_zero(y, n)) { found_zero = true; @@ -1546,7 +1546,7 @@ void context_t::propagate_monomial(var x, node * n) { if (!x_is_unbounded) { unsigned bad_pos = UINT_MAX; interval & aux = m_i_tmp1; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { aux.set_constant(n, m->x(i)); if (im().contains_zero(aux)) { if (bad_pos != UINT_MAX) @@ -1556,7 +1556,7 @@ void context_t::propagate_monomial(var x, node * n) { } if (bad_pos == UINT_MAX) { // we can use all variables for downward propagation. - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (inconsistent(n)) return; propagate_monomial_downward(x, n, i); @@ -1576,7 +1576,7 @@ void context_t::propagate_monomial_upward(var x, node * n) { interval & r = m_i_tmp1; r.set_mutable(); interval & y = m_i_tmp2; interval & yk = m_i_tmp3; yk.set_mutable(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { y.set_constant(n, m->x(i)); im().power(y, m->degree(i), yk); if (i == 0) @@ -1615,7 +1615,7 @@ void context_t::propagate_monomial_downward(var x, node * n, unsigned j) { interval & y = m_i_tmp2; interval & yk = m_i_tmp3; yk.set_mutable(); bool first = true; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i == j) continue; y.set_constant(n, m->x(i)); @@ -1765,7 +1765,7 @@ void context_t::propagate(node * n) { template void context_t::propagate_all_definitions(node * n) { unsigned num = num_vars(); - for (unsigned x = 0; x < num; x++) { + for (unsigned x = 0; x < num; ++x) { if (inconsistent(n)) break; if (is_definition(x)) diff --git a/src/math/subpaving/tactic/expr2subpaving.cpp b/src/math/subpaving/tactic/expr2subpaving.cpp index e2c43d12b..2beb37a7c 100644 --- a/src/math/subpaving/tactic/expr2subpaving.cpp +++ b/src/math/subpaving/tactic/expr2subpaving.cpp @@ -195,7 +195,7 @@ struct expr2subpaving::imp { scoped_mpz n_arg(qm()); scoped_mpz d_arg(qm()); sbuffer pws; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = margs[i]; unsigned k; as_power(arg, arg, k); @@ -227,7 +227,7 @@ struct expr2subpaving::imp { var_buffer xs; scoped_mpq c(qm()), c_arg(qm()); scoped_mpz n_arg(qm()), d_arg(qm()); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = t->get_arg(i); subpaving::var x_arg = process(arg, depth+1, n_arg, d_arg); if (x_arg == subpaving::null_var) { @@ -242,14 +242,14 @@ struct expr2subpaving::imp { } qm().set(d, c.get().denominator()); unsigned sz = xs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { qm().lcm(d, ds[i], d); } scoped_mpz & k = d_arg; qm().div(d, c.get().denominator(), k); scoped_mpz sum_c(qm()); qm().mul(c.get().numerator(), k, sum_c); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { qm().div(d, ds[i], k); qm().mul(ns[i], k, ns[i]); } diff --git a/src/math/subpaving/tactic/subpaving_tactic.cpp b/src/math/subpaving/tactic/subpaving_tactic.cpp index e70d83ac4..bf63ee797 100644 --- a/src/math/subpaving/tactic/subpaving_tactic.cpp +++ b/src/math/subpaving/tactic/subpaving_tactic.cpp @@ -170,7 +170,7 @@ class subpaving_tactic : public tactic { sz = 1; } ref_buffer ineq_buffer(*m_ctx); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ineq_buffer.push_back(mk_ineq(args[i])); } m_ctx->add_clause(sz, ineq_buffer.data()); @@ -178,7 +178,7 @@ class subpaving_tactic : public tactic { void internalize(goal const & g) { try { - for (unsigned i = 0; i < g.size(); i++) { + for (unsigned i = 0; i < g.size(); ++i) { process_clause(g.form(i)); } } diff --git a/src/model/array_factory.cpp b/src/model/array_factory.cpp index 3030eeafd..9e34846a2 100644 --- a/src/model/array_factory.cpp +++ b/src/model/array_factory.cpp @@ -27,7 +27,7 @@ func_decl * mk_aux_decl_for_array_sort(ast_manager & m, sort * s) { ptr_buffer domain; sort * range = get_array_range(s); unsigned arity = get_array_arity(s); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { domain.push_back(get_array_domain(s, i)); } return m.mk_fresh_func_decl(symbol::null, symbol::null, arity, domain.data(), range); @@ -53,7 +53,7 @@ expr * array_factory::mk_array_interp(sort * s, func_interp * & fi) { void array_factory::get_some_args_for(sort * s, ptr_buffer & args) { unsigned arity = get_array_arity(s); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { sort * d = get_array_domain(s, i); expr * a = m_model.get_some_value(d); args.push_back(a); @@ -162,7 +162,7 @@ expr * array_factory::get_fresh_value(sort * s) { ptr_buffer args2; bool found = false; unsigned arity = get_array_arity(s); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { sort * d = get_array_domain(s, i); if (!found) { expr * arg1 = m_model.get_fresh_value(d); diff --git a/src/model/datatype_factory.cpp b/src/model/datatype_factory.cpp index 39e4b6da3..e0c2f27fe 100644 --- a/src/model/datatype_factory.cpp +++ b/src/model/datatype_factory.cpp @@ -35,7 +35,7 @@ expr * datatype_factory::get_some_value(sort * s) { func_decl * c = m_util.get_non_rec_constructor(s); ptr_vector args; unsigned num = c->get_arity(); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) args.push_back(m_model.get_some_value(c->get_domain(i))); expr * r = m_manager.mk_app(c, args); register_value(r); @@ -95,7 +95,7 @@ expr * datatype_factory::get_almost_fresh_value(sort * s) { bool found_fresh_arg = false; bool recursive = false; unsigned num = constructor->get_arity(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort * s_arg = constructor->get_domain(i); if (!found_fresh_arg && (!m_util.is_datatype(s_arg) || !m_util.are_siblings(s, s_arg))) { expr * new_arg = m_model.get_fresh_value(s_arg); @@ -163,7 +163,7 @@ expr * datatype_factory::get_fresh_value(sort * s) { expr_ref new_value(m_manager); bool found_fresh_arg = false; unsigned num = constructor->get_arity(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort * s_arg = constructor->get_domain(i); if (!found_fresh_arg && !m_util.is_recursive_nested(s_arg) && @@ -205,7 +205,7 @@ expr * datatype_factory::get_fresh_value(sort * s) { bool found_sibling = false; unsigned num = constructor->get_arity(); TRACE(datatype, tout << "checking constructor: " << constructor->get_name() << "\n";); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort * s_arg = constructor->get_domain(i); TRACE(datatype, tout << mk_pp(s, m_manager) << " " << mk_pp(s_arg, m_manager) << " are_siblings " diff --git a/src/model/func_interp.cpp b/src/model/func_interp.cpp index eb5b826d9..513c39b10 100644 --- a/src/model/func_interp.cpp +++ b/src/model/func_interp.cpp @@ -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 & 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 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 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())); } diff --git a/src/model/model_evaluator.cpp b/src/model/model_evaluator.cpp index b5f72c432..842200667 100644 --- a/src/model/model_evaluator.cpp +++ b/src/model/model_evaluator.cpp @@ -116,7 +116,7 @@ struct evaluator_cfg : public default_rewriter_cfg { func_interp * fi = m_model.get_func_interp(f); bool r = (fi != nullptr) && eval_fi(fi, num, args, result); CTRACE(model_evaluator, r, tout << "reduce_app " << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m) << "\n"; + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m) << "\n"; tout << "---->\n" << mk_ismt2_pp(result, m) << "\n";); return r; } @@ -130,7 +130,7 @@ struct evaluator_cfg : public default_rewriter_cfg { bool actuals_are_values = true; - for (unsigned i = 0; actuals_are_values && i < num; i++) + for (unsigned i = 0; actuals_are_values && i < num; ++i) actuals_are_values = m.is_value(args[i]); if (!actuals_are_values) diff --git a/src/model/model_implicant.cpp b/src/model/model_implicant.cpp index bf9209f23..658fbb0ec 100644 --- a/src/model/model_implicant.cpp +++ b/src/model/model_implicant.cpp @@ -74,7 +74,7 @@ void model_implicant::setup_model(model_ref& model) { m_model = model; rational r; unsigned sz = model->get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * d = model->get_constant(i); expr* val = model->get_const_interp(d); expr* e = m.mk_const(d); @@ -294,7 +294,7 @@ expr_ref_vector model_implicant::prune_by_cone_of_influence(ptr_vector con unsigned sz = m_model->get_num_constants(); expr_ref e(m), eq(m), val(m); expr_ref_vector model(m); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { e = m.mk_const(m_model->get_constant(i)); if (m_visited.is_marked(e)) { val = eval(m_model, e); diff --git a/src/model/model_pp.cpp b/src/model/model_pp.cpp index 727d2e1da..434ebbda3 100644 --- a/src/model/model_pp.cpp +++ b/src/model/model_pp.cpp @@ -27,7 +27,7 @@ Revision History: static void display_uninterp_sorts(std::ostream & out, model_core const & md) { ast_manager & m = md.get_manager(); unsigned sz = md.get_num_uninterpreted_sorts(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sort * s = md.get_uninterpreted_sort(i); out << "(define-sort " << mk_pp(s, m); for (expr* e : md.get_universe(s)) { @@ -40,7 +40,7 @@ static void display_uninterp_sorts(std::ostream & out, model_core const & md) { static void display_constants(std::ostream & out, model_core const & md) { ast_manager & m = md.get_manager(); unsigned sz = md.get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * c = md.get_constant(i); char const * d = "(define "; std::string n = c->get_name().str(); @@ -52,23 +52,23 @@ static void display_constants(std::ostream & out, model_core const & md) { static void display_functions(std::ostream & out, model_core const & md) { ast_manager & m = md.get_manager(); unsigned sz = md.get_num_functions(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * f = md.get_function(i); out << "(define (" << f->get_name(); unsigned arity = f->get_arity(); func_interp * fi = md.get_func_interp(f); - for (unsigned j = 0; j < arity; j++) { + for (unsigned j = 0; j < arity; ++j) { out << " " << "x!" << j; } out << ")\n"; unsigned num_entries = fi->num_entries(); - for (unsigned j = 0; j < num_entries; j++) { + for (unsigned j = 0; j < num_entries; ++j) { func_entry const * curr = fi->get_entry(j); out << " (if "; if (arity > 1) out << "(and "; - for (unsigned j = 0; j < arity; j++) { + for (unsigned j = 0; j < arity; ++j) { out << "(= x!" << j << " " << mk_ismt2_pp(curr->get_arg(j), m) << ")"; if (j + 1 < arity) out << " "; @@ -84,7 +84,7 @@ static void display_functions(std::ostream & out, model_core const & md) { else { out << " " << mk_ismt2_pp(fi->get_else(), m, params_ref(), 5, arity, "x"); } - for (unsigned j = 0; j < num_entries; j++) + for (unsigned j = 0; j < num_entries; ++j) out << ")"; out << ")\n"; } diff --git a/src/model/model_smt2_pp.cpp b/src/model/model_smt2_pp.cpp index f26b67797..a900d519e 100644 --- a/src/model/model_smt2_pp.cpp +++ b/src/model/model_smt2_pp.cpp @@ -26,7 +26,7 @@ Revision History: using namespace format_ns; static void pp_indent(std::ostream & out, unsigned indent) { - for (unsigned i = 0; i < indent; i++) + for (unsigned i = 0; i < indent; ++i) out << " "; } @@ -58,7 +58,7 @@ static void pp_uninterp_sorts(std::ostream & out, ast_printer_context & ctx, mod ast_manager & m = ctx.get_ast_manager(); ptr_buffer f_conds; unsigned num = md.get_num_uninterpreted_sorts(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort * s = md.get_uninterpreted_sort(i); ptr_vector const & u = md.get_universe(s); std::ostringstream buffer; @@ -77,7 +77,7 @@ static void pp_uninterp_sorts(std::ostream & out, ast_printer_context & ctx, mod unsigned len = static_cast(buffer_str.length()); pp_indent(out, indent); out << ";; "; - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { char c = buffer_str[i]; if (c == '\n') { out << "\n"; @@ -139,7 +139,7 @@ static void pp_uninterp_sorts(std::ostream & out, ast_printer_context & ctx, mod static void pp_consts(std::ostream & out, ast_printer_context & ctx, model_core const & md, unsigned indent) { unsigned num = md.get_num_constants(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { func_decl * c = md.get_constant(i); expr * c_i = md.get_const_interp(c); pp_indent(out, indent); @@ -158,7 +158,7 @@ void sort_fun_decls(ast_manager & m, model_core const & md, ptr_buffer todo; unsigned sz = md.get_num_functions(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * f = md.get_function(i); if (visited.contains(f)) continue; @@ -210,19 +210,19 @@ static void pp_funs(std::ostream & out, ast_printer_context & ctx, model_core co var_names.reset(); if (f_i->is_partial()) { body = mk_string(m, "#unspecified"); - for (unsigned j = 0; j < f->get_arity(); j++) { + for (unsigned j = 0; j < f->get_arity(); ++j) { var_names.push_back(symbol("x!" + std::to_string(j+1))); } } else { ctx.pp(f_i->get_else(), f->get_arity(), "x", body, var_names); } - TRACE(model_smt2_pp, for (unsigned i = 0; i < var_names.size(); i++) tout << var_names[i] << "\n";); + TRACE(model_smt2_pp, for (unsigned i = 0; i < var_names.size(); ++i) tout << var_names[i] << "\n";); f_var_names.reset(); for (auto const& vn : var_names) f_var_names.push_back(mk_string(m, vn.bare_str())); f_arg_decls.reset(); - for (unsigned i = 0; i < f->get_arity(); i++) { + for (unsigned i = 0; i < f->get_arity(); ++i) { format_ref f_domain(fm(m)); ctx.pp(f->get_domain(i), f_domain); format * args[2] = { f_var_names[i], f_domain.get() }; @@ -233,10 +233,10 @@ static void pp_funs(std::ostream & out, ast_printer_context & ctx, model_core co ctx.pp(f->get_range(), f_range); if (f_i->num_entries() > 0) { f_entries.reset(); - for (unsigned i = 0; i < f_i->num_entries(); i++) { + for (unsigned i = 0; i < f_i->num_entries(); ++i) { func_entry const * e = f_i->get_entry(i); f_entry_conds.reset(); - for (unsigned j = 0; j < f->get_arity(); j++) { + for (unsigned j = 0; j < f->get_arity(); ++j) { format_ref f_arg(fm(m)); ctx.pp(e->get_arg(j), f_arg); format * eq_args[2] = { f_var_names[j], f_arg.get() }; @@ -262,7 +262,7 @@ static void pp_funs(std::ostream & out, ast_printer_context & ctx, model_core co f_entries.push_back(mk_indent(m, TAB_SZ, mk_compose(m, mk_line_break(m), body.get()))); - for (unsigned i = 0; i < f_i->num_entries(); i++) + for (unsigned i = 0; i < f_i->num_entries(); ++i) f_entries.push_back(mk_string(m, ")")); body = mk_compose(m, f_entries.size(), f_entries.data()); } diff --git a/src/model/model_v2_pp.cpp b/src/model/model_v2_pp.cpp index 5ade6ba63..0dd293b27 100644 --- a/src/model/model_v2_pp.cpp +++ b/src/model/model_v2_pp.cpp @@ -28,10 +28,10 @@ static void display_function(std::ostream & out, model_core const & md, func_dec unsigned arity = g->get_arity(); char const * else_str = num_entries == 0 ? " " : " else -> "; unsigned else_indent = static_cast(strlen(else_str)); - for (unsigned i = 0; i < num_entries; i++) { + for (unsigned i = 0; i < num_entries; ++i) { func_entry const * entry = g->get_entry(i); out << " "; - for (unsigned j = 0; j < arity; j++) { + for (unsigned j = 0; j < arity; ++j) { expr * arg = entry->get_arg(j); out << mk_pp(arg, m); out << " "; @@ -57,14 +57,14 @@ static void display_function(std::ostream & out, model_core const & md, func_dec static void display_functions(std::ostream & out, model_core const & md, bool partial) { unsigned sz = md.get_num_functions(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) display_function(out, md, md.get_function(i), partial); } static void display_constants(std::ostream & out, model_core const & md) { ast_manager & m = md.get_manager(); unsigned sz = md.get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * d = md.get_constant(i); std::string name = d->get_name().str(); diff --git a/src/muz/base/dl_context.cpp b/src/muz/base/dl_context.cpp index f90768c0a..0a828db7a 100644 --- a/src/muz/base/dl_context.cpp +++ b/src/muz/base/dl_context.cpp @@ -638,7 +638,7 @@ namespace datalog { SASSERT(is_fact(head)); relation_fact fact(get_manager()); unsigned n = head->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { fact.push_back(to_app(head->get_arg(i))); } add_fact(head->get_decl(), fact); diff --git a/src/muz/base/dl_rule.cpp b/src/muz/base/dl_rule.cpp index bf08bd16b..7bb7cc4b3 100644 --- a/src/muz/base/dl_rule.cpp +++ b/src/muz/base/dl_rule.cpp @@ -108,7 +108,7 @@ namespace datalog { var_idx_set& rule_manager::collect_tail_vars(rule * r) { reset_collect_vars(); unsigned n = r->get_tail_size(); - for (unsigned i=0;iget_tail(i)); } return finalize_collect_vars(); @@ -118,7 +118,7 @@ namespace datalog { reset_collect_vars(); unsigned n = r->get_tail_size(); accumulate_vars(r->get_head()); - for (unsigned i=0;iget_tail(i) != t) { accumulate_vars(r->get_tail(i)); } @@ -130,7 +130,7 @@ namespace datalog { reset_collect_vars(); unsigned n = r->get_tail_size(); accumulate_vars(r->get_head()); - for (unsigned i=0;iget_tail(i)); } return finalize_collect_vars(); @@ -305,7 +305,7 @@ namespace datalog { body.push_back(to_app(q)); flatten_body(body); func_decl* body_pred = nullptr; - for (unsigned i = 0; i < body.size(); i++) { + for (unsigned i = 0; i < body.size(); ++i) { if (is_uninterp(body[i].get())) { body_pred = body[i]->get_decl(); break; @@ -330,7 +330,7 @@ namespace datalog { } expr_ref_vector qhead_args(m); - for (unsigned i = 0; i < vars.size(); i++) { + for (unsigned i = 0; i < vars.size(); ++i) { qhead_args.push_back(m.mk_var(vars.size()-i-1, vars[i])); } app_ref qhead(m.mk_app(qpred, qhead_args.data()), m); @@ -475,7 +475,7 @@ namespace datalog { bool has_neg = false; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { bool is_neg = (is_negated != nullptr && is_negated[i]); app * curr = tail[i]; @@ -544,7 +544,7 @@ namespace datalog { r->m_uninterp_cnt = source->m_uninterp_cnt; r->m_proof = nullptr; m.inc_ref(r->m_head); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { r->m_tail[i] = source->m_tail[i]; m.inc_ref(r->get_tail(i)); } @@ -554,7 +554,7 @@ namespace datalog { void rule_manager::to_formula(rule const& r, expr_ref& fml) { ast_manager & m = fml.get_manager(); expr_ref_vector body(m); - for (unsigned i = 0; i < r.get_tail_size(); i++) { + for (unsigned i = 0; i < r.get_tail_size(); ++i) { body.push_back(r.get_tail(i)); if (r.is_neg_tail(i)) { body[body.size()-1] = m.mk_not(body.back()); @@ -663,7 +663,7 @@ namespace datalog { vctr.count_vars(head); - for (unsigned i = 0; i < ut_len; i++) { + for (unsigned i = 0; i < ut_len; ++i) { app * t = r->get_tail(i); vctr.count_vars(t); tail.push_back(t); @@ -673,12 +673,12 @@ namespace datalog { var_idx_set unbound_vars; expr_ref_vector tails_with_unbound(m); - for (unsigned i = ut_len; i < t_len; i++) { + for (unsigned i = ut_len; i < t_len; ++i) { app * t = r->get_tail(i); m_free_vars(t); bool has_unbound = false; unsigned iv_size = m_free_vars.size(); - for (unsigned i=0; i qnames; - for (unsigned i = 0; i < q_var_cnt; i++) { + for (unsigned i = 0; i < q_var_cnt; ++i) { qnames.push_back(symbol(i)); } //quantifiers take this reversed @@ -838,7 +838,7 @@ namespace datalog { throw default_exception(out.str()); } unsigned num_args = to_app(head)->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(head)->get_arg(i); if (!is_var(arg) && !m.is_value(arg)) { std::ostringstream out; @@ -850,7 +850,7 @@ namespace datalog { bool rule_manager::is_fact(app * head) const { unsigned num_args = head->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!m.is_value(head->get_arg(i))) return false; } @@ -860,7 +860,7 @@ namespace datalog { void rule::deallocate(ast_manager & m) { m.dec_ref(m_head); unsigned n = get_tail_size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { m.dec_ref(get_tail(i)); } if (m_proof) { @@ -882,7 +882,7 @@ namespace datalog { bool rule::is_in_tail(const func_decl * p, bool only_positive) const { unsigned len = only_positive ? get_positive_tail_size() : get_uninterpreted_tail_size(); - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { if (get_tail(i)->get_decl()==p) { return true; } @@ -1003,7 +1003,7 @@ namespace datalog { m.dec_ref(m_head); m_head = new_head_a; - for (unsigned i = 0; i < m_tail_size; i++) { + for (unsigned i = 0; i < m_tail_size; ++i) { app * old_tail = get_tail(i); app_ref new_tail_a = rm.ensure_app(vs(old_tail, subst_vals.size(), subst_vals.data())); bool sign = is_neg_tail(i); @@ -1025,7 +1025,7 @@ namespace datalog { return; } out << " :- "; - for (unsigned i = 0; i < m_tail_size; i++) { + for (unsigned i = 0; i < m_tail_size; ++i) { if (i > 0) out << ","; if (!compact) diff --git a/src/muz/base/dl_rule_set.cpp b/src/muz/base/dl_rule_set.cpp index 09d994736..d621e1b24 100644 --- a/src/muz/base/dl_rule_set.cpp +++ b/src/muz/base/dl_rule_set.cpp @@ -89,7 +89,7 @@ namespace datalog { void rule_dependencies::populate(unsigned n, rule * const * rules) { SASSERT(m_data.empty()); - for (unsigned i=0; i::const_iterator it = m_rules.data(); ptr_vector::const_iterator end = m_rules.data() + m_rules.size(); - for (; it != end; it++) { + for (; it != end; ++it) { rule * r = *it; func_decl * head_decl = r->get_decl(); unsigned n = r->get_uninterpreted_tail_size(); - for (unsigned i = r->get_positive_tail_size(); i < n; i++) { + for (unsigned i = r->get_positive_tail_size(); i < n; ++i) { SASSERT(r->is_neg_tail(i)); func_decl * tail_decl = r->get_decl(i); unsigned neg_strat = get_predicate_strat(tail_decl); @@ -423,7 +423,7 @@ namespace datalog { void rule_set::add_rules(const rule_set & src) { SASSERT(!is_closed()); unsigned n = src.get_num_rules(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { add_rule(src.get_rule(i)); } inherit_predicates(src); @@ -639,7 +639,7 @@ namespace datalog { // We put components whose indegree is zero to m_strats and assign its // m_components entry to zero. unsigned comp_cnt = m_components.size(); - for (unsigned i = 0; i < comp_cnt; i++) { + for (unsigned i = 0; i < comp_cnt; ++i) { if (in_degrees[i] == 0) { m_strats.push_back(m_components[i]); m_components[i] = 0; @@ -681,7 +681,7 @@ namespace datalog { SASSERT(m_pred_strat_nums.empty()); unsigned strat_cnt = m_strats.size(); - for (unsigned strat_index=0; strat_index < strat_cnt; strat_index++) { + for (unsigned strat_index=0; strat_index < strat_cnt; ++strat_index) { item_set * comp = m_strats[strat_index]; for (T * el : *comp) { m_pred_strat_nums.insert(el, strat_index); diff --git a/src/muz/base/dl_util.cpp b/src/muz/base/dl_util.cpp index b1bfc0d7c..449543e89 100644 --- a/src/muz/base/dl_util.cpp +++ b/src/muz/base/dl_util.cpp @@ -71,7 +71,7 @@ namespace datalog { SASSERT(is_uninterp(pred)); unsigned res = 0; unsigned n = pred->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * arg = pred->get_arg(i); if (is_var(arg)) { res++; @@ -84,7 +84,7 @@ namespace datalog { sort_ref_buffer & new_rule_domain, expr_ref_buffer & new_rule_args, app_ref & new_pred) { expr_ref_buffer new_args(m); unsigned n = pred->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * arg = pred->get_arg(i); if (m.is_value(arg)) { new_args.push_back(arg); @@ -135,7 +135,7 @@ namespace datalog { out << pred_decl->get_name() << '('; - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { expr * arg = f->get_arg(i); if (i != 0) { out << ','; @@ -163,7 +163,7 @@ namespace datalog { out << "\t("; - for(unsigned i = 0; i < arity; i++) { + for(unsigned i = 0; i < arity; ++i) { if (i != 0) { out << ','; } @@ -198,7 +198,7 @@ namespace datalog { bool variable_intersection::args_match(const app * f1, const app * f2) { unsigned n=size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { unsigned f1_index, f2_index; get(i, f1_index, f2_index); if (!values_match(f1->get_arg(f1_index),f2->get_arg(f2_index))) { @@ -215,7 +215,7 @@ namespace datalog { } unsigned n = m_const_indexes.size(); - for(unsigned i=0; iget_arg(f_index), m_consts[i].get())) { return false; @@ -231,11 +231,11 @@ namespace datalog { //TODO: optimize quadratic complexity //TODO: optimize number of checks when variable occurs multiple times unsigned arity = a->get_num_args(); - for(unsigned i1=0; i1get_arg(i1); if(is_var(e1)) { var* v1=to_var(e1); - for(unsigned i2=i1+1; i2get_arg(i2); if(!is_var(e2)) { continue; @@ -264,7 +264,7 @@ namespace datalog { reset(); count_vars(r->get_head(), 1); unsigned n = r->get_tail_size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { count_vars(r->get_tail(i), coef); } } @@ -274,7 +274,7 @@ namespace datalog { m_scopes.push_back(0); unsigned n = r.get_tail_size(); bool has_var = false; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { m_todo.push_back(r.get_tail(i)); m_scopes.push_back(0); } @@ -432,7 +432,7 @@ namespace datalog { unsigned src_ofs = src_sz - 1; unsigned max_var_idx = 0; - for(unsigned i=0; iget_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * arg = src->get_arg(i); if (!is_var(arg)) { tgt[i] = arg; @@ -193,7 +193,7 @@ namespace datalog { template void fill_into_second(const app * f1, T & tgt) const { unsigned n = size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { unsigned f1_index, tgt_index; get(i, f1_index, tgt_index); tgt[tgt_index] = f1->get_arg(f1_index); @@ -216,13 +216,13 @@ namespace datalog { //TODO: optimize number of checks when variable occurs multiple times unsigned a1num = expr_cont_get_size(a1); unsigned a2num = expr_cont_get_size(a2); - for (unsigned i1 = 0; i1 bool remove_from_vector(T & v, const typename T::data_t & el) { unsigned sz = v.size(); - for (unsigned i=0; i cmp(keys); std::sort(numbers.begin(), numbers.end(), cmp); - for (unsigned i=0; i void add_sequence_without_set(unsigned start, unsigned count, const Container & complement, unsigned_vector & v) { unsigned after_last = start+count; - for (unsigned i=start; iform(i); formula_kind k = get_formula_kind(f); switch(k) { diff --git a/src/muz/rel/dl_base.cpp b/src/muz/rel/dl_base.cpp index 2377d6e09..57ac3ca3b 100644 --- a/src/muz/rel/dl_base.cpp +++ b/src/muz/rel/dl_base.cpp @@ -50,7 +50,7 @@ namespace datalog { unsigned sz = map.size(); unsigned ofs = sz-1; renaming_arg.resize(sz, static_cast(nullptr)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (map[i] != UINT_MAX) { renaming_arg.set(ofs-i, m.mk_var(map[i], orig_sig[i])); } @@ -74,7 +74,7 @@ namespace datalog { void relation_signature::output(ast_manager & m, std::ostream & out) const { unsigned sz = size(); out << "("; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i != 0) out << ","; out << mk_pp((*this)[i], m); } @@ -104,16 +104,16 @@ namespace datalog { unsigned s2sz=s2.size(); unsigned s1first_func=s1sz-s1.functional_columns(); unsigned s2first_func=s2sz-s2.functional_columns(); - for (unsigned i=0; i uf(uf_ctx); //the numbers in uf correspond to column indexes after the join - for (unsigned i=0; icols1[i]) ? cols1[i] : (first_func_ofs+cols1[i]-s1_first_func); unsigned idx2 = (s2_first_func>cols2[i]) ? (second_ofs+cols2[i]) : (second_func_ofs+cols2[i]-s2_first_func); uf.merge(idx1, idx2); } - for (unsigned i=0; i=first_func_ofs) { //removing functional columns won't make us merge rows @@ -238,13 +238,13 @@ namespace datalog { } void table_base::remove_facts(unsigned fact_cnt, const table_fact * facts) { - for (unsigned i = 0; i < fact_cnt; i++) { + for (unsigned i = 0; i < fact_cnt; ++i) { remove_fact(facts[i]); } } void table_base::remove_facts(unsigned fact_cnt, const table_element * facts) { - for (unsigned i = 0; i < fact_cnt; i++) { + for (unsigned i = 0; i < fact_cnt; ++i) { remove_fact(facts + i*get_signature().size()); } } @@ -282,7 +282,7 @@ namespace datalog { for (auto& k : *this) { k.get_fact(row); bool differs = false; - for (unsigned i=0; iadd_fact(fact); @@ -429,7 +429,7 @@ namespace datalog { void table_base::row_interface::get_fact(table_fact & result) const { result.reset(); unsigned n = size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { result.push_back((*this)[i]); } } diff --git a/src/muz/rel/dl_base.h b/src/muz/rel/dl_base.h index d6394ddb1..9c1442185 100644 --- a/src/muz/rel/dl_base.h +++ b/src/muz/rel/dl_base.h @@ -99,7 +99,7 @@ namespace datalog { return false; } return memcmp(this->data(), o.data(), n*sizeof(sort))==0; - /*for (unsigned i=0; i bool bindings_match(const T & tgt_neg, const U & src) const { - for (unsigned i=0; i=first_src_fun; - for (unsigned i=1;i=first_src_fun)); } #endif @@ -1002,7 +1002,7 @@ namespace datalog { #if Z3DEBUG unsigned sz = src.size(); unsigned first_src_fun = sz-src.functional_columns(); - for (unsigned i=first_src_fun;i=first_src_fun); } #endif diff --git a/src/muz/rel/dl_compiler.cpp b/src/muz/rel/dl_compiler.cpp index 0778c6030..8aa01ce73 100644 --- a/src/muz/rel/dl_compiler.cpp +++ b/src/muz/rel/dl_compiler.cpp @@ -240,7 +240,7 @@ namespace datalog { } else { unsigned_vector removed_cols; - for(unsigned i=0; isize()==col_cnt); //now the intermediate table is a permutation - for(unsigned i=0; iget_num_args(); - for(unsigned i = 0; iget_arg(i); if (is_var(e) && globals.get(to_var(e)->get_idx()) > 0) { globals.update(to_var(e)->get_idx(), -1); @@ -494,7 +494,7 @@ namespace datalog { unsigned rem_index = 0; unsigned rem_sz = removed_cols.size(); unsigned a1len=a1->get_num_args(); - for(unsigned i=0; i=i); if(rem_indexget_num_args(); - for(unsigned i=0; i=i+a1len); if(rem_indexget_num_args()); unsigned n=a->get_num_args(); - for(unsigned i=0; iget_arg(i); if(is_app(arg)) { app * c = to_app(arg); //argument is a constant @@ -556,7 +556,7 @@ namespace datalog { //enforce equality to constants unsigned srlen=single_res_expr.size(); SASSERT((single_res==execution_context::void_register) ? (srlen==0) : (srlen==m_reg_signatures[single_res].size())); - for(unsigned i=0; iget_tail(i); func_decl * neg_pred = neg_tail->get_decl(); variable_intersection neg_intersection(m_context.get_manager()); @@ -651,7 +651,7 @@ namespace datalog { unsigned_vector neg_cols(neg_intersection.size(), neg_intersection.get_cols2()); unsigned neg_len = neg_tail->get_num_args(); - for (unsigned i = 0; iget_arg(i); if (is_var(e)) { continue; @@ -737,7 +737,7 @@ namespace datalog { // since it constraints each unbound column at a time (reducing the // size of intermediate results). unsigned ft_len=r->get_tail_size(); //full tail - for(unsigned tail_index=ut_len; tail_indexget_tail(tail_index); m_free_vars(t); @@ -808,7 +808,7 @@ namespace datalog { relation_signature & head_sig = m_reg_signatures[head_reg]; svector head_acis; unsigned_vector head_src_cols; - for(unsigned i=0; i tail_regs; tail_delta_infos tail_deltas; - for(unsigned j=0;jget_tail(j)->get_decl(); reg_idx tail_reg = m_pred_regs.find(tail_pred); tail_regs.push_back(tail_reg); @@ -1296,12 +1296,12 @@ namespace datalog { //load predicate data - for(unsigned i=0;iget_decl(), acc); unsigned rule_len = r->get_uninterpreted_tail_size(); - for(unsigned j=0;jget_tail(j)->get_decl(), acc); } } diff --git a/src/muz/rel/dl_finite_product_relation.cpp b/src/muz/rel/dl_finite_product_relation.cpp index 293cc72e2..45b04bfc8 100644 --- a/src/muz/rel/dl_finite_product_relation.cpp +++ b/src/muz/rel/dl_finite_product_relation.cpp @@ -100,7 +100,7 @@ namespace datalog { const relation_signature & s, bool_vector & table_columns) { SASSERT(table_columns.empty()); unsigned s_sz = s.size(); - for(unsigned i=0; i0); - for(unsigned i=0; iclone() : nullptr); } @@ -611,7 +611,7 @@ namespace datalog { if(!m_removed_rel_cols.empty()) { unsigned res_rel_cnt = res_relations.size(); - for(unsigned i=0; iclone() : nullptr); } if(!m_rel_identity) { unsigned res_rel_cnt = res_relations.size(); - for(unsigned i=0; i1) { r.garbage_collect(true); unsigned rel_cnt = r.m_others.size(); - for(unsigned rel_idx=0; rel_idx(f.back()); const relation_base & old_rel = r.get_inner_rel(old_rel_idx); relation_base * new_rel = old_rel.clone(); - for(unsigned i=0; i filter = rmgr.mk_filter_equal_fn(*new_rel, r_el, m_rel_cols[i]); @@ -1783,7 +1783,7 @@ namespace datalog { unsigned sz = rel_sig.size(); m_sig2table.resize(sz, UINT_MAX); m_sig2other.resize(sz, UINT_MAX); - for(unsigned i=0; i removed_cols; removed_cols.resize(table_data_col_cnt); - for(unsigned i=0; i::iterator end = rels.end(); for(; it!=end; ++it) { finite_product_relation & rel = **it; - for(unsigned i=0; iget_fact(ofact); out << "\t("; - for(unsigned i=0; i > sizes; size_t total_bytes = 0; - for(unsigned i = 0; i < n; i++) { + for(unsigned i = 0; i < n; ++i) { unsigned sz = reg(i) ? reg(i)->get_size_estimate_bytes() : 0; total_bytes += sz; sizes.push_back(std::make_pair(i, sz)); @@ -82,7 +82,7 @@ namespace datalog { out << "bytes " << total_bytes << "\n"; out << "bytes\trows\tannotation\n"; - for(unsigned i = 0; i < n; i++) { + for(unsigned i = 0; i < n; ++i) { unsigned sz = sizes[i].second; unsigned rg = sizes[i].first; unsigned rows = reg(rg) ? reg(rg)->get_size_estimate_rows() : 0; diff --git a/src/muz/rel/dl_mk_explanations.cpp b/src/muz/rel/dl_mk_explanations.cpp index 234a1d0bd..d61b5036e 100644 --- a/src/muz/rel/dl_mk_explanations.cpp +++ b/src/muz/rel/dl_mk_explanations.cpp @@ -77,7 +77,7 @@ namespace datalog { bool can_handle_signature(const relation_signature & s) override { unsigned n=s.size(); - for (unsigned i=0; i subst_arg; subst_arg.resize(sz); unsigned ofs = sz-1; - for (unsigned i=0; iget_positive_tail_size(); - for (unsigned i=0; iget_tail(i), e_var)); neg_flags.push_back(false); } unsigned tail_sz = r->get_tail_size(); - for (unsigned i=pos_tail_sz; iget_tail(i)); neg_flags.push_back(r->is_neg_tail(i)); } @@ -734,7 +734,7 @@ namespace datalog { symbol rule_repr = get_rule_symbol(r); expr_ref_vector rule_expr_args(m_manager); - for (unsigned tail_idx=0; tail_idxget_arity(); - for (unsigned i=0; iget_domain(i))); } app_ref orig_lit(m_manager.mk_app(orig_decl, lit_args.data()), m_manager); diff --git a/src/muz/rel/dl_mk_similarity_compressor.cpp b/src/muz/rel/dl_mk_similarity_compressor.cpp index 46415a0de..b99c957da 100644 --- a/src/muz/rel/dl_mk_similarity_compressor.cpp +++ b/src/muz/rel/dl_mk_similarity_compressor.cpp @@ -64,7 +64,7 @@ namespace datalog { SASSERT(t1->get_num_args()==t2->get_num_args()); int res; unsigned n = t1->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * a1 = t1->get_arg(i); expr * a2 = t2->get_arg(i); res = aux_compare(is_var(a1), is_var(a2)); @@ -85,7 +85,7 @@ namespace datalog { SASSERT(t1->get_num_args()==t2->get_num_args()); int res; unsigned n = t1->get_num_args(); - for (unsigned i=0; iget_arg(i))) { SASSERT(t1->get_arg(i) == t2->get_arg(i)); continue; @@ -115,7 +115,7 @@ namespace datalog { if (res!=0) { return res; } int pos_tail_sz = r1->get_positive_tail_size(); - for (int i=-1; iget_decl()->get_id(), t2->get_decl()->get_id()); @@ -125,7 +125,7 @@ namespace datalog { } unsigned tail_sz = r1->get_tail_size(); - for (unsigned i=pos_tail_sz; iget_tail(i)->get_id(), r2->get_tail(i)->get_id()); if (res!=0) { return res; } } @@ -140,7 +140,7 @@ namespace datalog { static int total_compare(rule * r1, rule * r2, int skipped_arg_index = INT_MAX) { SASSERT(rough_compare(r1, r2)==0); int pos_tail_sz = r1->get_positive_tail_size(); - for (int i=-1; iget_num_args(); - for (unsigned i=0; iget_arg(i))) { continue; } @@ -186,7 +186,7 @@ namespace datalog { static void collect_const_indexes(rule * r, info_vector & res) { collect_const_indexes(r->get_head(), -1, res); unsigned pos_tail_sz = r->get_positive_tail_size(); - for (unsigned i=0; iget_tail(i), i, res); } } @@ -195,7 +195,7 @@ namespace datalog { static void collect_orphan_consts(rule * r, const info_vector & const_infos, T & tgt) { unsigned const_cnt = const_infos.size(); tgt.reset(); - for (unsigned i=0; iget_arg(const_infos[i].arg_index())); if (vals[i]!=val) { @@ -242,7 +242,7 @@ namespace datalog { } } unsigned removed_cnt = 0; - for (unsigned i=0; i possible_parents(const_cnt); - for (unsigned i=1; iget_head()->get_num_args() - count_variable_arguments(r->get_head()); unsigned pos_tail_sz = r->get_positive_tail_size(); - for (unsigned i=0; iget_tail(i)->get_num_args() - count_variable_arguments(r->get_tail(i)); } return res; @@ -375,7 +375,7 @@ namespace datalog { ptr_vector new_tail; bool_vector new_negs; unsigned tail_sz = r->get_tail_size(); - for (unsigned i=0; iget_tail(i)); new_negs.push_back(r->is_neg_tail(i)); } @@ -400,7 +400,7 @@ namespace datalog { app * & mod_tail = (tail_idx==-1) ? new_head : new_tail[tail_idx]; ptr_vector mod_args(mod_tail->get_num_args(), mod_tail->get_args()); - for (; iadd_rule(m_result_rules.get(i)); } result->inherit_predicates(source); diff --git a/src/muz/rel/dl_mk_simple_joins.cpp b/src/muz/rel/dl_mk_simple_joins.cpp index 58cc083ce..de10c4f7f 100644 --- a/src/muz/rel/dl_mk_simple_joins.cpp +++ b/src/muz/rel/dl_mk_simple_joins.cpp @@ -297,7 +297,7 @@ namespace datalog { TRACE(dl, r->display(m_context, tout << "register ");); unsigned pos_tail_size = r->get_positive_tail_size(); - for (unsigned i = 0; i < pos_tail_size; i++) { + for (unsigned i = 0; i < pos_tail_size; ++i) { app* t = r->get_tail(i); if (!rule_content.contains(t)) rule_content.push_back(t); @@ -305,11 +305,11 @@ namespace datalog { m_modified_rules = true; } pos_tail_size = rule_content.size(); - for (unsigned i = 0; i+1 < pos_tail_size; i++) { + for (unsigned i = 0; i+1 < pos_tail_size; ++i) { app * t1 = rule_content[i]; var_idx_set t1_vars = rm.collect_vars(t1); counter.count_vars(t1, -1); //temporarily remove t1 variables from counter - for (unsigned j = i+1; j < pos_tail_size; j++) { + for (unsigned j = i+1; j < pos_tail_size; ++j) { app * t2 = rule_content[j]; SASSERT(t1 != t2); counter.count_vars(t2, -1); //temporarily remove t2 variables from counter @@ -416,18 +416,18 @@ namespace datalog { unsigned rt_sz = removed_tails.size(); //remove edges between removed tails - for (unsigned i = 0; i < rt_sz; i++) { - for (unsigned j = i+1; j < rt_sz; j++) { + for (unsigned i = 0; i < rt_sz; ++i) { + for (unsigned j = i+1; j < rt_sz; ++j) { app_pair pair_key = get_key(removed_tails[i], removed_tails[j]); remove_rule_from_pair(pair_key, r, original_len); } } //remove edges between surviving tails and removed tails - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { if (added_tails.contains(rule_content[i])) { continue; } - for (unsigned ri = 0; ri < rt_sz; ri++) { + for (unsigned ri = 0; ri < rt_sz; ++ri) { app_pair pair_key = get_key(rule_content[i], removed_tails[ri]); remove_rule_from_pair(pair_key, r, original_len); } @@ -445,10 +445,10 @@ namespace datalog { unsigned tail_size = r->get_tail_size(); unsigned pos_tail_size = r->get_positive_tail_size(); - for (unsigned i = pos_tail_size; i < tail_size; i++) { + for (unsigned i = pos_tail_size; i < tail_size; ++i) { counter.count_vars(r->get_tail(i), 1); } - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { counter.count_vars(rule_content[i], 1); } @@ -461,7 +461,7 @@ namespace datalog { var_idx_set a_tail_vars = rm.collect_vars(a_tail); counter.count_vars(a_tail, -1); //temporarily remove a_tail variables from counter - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { app * o_tail = rule_content[i]; //other tail if (added_tails.contains(o_tail)) { //this avoids adding edges between new tails twice @@ -507,7 +507,7 @@ namespace datalog { func_decl * t2_pred = t2->get_decl(); app_ref_vector removed_tails(m); app_ref_vector added_tails(m); - for (unsigned i1 = 0; i1 < len; i1++) { + for (unsigned i1 = 0; i1 < len; ++i1) { app * rt1 = rule_content[i1]; if (rt1->get_decl() != t1_pred) { continue; @@ -517,7 +517,7 @@ namespace datalog { var_idx_set t1_vars = rm.collect_vars(t1); unsigned i2start = (t1_pred == t2_pred) ? (i1+1) : 0; - for (unsigned i2 = i2start; i2 < len; i2++) { + for (unsigned i2 = i2start; i2 < len; ++i2) { app * rt2 = rule_content[i2]; if (i1 == i2 || rt2->get_decl() != t2_pred) { continue; @@ -636,7 +636,7 @@ namespace datalog { vi.populate(t1, t2); unsigned n = vi.size(); // remove contributions from joined columns. - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { unsigned arg_index1, arg_index2; vi.get(i, arg_index1, arg_index2); expr* arg = t1->get_arg(arg_index1); @@ -718,7 +718,7 @@ namespace datalog { ptr_vector tail(content); bool_vector negs(tail.size(), false); unsigned or_len = orig_r->get_tail_size(); - for (unsigned i = orig_r->get_positive_tail_size(); i < or_len; i++) { + for (unsigned i = orig_r->get_positive_tail_size(); i < or_len; ++i) { tail.push_back(orig_r->get_tail(i)); negs.push_back(orig_r->is_neg_tail(i)); } diff --git a/src/muz/rel/dl_product_relation.cpp b/src/muz/rel/dl_product_relation.cpp index 12776f818..7dd9056f6 100644 --- a/src/muz/rel/dl_product_relation.cpp +++ b/src/muz/rel/dl_product_relation.cpp @@ -118,7 +118,7 @@ namespace datalog { if(sz!=r2.size()) { return false; } - for(unsigned i=0; iget_kind(); spec_changed |= (m_spec[i] != rkind); m_spec[i] = rkind; @@ -1000,11 +1000,11 @@ namespace datalog { relation_vector new_rels; //the loop is quadratic with the number of relations, maybe we want to fix it - for(unsigned i=0; iget_kind()==ikind) { irel = m_relations[j]; m_relations[j] = 0; @@ -1037,7 +1037,7 @@ namespace datalog { unsigned sz = size(); bool found = false; unsigned candidate; - for(unsigned i=0; iget_arity(); - for(unsigned i=0;iadd_fact(acc); @@ -1262,7 +1262,7 @@ namespace datalog { bool should_remove(const table_fact & f) const override { table_element val=f[m_identical_cols[0]]; - for(unsigned i=1; iis_inner_col(cols1[i])) { @@ -376,7 +376,7 @@ namespace datalog { const sieve_relation & r = static_cast(r0); unsigned_vector inner_removed_cols; - for(unsigned i=0; iis_inner_col(r_cols[i]); diff --git a/src/muz/rel/dl_sparse_table.cpp b/src/muz/rel/dl_sparse_table.cpp index ecc18dbd6..30de4cd1f 100644 --- a/src/muz/rel/dl_sparse_table.cpp +++ b/src/muz/rel/dl_sparse_table.cpp @@ -127,7 +127,7 @@ namespace datalog { unsigned ofs = 0; unsigned sig_sz = sig.size(); unsigned first_functional = sig_sz-m_functional_col_cnt; - for (unsigned i=0; i0); @@ -331,7 +331,7 @@ namespace datalog { bool key_modified = true; for (; ofs!=after_last; ofs+=t.m_fact_size) { - for (unsigned i=0; im_data.get_reserve_ptr(); unsigned res_i = 0; - for (unsigned i=0; isize(); i++) { + for (unsigned i = 0; i < r->size(); ++i) { if (lem.get_lemma()->get_expr() == r->form(i)) { found = true; keep.push_back(lem); diff --git a/src/muz/spacer/spacer_context.cpp b/src/muz/spacer/spacer_context.cpp index 2c91e1796..fff256806 100644 --- a/src/muz/spacer/spacer_context.cpp +++ b/src/muz/spacer/spacer_context.cpp @@ -654,7 +654,7 @@ void lemma::add_binding(app_ref_vector const &binding) { TRACE(spacer, tout << "new binding: "; - for (unsigned i = 0; i < binding.size(); i++) + for (unsigned i = 0; i < binding.size(); ++i) tout << mk_pp(binding.get(i), m) << " "; tout << "\n";); } @@ -906,7 +906,7 @@ const datalog::rule *pred_transformer::find_rule(model &model, num_reuse_reach = 0; reach_pred_used.reset(); unsigned tail_sz = r->get_uninterpreted_tail_size(); - for (unsigned i = 0; i < tail_sz; i++) { + for (unsigned i = 0; i < tail_sz; ++i) { bool used = false; func_decl* d = r->get_tail(i)->get_decl(); const pred_transformer &pt = ctx.get_pred_transformer(d); @@ -935,7 +935,7 @@ void pred_transformer::find_predecessors(datalog::rule const& r, ptr_vectorget_decl()); } } @@ -1009,7 +1009,7 @@ void pred_transformer::add_lemma_from_child (pred_transformer& child, ground_expr(to_quantifier(l)->get_expr(), grnd_lemma, tmp); inst.push_back(grnd_lemma); } - for (unsigned j=0; j < inst.size(); j++) { + for (unsigned j=0; j < inst.size(); ++j) { inst.set(j, m.mk_implies(a, inst.get(j))); } if (lemma->is_ground() || (get_context().use_qlemmas() && !ground_only)) { @@ -1256,7 +1256,7 @@ void pred_transformer::get_pred_bg_invs(expr_ref_vector& out) { datalog::rule const &r = kv.m_value->rule(); find_predecessors (r, preds); - for (unsigned i = 0, preds_sz = preds.size(); i < preds_sz; i++) { + for (unsigned i = 0, preds_sz = preds.size(); i < preds_sz; ++i) { func_decl* pre = preds[i]; pred_transformer &pt = ctx.get_pred_transformer(pre); const lemma_ref_vector &invs = pt.get_bg_invs(); @@ -1389,7 +1389,7 @@ lbool pred_transformer::is_reachable(pob& n, expr_ref_vector* core, datalog::rule const* r = &kv.m_value->rule(); find_predecessors(*r, m_predicates); if (m_predicates.empty()) {continue;} - for (unsigned i = 0; i < m_predicates.size(); i++) { + for (unsigned i = 0; i < m_predicates.size(); ++i) { const pred_transformer &pt = ctx.get_pred_transformer(m_predicates[i]); if (pt.has_rfs()) { @@ -1578,7 +1578,7 @@ void pred_transformer::mk_assumptions(func_decl* head, expr* fml, expr* tag = kv.m_value->tag(); datalog::rule const& r = kv.m_value->rule(); find_predecessors(r, m_predicates); - for (unsigned i = 0; i < m_predicates.size(); i++) { + for (unsigned i = 0; i < m_predicates.size(); ++i) { func_decl* d = m_predicates[i]; if (d == head) { tmp1 = m.mk_implies(tag, fml); @@ -1767,7 +1767,7 @@ void pred_transformer::init_atom(decl2rel const &pts, app *atom, unsigned arity = atom->get_num_args(); func_decl* head = atom->get_decl(); pred_transformer& pt = *pts.find(head); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { app_ref rep(m); if (tail_idx == UINT_MAX) { @@ -2840,7 +2840,7 @@ unsigned context::get_cex_depth() pts.push_back (nullptr); // cex depth marker // bfs traversal of the query derivation tree - for (unsigned curr = 0; curr < pts.size (); curr++) { + for (unsigned curr = 0; curr < pts.size (); ++curr) { // get current pt and fact pt = pts.get (curr); // check for depth marker @@ -2859,7 +2859,7 @@ unsigned context::get_cex_depth() // add child facts and pts facts.append (fact->get_justifications ()); pt->find_predecessors (*r, preds); - for (unsigned j = 0; j < preds.size (); j++) { + for (unsigned j = 0; j < preds.size (); ++j) { pts.push_back (&(get_pred_transformer (preds[j]))); } } @@ -2915,7 +2915,7 @@ void context::get_rules_along_trace(datalog::rule_ref_vector& rules) pts.push_back (&(get_pred_transformer (preds[0]))); // populate rules according to a preorder traversal of the query derivation tree - for (unsigned curr = 0; curr < pts.size (); curr++) { + for (unsigned curr = 0; curr < pts.size (); ++curr) { // get current pt and fact pt = pts.get (curr); fact = facts.get (curr); @@ -2928,7 +2928,7 @@ void context::get_rules_along_trace(datalog::rule_ref_vector& rules) // add child facts and pts facts.append (fact->get_justifications ()); pt->find_predecessors (*r, preds); - for (unsigned j = 0; j < preds.size (); j++) { + for (unsigned j = 0; j < preds.size (); ++j) { pts.push_back (&(get_pred_transformer (preds[j]))); } } @@ -3063,7 +3063,7 @@ lbool context::solve_core (unsigned from_lvl) return l_false; } - for (unsigned i = 0; i < m_callbacks.size(); i++){ + for (unsigned i = 0; i < m_callbacks.size(); ++i){ if (m_callbacks[i]->unfold()) m_callbacks[i]->unfold_eh(); } @@ -3398,7 +3398,7 @@ bool context::is_reachable(pob &n) void context::predecessor_eh() { - for (unsigned i = 0; i < m_callbacks.size(); i++) { + for (unsigned i = 0; i < m_callbacks.size(); ++i) { if (m_callbacks[i]->predecessor()) m_callbacks[i]->predecessor_eh(); } @@ -3419,7 +3419,7 @@ bool pred_transformer::mk_mdl_rf_consistent(const datalog::rule *r, SASSERT(r != nullptr); ptr_vector preds; find_predecessors(*r, preds); - for (unsigned i = 0; i < preds.size(); i++) { + for (unsigned i = 0; i < preds.size(); ++i) { func_decl *pred = preds[i]; bool atleast_one_true = false; pred_transformer &ch_pt = ctx.get_pred_transformer(pred); @@ -3871,7 +3871,7 @@ bool context::propagate(unsigned min_prop_lvl, log_propagate(); - for (unsigned lvl = min_prop_lvl; lvl <= full_prop_lvl; lvl++) { + for (unsigned lvl = min_prop_lvl; lvl <= full_prop_lvl; ++lvl) { IF_VERBOSE (1, if (lvl > max_prop_lvl && lvl == max_prop_lvl + 1) verbose_stream () << " ! "; @@ -3932,7 +3932,7 @@ reach_fact *pred_transformer::mk_rf(pob& n, model &mdl, const datalog::rule& r) path_cons.push_back (get_transition (r)); app_ref_vector vars (m); - for (unsigned i = 0; i < preds.size (); i++) { + for (unsigned i = 0; i < preds.size (); ++i) { func_decl* pred = preds[i]; pred_transformer& ch_pt = ctx.get_pred_transformer (pred); // get a reach fact of body preds used in the model @@ -3942,7 +3942,7 @@ reach_fact *pred_transformer::mk_rf(pob& n, model &mdl, const datalog::rule& r) pm.formula_n2o (kid->get (), o_ch_reach, i); path_cons.push_back (o_ch_reach); // collect o-vars to eliminate - for (unsigned j = 0; j < pred->get_arity (); j++) + for (unsigned j = 0; j < pred->get_arity (); ++j) { vars.push_back(m.mk_const(pm.o2o(ch_pt.sig(j), 0, i))); } const ptr_vector &v = kid->aux_vars (); @@ -4285,7 +4285,7 @@ void context::add_constraint (expr *c, unsigned level) void context::new_lemma_eh(pred_transformer &pt, lemma *lem) { bool handle=false; - for (unsigned i = 0; i < m_callbacks.size(); i++) { + for (unsigned i = 0; i < m_callbacks.size(); ++i) { handle|=m_callbacks[i]->new_lemma(); } if (!handle) @@ -4298,7 +4298,7 @@ void context::new_lemma_eh(pred_transformer &pt, lemma *lem) { } expr *app = m.mk_app(pt.head(), pt.sig_size(), args.data()); expr *lemma = m.mk_implies(app, lem->get_expr()); - for (unsigned i = 0; i < m_callbacks.size(); i++) { + for (unsigned i = 0; i < m_callbacks.size(); ++i) { if (m_callbacks[i]->new_lemma()) m_callbacks[i]->new_lemma_eh(lemma, lem->level()); } diff --git a/src/muz/spacer/spacer_convex_closure.cpp b/src/muz/spacer/spacer_convex_closure.cpp index 88a592162..8fc4d3bd8 100644 --- a/src/muz/spacer/spacer_convex_closure.cpp +++ b/src/muz/spacer/spacer_convex_closure.cpp @@ -25,15 +25,15 @@ namespace { #ifdef Z3DEBUG bool is_int_matrix(const spacer::spacer_matrix &matrix) { - for (unsigned i = 0, rows = matrix.num_rows(); i < rows; i++) - for (unsigned j = 0, cols = matrix.num_cols(); j < cols; j++) + for (unsigned i = 0, rows = matrix.num_rows(); i < rows; ++i) + for (unsigned j = 0, cols = matrix.num_cols(); j < cols; ++j) if (!matrix.get(i, j).is_int()) return false; return true; } bool is_sorted(const vector &data) { - for (unsigned i = 0; i < data.size() - 1; i++) + for (unsigned i = 0; i < data.size() - 1; ++i) if (!(data[i] >= data[i + 1])) return false; return true; @@ -201,7 +201,7 @@ void convex_closure::cc_col2eq(unsigned col, expr_ref_vector &out) { SASSERT(!has_bv()); expr_ref_buffer sum(m); - for (unsigned row = 0, sz = m_data.num_rows(); row < sz; row++) { + for (unsigned row = 0, sz = m_data.num_rows(); row < sz; ++row) { expr_ref alpha(m); auto n = m_data.get(row, col); if (n.is_zero()) { @@ -229,7 +229,7 @@ void convex_closure::cc2fmls(expr_ref_vector &out) { sort_ref real_sort(m_arith.mk_real(), m); expr_ref zero(m_arith.mk_real(rational::zero()), m); - for (unsigned row = 0, sz = m_data.num_rows(); row < sz; row++) { + for (unsigned row = 0, sz = m_data.num_rows(); row < sz; ++row) { if (row >= m_alphas.size()) { m_alphas.push_back(m.mk_fresh_const("a!cc", real_sort)); } @@ -238,7 +238,7 @@ void convex_closure::cc2fmls(expr_ref_vector &out) { out.push_back(m_arith.mk_ge(m_alphas.get(row), zero)); } - for (unsigned k = 0, sz = m_col_vars.size(); k < sz; k++) { + for (unsigned k = 0, sz = m_col_vars.size(); k < sz; ++k) { if (m_col_vars.get(k) && !m_dead_cols[k]) cc_col2eq(k, out); } @@ -276,7 +276,7 @@ bool convex_closure::infer_div_pred(const vector &data, rational &m, rational bnd(MAX_DIV_BOUND); rational big = data.back(); // AG: why (m < big)? Note that 'big' is the smallest element of data - for (; m < big && m < bnd; m++) { + for (; m < big && m < bnd; ++m) { if (is_congruent_mod(data, m)) break; } if (m >= big) return false; @@ -362,7 +362,7 @@ void convex_closure::cc_1dim(const expr_ref &var, expr_ref_vector &out) { // -- compute divisibility constraints rational cr, off; // add div constraints for all variables. - for (unsigned j = 0; j < m_data.num_cols(); j++) { + for (unsigned j = 0; j < m_data.num_cols(); ++j) { auto *v = m_col_vars.get(j); if (v && (m_arith.is_int(v) || m_bv.is_bv(v))) { data.reset(); diff --git a/src/muz/spacer/spacer_expand_bnd_generalizer.cpp b/src/muz/spacer/spacer_expand_bnd_generalizer.cpp index 6db50f3f1..dcd29edf7 100644 --- a/src/muz/spacer/spacer_expand_bnd_generalizer.cpp +++ b/src/muz/spacer/spacer_expand_bnd_generalizer.cpp @@ -118,7 +118,7 @@ void lemma_expand_bnd_generalizer::operator()(lemma_ref &lemma) { expr_ref lit(m), new_lit(m); rational bnd; // for every literal - for (unsigned i = 0, sz = cube.size(); i < sz; i++) { + for (unsigned i = 0, sz = cube.size(); i < sz; ++i) { lit = cube.get(i); if (m.is_true(lit)) continue; if (!is_arith_comp(lit, bnd, m)) continue; diff --git a/src/muz/spacer/spacer_global_generalizer.cpp b/src/muz/spacer/spacer_global_generalizer.cpp index 58ef0c4ca..0299b41b0 100644 --- a/src/muz/spacer/spacer_global_generalizer.cpp +++ b/src/muz/spacer/spacer_global_generalizer.cpp @@ -102,7 +102,7 @@ bool contains_bv(ast_manager &m, const substitution &sub, unsigned &sz) { std::pair v; expr_offset r; rational num; - for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; j++) { + for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; ++j) { sub.get_binding(j, v, r); if (m_bv.is_numeral(r.get_expr(), num, sz)) return true; } @@ -117,7 +117,7 @@ bool all_same_sz(ast_manager &m, const substitution &sub, unsigned sz) { expr_offset r; rational num; unsigned n_sz; - for (unsigned j = 0; j < sub.get_num_bindings(); j++) { + for (unsigned j = 0; j < sub.get_num_bindings(); ++j) { sub.get_binding(j, v, r); if (!m_bv.is_numeral(r.get_expr(), num, n_sz) || n_sz != sz) return false; @@ -169,7 +169,7 @@ void lemma_global_generalizer::subsumer::mk_col_names(const lemma_cluster &lc) { const substitution &sub = lemmas.get(0).get_sub(); m_col_names.reserve(sub.get_num_bindings()); - for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; j++) { + for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; ++j) { sub.get_binding(j, v, r); auto *sort = r.get_expr()->get_sort(); auto i = v.first; @@ -211,7 +211,7 @@ void lemma_global_generalizer::subsumer::setup_cvx_closure( } unsigned i; - for (unsigned j = 0; j < n_vars; j++) { + for (unsigned j = 0; j < n_vars; ++j) { sub.get_binding(j, v, r); i = v.first; SASSERT(0 <= i && i < n_vars); @@ -238,7 +238,7 @@ void lemma_global_generalizer::subsumer::setup_cvx_closure( row.reserve(n_vars); const substitution &sub = lemma.get_sub(); - for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; j++) { + for (unsigned j = 0, sz = sub.get_num_bindings(); j < sz; ++j) { sub.get_binding(j, v, r); i = v.first; VERIFY(is_numeral(r.get_expr(), num)); @@ -276,7 +276,7 @@ void lemma_global_generalizer::subsumer::skolemize_for_quic3( expr_fast_mark2 marks; for (auto *c : f_cnsts) { marks.mark(c); } - for (unsigned i = 0, sz = m_col_names.size(); i < sz; i++) { + for (unsigned i = 0, sz = m_col_names.size(); i < sz; ++i) { app *c = m_col_names.get(i); if (!marks.is_marked(c)) continue; @@ -488,7 +488,7 @@ bool lemma_global_generalizer::subsumer::over_approximate(expr_ref_vector &a, expr_ref_buffer res(m); // remove all expressions whose tags are false - for (unsigned i = 0, sz = tags.size(); i < sz; i++) { + for (unsigned i = 0, sz = tags.size(); i < sz; ++i) { if (!m.is_not(tags.get(i))) { res.push_back(a.get(i)); } } a.reset(); diff --git a/src/muz/spacer/spacer_legacy_mbp.cpp b/src/muz/spacer/spacer_legacy_mbp.cpp index 067192cd5..f63f7e0ea 100644 --- a/src/muz/spacer/spacer_legacy_mbp.cpp +++ b/src/muz/spacer/spacer_legacy_mbp.cpp @@ -72,7 +72,7 @@ void qe_project(ast_manager& m, app_ref_vector& vars, expr_ref& fml, model_ref& proof_ref pr(m.mk_asserted(m.mk_true()), m); expr_ref bval(m); model::scoped_model_completion _scm(*M, true); - for (unsigned i = 0; i < vars.size(); i++) { + for (unsigned i = 0; i < vars.size(); ++i) { if (m.is_bool(vars.get(i))) { // obtain the interpretation of the ith var using model completion bval = (*M)(vars.get(i)); diff --git a/src/muz/spacer/spacer_legacy_mev.cpp b/src/muz/spacer/spacer_legacy_mev.cpp index 5d8bdb4ce..b9ff1efdb 100644 --- a/src/muz/spacer/spacer_legacy_mev.cpp +++ b/src/muz/spacer/spacer_legacy_mev.cpp @@ -63,7 +63,7 @@ void model_evaluator::setup_model(const model_ref& model) m_model = model.get(); rational r; unsigned sz = model->get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * d = model->get_constant(i); expr* val = model->get_const_interp(d); expr* e = m.mk_const(d); diff --git a/src/muz/spacer/spacer_matrix.cpp b/src/muz/spacer/spacer_matrix.cpp index 241db59db..3000aaeee 100644 --- a/src/muz/spacer/spacer_matrix.cpp +++ b/src/muz/spacer/spacer_matrix.cpp @@ -128,7 +128,7 @@ bool spacer_matrix::is_lin_reltd(unsigned i, unsigned j, rational &coeff1, coeff2 = m_matrix[1][i] - m_matrix[0][i]; off = (m_matrix[0][i] * m_matrix[1][j]) - (m_matrix[1][i] * m_matrix[0][j]); - for (unsigned k = 0; k < m_num_rows; k++) { + for (unsigned k = 0; k < m_num_rows; ++k) { if (((coeff1 * m_matrix[k][i]) + (coeff2 * m_matrix[k][j]) + off) != rational::zero()) { TRACE(cvx_dbg_verb, @@ -156,8 +156,8 @@ bool spacer_matrix::compute_linear_deps(spacer_matrix &eq) const { vector lin_dep; lin_dep.reserve(m_num_cols + 1); - for (unsigned i = 0; i < m_num_cols; i++) { - for (unsigned j = i + 1; j < m_num_cols; j++) { + for (unsigned i = 0; i < m_num_cols; ++i) { + for (unsigned j = i + 1; j < m_num_cols; ++j) { if (is_lin_reltd(i, j, coeff1, coeff2, off)) { SASSERT(!(coeff1 == 0 && coeff2 == 0 && off == 0)); lin_dep[i] = coeff1; diff --git a/src/muz/spacer/spacer_prop_solver.cpp b/src/muz/spacer/spacer_prop_solver.cpp index cf63f1aab..8c7ab167f 100644 --- a/src/muz/spacer/spacer_prop_solver.cpp +++ b/src/muz/spacer/spacer_prop_solver.cpp @@ -109,7 +109,7 @@ unsigned prop_solver::level_cnt() const void prop_solver::assert_level_atoms(unsigned level) { unsigned lev_cnt = level_cnt(); - for (unsigned i = 0; i < lev_cnt; i++) { + for (unsigned i = 0; i < lev_cnt; ++i) { bool active = m_delta_level ? i == level : i >= level; app * lev_atom = active ? m_neg_level_atoms.get(i) : m_pos_level_atoms.get(i); diff --git a/src/muz/spacer/spacer_qe_project.cpp b/src/muz/spacer/spacer_qe_project.cpp index 609703fb2..cc04fefe5 100644 --- a/src/muz/spacer/spacer_qe_project.cpp +++ b/src/muz/spacer/spacer_qe_project.cpp @@ -92,7 +92,7 @@ peq::peq(app *p, ast_manager &m) VERIFY(is_partial_eq(p)); SASSERT(m_arr_u.is_array(m_lhs) && m_arr_u.is_array(m_rhs) && ast_eq_proc()(m_lhs->get_sort(), m_rhs->get_sort())); - for (unsigned i = 2; i < p->get_num_args(); i++) { + for (unsigned i = 2; i < p->get_num_args(); ++i) { m_diff_indices.push_back(p->get_arg(i)); } } @@ -106,7 +106,7 @@ peq::peq(expr *lhs, expr *rhs, unsigned num_indices, expr *const *diff_indices, ptr_vector sorts; sorts.push_back(m_lhs->get_sort()); sorts.push_back(m_rhs->get_sort()); - for (unsigned i = 0; i < num_indices; i++) { + for (unsigned i = 0; i < num_indices; ++i) { sorts.push_back(diff_indices[i]->get_sort()); m_diff_indices.push_back(diff_indices[i]); } @@ -119,7 +119,7 @@ void peq::lhs(expr_ref &result) { result = m_lhs; } void peq::rhs(expr_ref &result) { result = m_rhs; } void peq::get_diff_indices(expr_ref_vector &result) { - for (unsigned i = 0; i < m_diff_indices.size(); i++) { + for (unsigned i = 0; i < m_diff_indices.size(); ++i) { result.push_back(m_diff_indices.get(i)); } } @@ -531,12 +531,12 @@ class arith_project_util { rational lcm_coeffs(1), lcm_divs(1); if (a.is_int(m_var->x())) { // lcm of (absolute values of) coeffs - for (unsigned i = 0; i < m_lits.size(); i++) { + for (unsigned i = 0; i < m_lits.size(); ++i) { lcm_coeffs = lcm(lcm_coeffs, abs(m_coeffs[i])); } // normalize coeffs of x to +/-lcm_coeffs and scale terms and divs // appropriately; find lcm of scaled-up divs - for (unsigned i = 0; i < m_lits.size(); i++) { + for (unsigned i = 0; i < m_lits.size(); ++i) { rational factor(lcm_coeffs / abs(m_coeffs[i])); if (!factor.is_one() && !a.is_zero(m_terms.get(i))) m_terms[i] = a.mk_mul(a.mk_numeral(factor, a.mk_int()), @@ -631,7 +631,7 @@ class arith_project_util { TRACE(qe, tout << "Substitution for (lcm_coeffs * x): " << mk_pp(x_term_val, m) << "\n";); } - for (unsigned i = 0; i < m_lits.size(); i++) { + for (unsigned i = 0; i < m_lits.size(); ++i) { if (!m_divs[i].is_zero()) { // m_divs[i] | (x_term_val + m_terms[i]) @@ -1031,7 +1031,7 @@ class arith_project_util { app *a = to_app(fml); expr_ref_vector children(m); expr_ref ch(m); - for (unsigned i = 0; i < a->get_num_args(); i++) { + for (unsigned i = 0; i < a->get_num_args(); ++i) { ch = a->get_arg(i); mod2div(ch, map); children.push_back(ch); @@ -1114,7 +1114,7 @@ class arith_project_util { void substitute(expr_ref &fml, app_ref_vector &lits, expr_map &map) { expr_substitution sub(m); // literals - for (unsigned i = 0; i < lits.size(); i++) { + for (unsigned i = 0; i < lits.size(); ++i) { expr *new_lit = nullptr; proof *pr = nullptr; app *old_lit = lits.get(i); @@ -1400,7 +1400,7 @@ class array_project_eqs_util { expr_ref val(m); unsigned num_diff = diff_val_consts.size(); SASSERT(num_diff == I.size()); - for (unsigned i = 0; i < num_diff; i++) { + for (unsigned i = 0; i < num_diff; ++i) { // mk val term ptr_vector sel_args; sel_args.push_back(arr); @@ -1458,7 +1458,7 @@ class array_project_eqs_util { if (!I.empty()) { expr_ref val(m); m_mev.eval(*M, idx, val); - for (unsigned i = 0; i < I.size() && !idx_in_I; i++) { + for (unsigned i = 0; i < I.size() && !idx_in_I; ++i) { if (idx == I.get(i)) { idx_in_I = true; } else { @@ -1525,7 +1525,7 @@ class array_project_eqs_util { tout << mk_pp(p_exp, m) << "\n"; for (unsigned i = m_aux_lits_v.size() - m_aux_vars.size(); i < m_aux_lits_v.size(); - i++) { tout << mk_pp(m_aux_lits_v.get(i), m) << "\n"; }); + ++i) { tout << mk_pp(m_aux_lits_v.get(i), m) << "\n"; }); // find subst_term bool stores_on_rhs = true; @@ -1553,10 +1553,10 @@ class array_project_eqs_util { TRACE( qe, tout << "array equalities:\n"; for (unsigned i = 0; i < eqs.size(); - i++) { tout << mk_pp(eqs.get(i), m) << "\n"; }); + ++i) { tout << mk_pp(eqs.get(i), m) << "\n"; }); // evaluate eqs in M - for (unsigned i = 0; i < eqs.size(); i++) { + for (unsigned i = 0; i < eqs.size(); ++i) { TRACE(qe, tout << "array equality:\n"; tout << mk_pp(eqs.get(i), m) << "\n";); @@ -1586,7 +1586,7 @@ class array_project_eqs_util { // ... unsigned num_true_eqs = true_eqs.size(); vector nds(num_true_eqs); - for (unsigned i = 0; i < num_true_eqs; i++) { + for (unsigned i = 0; i < num_true_eqs; ++i) { app *eq = true_eqs.get(i); expr *lhs = eq->get_arg(0); expr *rhs = eq->get_arg(1); @@ -1607,7 +1607,7 @@ class array_project_eqs_util { unsigned nd = 0; // nesting depth if (store) { for (nd = 1; m_arr_u.is_store(store); - nd++, store = to_app(store->get_arg(0))) + ++nd, store = to_app(store->get_arg(0))) /* empty */; SASSERT(store == m_v); } @@ -1618,7 +1618,7 @@ class array_project_eqs_util { // sort true_eqs according to nesting depth // use insertion sort - for (unsigned i = 1; i < num_true_eqs; i++) { + for (unsigned i = 1; i < num_true_eqs; ++i) { app_ref eq(m); eq = true_eqs.get(i); unsigned nd = nds.get(i); @@ -1635,7 +1635,7 @@ class array_project_eqs_util { } // search for subst term - for (unsigned i = 0; !m_subst_term_v && i < num_true_eqs; i++) { + for (unsigned i = 0; !m_subst_term_v && i < num_true_eqs; ++i) { app *eq = true_eqs.get(i); m_true_sub_v.insert(eq, m.mk_true()); // try to find subst term @@ -1681,7 +1681,7 @@ class array_project_eqs_util { app_ref_vector rem_arr_vars(m); // remaining arr vars M = &mdl; - for (unsigned i = 0; i < arr_vars.size(); i++) { + for (unsigned i = 0; i < arr_vars.size(); ++i) { reset_v(); m_v = arr_vars.get(i); if (!m_arr_u.is_array(m_v)) { @@ -1881,7 +1881,7 @@ class array_select_reducer { m_reduce_all_selects = reduce_all_selects; // mark vars to eliminate - for (unsigned i = 0; i < arr_vars.size(); i++) { + for (unsigned i = 0; i < arr_vars.size(); ++i) { m_arr_test.mark(arr_vars.get(i), true); } @@ -1990,7 +1990,7 @@ class array_project_selects_util { for (app *a : sel_terms) { vals.reset(); idxs.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr *idx = a->get_arg(i + 1); m_mev.eval(*M, idx, val); vals.push_back(val); @@ -1998,7 +1998,7 @@ class array_project_selects_util { } bool is_new = true; - for (unsigned j = start; j < m_idx_vals.size(); j++) { + for (unsigned j = start; j < m_idx_vals.size(); ++j) { if (m_idx_vals.get(j) == vals) { // idx belongs to the jth equivalence class; // substitute sel term with ith sel const @@ -2036,7 +2036,7 @@ class array_project_selects_util { (m_ari_u.is_real(idx_sort) || m_ari_u.is_int(idx_sort))) { // using insertion sort unsigned end = start + num_reprs; - for (unsigned i = start + 1; i < end; i++) { + for (unsigned i = start + 1; i < end; ++i) { auto repr = m_idx_reprs.get(i).get(0); auto val = m_idx_vals.get(i).get(0); unsigned j = i; @@ -2053,7 +2053,7 @@ class array_project_selects_util { m_idx_vals[j][0] = val; } - for (unsigned i = start; i < end - 1; i++) { + for (unsigned i = start; i < end - 1; ++i) { m_idx_lits.push_back(m_ari_u.mk_lt(m_idx_reprs[i].get(0), m_idx_reprs[i + 1].get(0))); } @@ -2101,7 +2101,7 @@ class array_project_selects_util { TRACE( qe, tout << "idx lits:\n"; for (unsigned i = 0; i < m_idx_lits.size(); - i++) { tout << mk_pp(m_idx_lits.get(i), m) << "\n"; }); + ++i) { tout << mk_pp(m_idx_lits.get(i), m) << "\n"; }); return true; } @@ -2117,12 +2117,12 @@ class array_project_selects_util { M = &mdl; // mark vars to eliminate - for (unsigned i = 0; i < arr_vars.size(); i++) { + for (unsigned i = 0; i < arr_vars.size(); ++i) { m_arr_test.mark(arr_vars.get(i), true); } // alloc empty map from array var to sel terms over it - for (unsigned i = 0; i < arr_vars.size(); i++) { + for (unsigned i = 0; i < arr_vars.size(); ++i) { ptr_vector *lst = alloc(ptr_vector); m_sel_terms.insert(arr_vars.get(i), lst); } @@ -2140,7 +2140,7 @@ class array_project_selects_util { // dealloc sel_map::iterator begin = m_sel_terms.begin(), end = m_sel_terms.end(); - for (sel_map::iterator it = begin; it != end; it++) { + for (sel_map::iterator it = begin; it != end; ++it) { dealloc(it->m_value); } m_sel_terms.reset(); diff --git a/src/muz/spacer/spacer_quant_generalizer.cpp b/src/muz/spacer/spacer_quant_generalizer.cpp index c3dde50aa..08aacc38e 100644 --- a/src/muz/spacer/spacer_quant_generalizer.cpp +++ b/src/muz/spacer/spacer_quant_generalizer.cpp @@ -165,7 +165,7 @@ void lemma_quantifier_generalizer::find_candidates(expr *e, expr_sparse_mark marked_args; // Make sure not to try and quantify already-quantified indices - for (unsigned idx=0, sz = indices.size(); idx < sz; idx++) { + for (unsigned idx=0, sz = indices.size(); idx < sz; ++idx) { // skip expressions that already contain a quantified variable if (has_zk_const(indices.get(idx))) { continue; @@ -638,7 +638,7 @@ bool lemma_quantifier_generalizer::find_stride(expr_ref_vector &cube, unsigned size = p_index->get_num_args(); unsigned matched = 0; - for (unsigned p = 0; p < size; p++) { + for (unsigned p = 0; p < size; ++p) { expr *arg = p_index->get_arg(p); if (is_var(arg)) { rational val; @@ -708,7 +708,7 @@ void lemma_quantifier_generalizer::operator()(lemma_ref &lemma) { m_offset = lemma->get_pob()->get_free_vars_size(); // for every literal, find a candidate term to abstract - for (unsigned i=0; i < m_cube.size(); i++) { + for (unsigned i=0; i < m_cube.size(); ++i) { expr *r = m_cube.get(i); // generate candidates for abstraction @@ -717,7 +717,7 @@ void lemma_quantifier_generalizer::operator()(lemma_ref &lemma) { if (candidates.empty()) continue; // for every candidate - for (unsigned arg=0, sz = candidates.size(); arg < sz; arg++) { + for (unsigned arg=0, sz = candidates.size(); arg < sz; ++arg) { if (generalize (lemma, candidates.get(arg))) { return; } diff --git a/src/muz/spacer/spacer_sat_answer.cpp b/src/muz/spacer/spacer_sat_answer.cpp index 81205ac3e..70f8d76f3 100644 --- a/src/muz/spacer/spacer_sat_answer.cpp +++ b/src/muz/spacer/spacer_sat_answer.cpp @@ -186,10 +186,10 @@ proof *ground_sat_answer_op::mk_proof_step(frame &fr) { premises.push_back(m.mk_asserted(rule_fml)); for (auto &k : fr.m_kids) {premises.push_back(m_cache.find(k));} - for (unsigned i = 0; i < premises.size(); i++) { + for (unsigned i = 0; i < premises.size(); ++i) { positions.push_back(std::make_pair(0,i)); } - for (unsigned i = 0; i <= premises.size(); i++) { + for (unsigned i = 0; i <= premises.size(); ++i) { substs.push_back(expr_ref_vector(m)); } m_pinned.push_back(m.mk_hyper_resolve(premises.size(), diff --git a/src/muz/transforms/dl_mk_array_eq_rewrite.cpp b/src/muz/transforms/dl_mk_array_eq_rewrite.cpp index afa44437e..177292bd2 100644 --- a/src/muz/transforms/dl_mk_array_eq_rewrite.cpp +++ b/src/muz/transforms/dl_mk_array_eq_rewrite.cpp @@ -57,12 +57,12 @@ namespace datalog { expr_ref_vector new_tail(m); unsigned nb_predicates = r.get_uninterpreted_tail_size(); unsigned tail_size = r.get_tail_size(); - for (unsigned i = 0; i < nb_predicates; i++) { + for (unsigned i = 0; i < nb_predicates; ++i) { new_tail.push_back(r.get_tail(i)); } expr_equiv_class array_eq_classes(m); - for(unsigned i = nb_predicates; i < tail_size; i++) { + for(unsigned i = nb_predicates; i < tail_size; ++i) { expr* cond = r.get_tail(i); expr* e1, *e2; if (m.is_eq(cond, e1, e2) && m_a.is_array(e1->get_sort())) { @@ -82,7 +82,7 @@ namespace datalog { } } for (expr * v : c_eq) { - for (unsigned i = 0; i < new_tail.size(); i++) + for (unsigned i = 0; i < new_tail.size(); ++i) new_tail[i] = replace(new_tail[i].get(), representative, v); } for (expr * v : c_eq) { diff --git a/src/muz/transforms/dl_mk_array_instantiation.cpp b/src/muz/transforms/dl_mk_array_instantiation.cpp index df923334d..7cdbf1bfb 100644 --- a/src/muz/transforms/dl_mk_array_instantiation.cpp +++ b/src/muz/transforms/dl_mk_array_instantiation.cpp @@ -53,7 +53,7 @@ namespace datalog { dst = result.get(); unsigned nbrules = source.get_num_rules(); src_manager = &source.get_rule_manager(); - for(unsigned i = 0; i < nbrules; i++) { + for(unsigned i = 0; i < nbrules; ++i) { rule & r = *source.get_rule(i); instantiate_rule(r, *result); } @@ -77,20 +77,20 @@ namespace datalog { expr_ref new_head = create_head(to_app(r.get_head())); unsigned nb_predicates = r.get_uninterpreted_tail_size(); unsigned tail_size = r.get_tail_size(); - for(unsigned i=0;iget_num_args();i++) { + for(unsigned i=0;iget_num_args();++i) { expr*arg = old_head->get_arg(i); if(m_a.is_array(arg->get_sort())) { - for(unsigned k=0; k< m_ctx.get_params().xform_instantiate_arrays_nb_quantifier();k++) { + for(unsigned k=0; k< m_ctx.get_params().xform_instantiate_arrays_nb_quantifier();++k) { expr_ref_vector dummy_args(m); dummy_args.push_back(arg); - for(unsigned i=0;iget_sort());i++) { + for(unsigned i=0;iget_sort());++i) { dummy_args.push_back(m.mk_var(cnt, get_array_domain(arg->get_sort(), i))); cnt++; } @@ -139,7 +139,7 @@ namespace datalog { app*f=to_app(e); //Call the function recursively on all arguments unsigned nbargs = f->get_num_args(); - for(unsigned i=0;iget_arg(i)); } //If it is a select, then add it to selects @@ -161,10 +161,10 @@ namespace datalog { expr_ref_vector mk_array_instantiation::getId(app*old_pred, const expr_ref_vector& n_args) { expr_ref_vector res(m); - for(unsigned i=0;iget_num_args();j++) { + for(unsigned j=1;jget_num_args();++j) { res.push_back(select->get_arg(j)); } } @@ -177,13 +177,13 @@ namespace datalog { expr_ref_vector new_args(m); new_args.append(n_args); new_args.append(getId(old_pred, n_args)); - for(unsigned i=0;iget_sort()); expr_ref res(m); func_decl_ref fun_decl(m); @@ -213,7 +213,7 @@ namespace datalog { expr_ref res(m); expr_ref_vector args(m); args.push_back(array); - for(unsigned i=1; iget_num_args();i++) { + for(unsigned i=1; iget_num_args();++i) { args.push_back(s->get_arg(i)); } res = m_a.mk_select(args.size(), args.data()); @@ -227,14 +227,14 @@ namespace datalog { it != eq_classes.end(array); ++it) { selects.insert_if_not_there(*it, ptr_vector()); ptr_vector& select_ops = selects[*it]; - for(unsigned i=0;iget_sort());i++) { + for(unsigned i=0;iget_sort());++i) { dummy_args.push_back(m.mk_var(cnt, get_array_domain(array->get_sort(), i))); cnt++; } @@ -249,7 +249,7 @@ namespace datalog { unsigned nb_old_args=old_pred->get_num_args(); //Stores, for each old position, the list of a new possible arguments vector arg_correspondance; - for(unsigned i=0;iget_arg(i), m); if(m_a.is_array(arg->get_sort())) { vector arg_possibilities(m_ctx.get_params().xform_instantiate_arrays_nb_quantifier(), retrieve_all_selects(arg)); @@ -273,7 +273,7 @@ namespace datalog { svector chosen(arg_correspondance.size(), 0u); while(true) { expr_ref_vector new_args(m); - for(unsigned i=0;iget_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * arg = pred->get_arg(i); if (m.is_value(arg)) return true; @@ -108,7 +108,7 @@ namespace datalog { bool_vector new_is_negated; unsigned sz = r->get_tail_size(); bool rule_modified = false; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { app * tail = r->get_tail(i); if (is_candidate(tail) && !r->is_neg_tail(i)) { TRACE(mk_filter_rules, tout << "is_candidate: " << mk_pp(tail, m) << "\n";); @@ -117,7 +117,7 @@ namespace datalog { ptr_buffer new_args; var_idx_set used_vars; unsigned num_args = tail->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = tail->get_arg(i); if (is_var(arg)) { unsigned vidx = to_var(arg)->get_idx(); @@ -155,7 +155,7 @@ namespace datalog { m_result = alloc(rule_set, m_context); m_modified = false; unsigned num_rules = source.get_num_rules(); - for (unsigned i = 0; i < num_rules; i++) { + for (unsigned i = 0; i < num_rules; ++i) { process(source.get_rule(i)); } if(!m_modified) { diff --git a/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp b/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp index bf7f75451..5cf893f9c 100644 --- a/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp +++ b/src/muz/transforms/dl_mk_interp_tail_simplifier.cpp @@ -75,7 +75,7 @@ namespace datalog { m_neg.reset(); unsigned tail_len = m_rule->get_tail_size(); - for (unsigned i=0; iget_tail(i), new_tail_el); m_tail.push_back(new_tail_el); @@ -142,7 +142,7 @@ namespace datalog { unsigned neg_comparison = 0; - for (unsigned i=0; iget_arg(i); expr * arg_b = b->get_arg(i); @@ -408,7 +408,7 @@ namespace datalog { m_todo.reset(); m_leqs.reset(); - for (unsigned i = u_len; i < len; i++) { + for (unsigned i = u_len; i < len; ++i) { m_todo.push_back(r->get_tail(i)); SASSERT(!r->is_neg_tail(i)); } @@ -510,7 +510,7 @@ namespace datalog { m_tail.reset(); m_tail_neg.reset(); - for (unsigned i=0; iget_tail(i)); m_tail_neg.push_back(r->is_neg_tail(i)); } @@ -525,7 +525,7 @@ namespace datalog { } else { m_itail_members.reset(); - for (unsigned i=u_len; iget_tail(i)); SASSERT(!r->is_neg_tail(i)); } diff --git a/src/muz/transforms/dl_mk_magic_sets.cpp b/src/muz/transforms/dl_mk_magic_sets.cpp index f5d9d92ca..395aa0d69 100644 --- a/src/muz/transforms/dl_mk_magic_sets.cpp +++ b/src/muz/transforms/dl_mk_magic_sets.cpp @@ -45,7 +45,7 @@ namespace datalog { void mk_magic_sets::adornment::populate(app * lit, const var_idx_set & bound_vars) { SASSERT(empty()); unsigned arity = lit->get_num_args(); - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { const expr * arg = lit->get_arg(i); bool bound = !is_var(arg) || bound_vars.contains(to_var(arg)->get_idx()); push_back(bound ? AD_BOUND : AD_FREE); @@ -65,7 +65,7 @@ namespace datalog { unsigned get_bound_arg_count(app * lit, const var_idx_set & bound_vars) { unsigned res = 0; unsigned n = lit->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { const expr * arg = lit->get_arg(i); if (!is_var(arg) || bound_vars.contains(to_var(arg)->get_idx())) { SASSERT(is_var(arg) || is_app(arg)); @@ -80,7 +80,7 @@ namespace datalog { func_decl * pred = lit->get_decl(); float res = 1; unsigned n = lit->get_num_args(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { const expr * arg = lit->get_arg(i); if (is_var(arg) && !bound_vars.contains(to_var(arg)->get_idx())) { res *= m_context.get_sort_size_estimate(pred->get_domain(i)); @@ -100,7 +100,7 @@ namespace datalog { float best_cost; int candidate_index = -1; unsigned n = cont.size(); - for (unsigned i=0; iget_tail(cont[i]); unsigned bound_cnt = get_bound_arg_count(lit, bound_vars); if (bound_cnt==0) { @@ -153,7 +153,7 @@ namespace datalog { unsigned l_arity = l->get_num_args(); ptr_vector bound_args; - for (unsigned i=0; iget_arg(i)); } @@ -164,7 +164,7 @@ namespace datalog { unsigned mag_arity = bound_args.size(); ptr_vector mag_domain; - for (unsigned i=0; iget_domain(i)); } @@ -189,7 +189,7 @@ namespace datalog { negations.push_back(false); negations.append(tail_cnt, negated); - for (unsigned i=0; iget_decl())) { continue; } @@ -206,7 +206,7 @@ namespace datalog { SASSERT(head_len==head_adornment.size()); var_idx_set bound_vars; - for (unsigned i=0; iget_arg(i); if (head_adornment[i]==AD_BOUND && is_var(arg)) { bound_vars.insert(to_var(arg)->get_idx()); @@ -216,7 +216,7 @@ namespace datalog { unsigned processed_tail_len = r->get_uninterpreted_tail_size(); unsigned_vector exten_tails; unsigned_vector inten_tails; - for (unsigned i=0; iget_tail(i); if (m_extentional.contains(t->get_decl())) { exten_tails.push_back(i); @@ -268,7 +268,7 @@ namespace datalog { create_magic_rules(new_head, new_tail.size(), new_tail.data(), negations.data(), result); unsigned tail_len = r->get_tail_size(); - for (unsigned i=processed_tail_len; iget_tail(i)); negations.push_back(r->is_neg_tail(i)); } @@ -287,7 +287,7 @@ namespace datalog { SASSERT(arity == d.m_pred->get_arity()); ptr_vector args; - for (unsigned i=0; iget_domain(i))); } @@ -314,7 +314,7 @@ namespace datalog { unsigned init_rule_cnt = source.get_num_rules(); { func_decl_set intentional; - for (unsigned i=0; iget_decl(); intentional.insert(pred); } diff --git a/src/muz/transforms/dl_mk_rule_inliner.cpp b/src/muz/transforms/dl_mk_rule_inliner.cpp index 382ab5517..c50e6f8d7 100644 --- a/src/muz/transforms/dl_mk_rule_inliner.cpp +++ b/src/muz/transforms/dl_mk_rule_inliner.cpp @@ -98,7 +98,7 @@ namespace datalog { rule const& r, bool is_tgt, unsigned skipped_index, app_ref_vector& res, bool_vector& res_neg) { unsigned rule_len = r.get_tail_size(); - for (unsigned i = 0; i < rule_len; i++) { + for (unsigned i = 0; i < rule_len; ++i) { if (i != skipped_index) { //i can never be UINT_MAX, so we'll never skip if we're not supposed to app_ref new_tail_el(m); apply(r.get_tail(i), is_tgt, new_tail_el); @@ -224,7 +224,7 @@ namespace datalog { } unsigned ut_len = r->get_uninterpreted_tail_size(); - for (unsigned i=0; iget_decl(i); m_tail_pred_ctr.inc(pred); @@ -350,7 +350,7 @@ namespace datalog { unsigned rule_cnt = orig.get_num_rules(); - for (unsigned ri=0; riget_decl(); diff --git a/src/muz/transforms/dl_mk_subsumption_checker.cpp b/src/muz/transforms/dl_mk_subsumption_checker.cpp index 106358e6f..135969426 100644 --- a/src/muz/transforms/dl_mk_subsumption_checker.cpp +++ b/src/muz/transforms/dl_mk_subsumption_checker.cpp @@ -49,7 +49,7 @@ namespace datalog { return false; } - for (unsigned i = 0; i < pt_len; i++) { + for (unsigned i = 0; i < pt_len; ++i) { func_decl * tail_pred = r->get_tail(i)->get_decl(); if (!m_total_relations.contains(tail_pred)) { // this rule has a non-total predicate in the tail @@ -58,7 +58,7 @@ namespace datalog { } unsigned t_len = r->get_positive_tail_size(); - for(unsigned i = pt_len; i < t_len; i++) { + for(unsigned i = pt_len; i < t_len; ++i) { SASSERT(!r->is_neg_tail(i)); //we assume interpreted tail not to be negated if (!m.is_true(r->get_tail(i))) { //this rule has an interpreted tail which is not constant true @@ -69,7 +69,7 @@ namespace datalog { var_idx_set head_vars; app * head = r->get_head(); unsigned arity = head->get_num_args(); - for(unsigned i=0; iget_arg(i); if(!is_var(arg)) { return false; } unsigned idx = to_var(arg)->get_idx(); @@ -127,7 +127,7 @@ namespace datalog { app_ref_vector tail(m); bool_vector tail_neg; - for(unsigned i=0; iget_tail(i); bool neg = r->is_neg_tail(i); if(m_total_relations.contains(tail_atom->get_decl()) @@ -158,7 +158,7 @@ namespace datalog { } //we just copy the interpreted part of the tail - for(unsigned i=u_len; iget_tail(i)); tail_neg.push_back(r->is_neg_tail(i)); } @@ -273,7 +273,7 @@ namespace datalog { if (arity > 30) { continue; } //for now we only check booleans domains - for(unsigned i=0; iget_domain(i))) { goto next_pred; } @@ -316,7 +316,7 @@ namespace datalog { app * head = r->get_head(); unsigned arity = pred->get_arity(); - for(unsigned i=0; iget_arg(i); if(!is_app(arg)) { goto next_rule; diff --git a/src/muz/transforms/dl_mk_unbound_compressor.cpp b/src/muz/transforms/dl_mk_unbound_compressor.cpp index 2173ad457..15b619ff8 100644 --- a/src/muz/transforms/dl_mk_unbound_compressor.cpp +++ b/src/muz/transforms/dl_mk_unbound_compressor.cpp @@ -62,7 +62,7 @@ namespace datalog { symbol const& parent_name = pred->get_name(); unsigned arity = parent_arity-1; ptr_vector domain; - for (unsigned i = 0; i < parent_arity; i++) { + for (unsigned i = 0; i < parent_arity; ++i) { if (i != arg_index) { domain.push_back(parent_domain[i]); } @@ -97,7 +97,7 @@ namespace datalog { rm.get_counter().reset(); rm.get_counter().count_vars(head, 1); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { expr * arg = head->get_arg(i); unsigned var_idx; if (is_var(arg, var_idx) && @@ -128,7 +128,7 @@ namespace datalog { rm.get_counter().count_vars(head); unsigned arg_index; - for (arg_index = 0; arg_index < head_arity; arg_index++) { + for (arg_index = 0; arg_index < head_arity; ++arg_index) { expr * arg = head->get_arg(arg_index); unsigned var_idx; if (is_var(arg, var_idx) && @@ -148,7 +148,7 @@ namespace datalog { SASSERT(m_in_progress.contains(ci)); func_decl * cpred = m_map.find(ci); ptr_vector cargs; - for (unsigned i=0; i < head_arity; i++) { + for (unsigned i=0; i < head_arity; ++i) { if (i != arg_index) { cargs.push_back(head->get_arg(i)); } @@ -197,7 +197,7 @@ namespace datalog { func_decl * dtail_pred = m_map.find(ci); ptr_vector dtail_args; unsigned orig_dtail_arity = orig_dtail->get_num_args(); - for (unsigned i = 0; i < orig_dtail_arity; i++) { + for (unsigned i = 0; i < orig_dtail_arity; ++i) { if (i != arg_index) { dtail_args.push_back(orig_dtail->get_arg(i)); } @@ -208,7 +208,7 @@ namespace datalog { bool_vector tails_negated; app_ref_vector tails(m); unsigned tail_len = r->get_tail_size(); - for (unsigned i = 0; i < tail_len; i++) { + for (unsigned i = 0; i < tail_len; ++i) { tails_negated.push_back(r->is_neg_tail(i)); if (i == tail_index && !r->is_neg_tail(i)) { tails.push_back(dtail); @@ -355,13 +355,13 @@ namespace datalog { unsigned init_rule_cnt = source.get_num_rules(); - for (unsigned i = 0; i < init_rule_cnt; i++) { + for (unsigned i = 0; i < init_rule_cnt; ++i) { rule * r = source.get_rule(i); m_rules.push_back(r); m_head_occurrence_ctr.inc(r->get_decl()); } - for (unsigned i = 0; i < init_rule_cnt; i++) { + for (unsigned i = 0; i < init_rule_cnt; ++i) { detect_tasks(source, i); } diff --git a/src/nlsat/nlsat_clause.cpp b/src/nlsat/nlsat_clause.cpp index 268086c24..9543c4497 100644 --- a/src/nlsat/nlsat_clause.cpp +++ b/src/nlsat/nlsat_clause.cpp @@ -30,20 +30,20 @@ namespace nlsat { m_marked(false), m_var_hash(0), m_assumptions(as) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_lits[i] = lits[i]; } } bool clause::contains(literal l) const { - for (unsigned i = 0; i < m_size; i++) + for (unsigned i = 0; i < m_size; ++i) if (m_lits[i] == l) return true; return false; } bool clause::contains(bool_var v) const { - for (unsigned i = 0; i < m_size; i++) + for (unsigned i = 0; i < m_size; ++i) if (m_lits[i].var() == v) return true; return false; diff --git a/src/nlsat/nlsat_evaluator.cpp b/src/nlsat/nlsat_evaluator.cpp index e8a40b42d..652075416 100644 --- a/src/nlsat/nlsat_evaluator.cpp +++ b/src/nlsat/nlsat_evaluator.cpp @@ -64,7 +64,7 @@ namespace nlsat { void reset() { unsigned sz = m_sections.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m_am.del(m_sections[i].m_root); m_sections.reset(); m_sorted_sections.reset(); @@ -159,7 +159,7 @@ namespace nlsat { // Must normalize signs since we use arithmetic operations such as * // during evaluation. // Without normalization, overflows may happen, and wrong results may be produced. - for (unsigned i = 0; i < num_poly_signs; i++) + for (unsigned i = 0; i < num_poly_signs; ++i) m_poly_signs.push_back(signs[i]); m_poly_sections.append(p_section_ids); m_info.push_back(poly_info(roots.size(), first_section, first_sign)); @@ -236,7 +236,7 @@ namespace nlsat { unsigned num_roots = pinfo.m_num_roots; if (num_roots < LINEAR_SEARCH_THRESHOLD) { unsigned i = 0; - for (; i < num_roots; i++) { + for (; i < num_roots; ++i) { unsigned section_cell_id = cell_id(pinfo, i); if (section_cell_id == c) return sign_zero; @@ -288,13 +288,13 @@ namespace nlsat { bool check_invariant() const { #ifdef Z3DEBUG SASSERT(m_sections.size() == m_sorted_sections.size()); - for (unsigned i = 0; i < m_sorted_sections.size(); i++) { + for (unsigned i = 0; i < m_sorted_sections.size(); ++i) { SASSERT(m_sorted_sections[i] < m_sections.size()); SASSERT(m_sections[m_sorted_sections[i]].m_pos == i); } unsigned total_num_sections = 0; unsigned total_num_signs = 0; - for (unsigned i = 0; i < m_info.size(); i++) { + for (unsigned i = 0; i < m_info.size(); ++i) { SASSERT(m_info[i].m_first_section <= m_poly_sections.size()); SASSERT(m_info[i].m_num_roots == 0 || m_info[i].m_first_section < m_poly_sections.size()); SASSERT(m_info[i].m_first_sign < m_poly_signs.size()); @@ -310,15 +310,15 @@ namespace nlsat { // Display sign table for the given variable void display(std::ostream & out) const { out << "sections:\n "; - for (unsigned i = 0; i < m_sections.size(); i++) { + for (unsigned i = 0; i < m_sections.size(); ++i) { if (i > 0) out << " < "; m_am.display_decimal(out, m_sections[m_sorted_sections[i]].m_root); } out << "\n"; out << "sign variations:\n"; - for (unsigned i = 0; i < m_info.size(); i++) { + for (unsigned i = 0; i < m_info.size(); ++i) { out << " "; - for (unsigned j = 0; j < num_cells(); j++) { + for (unsigned j = 0; j < num_cells(); ++j) { if (j > 0) out << " "; auto s = sign_at(i, j); @@ -333,21 +333,21 @@ namespace nlsat { // Display sign table for the given variable void display_raw(std::ostream & out) const { out << "sections:\n "; - for (unsigned i = 0; i < m_sections.size(); i++) { + for (unsigned i = 0; i < m_sections.size(); ++i) { if (i > 0) out << " < "; m_am.display_decimal(out, m_sections[m_sorted_sections[i]].m_root); } out << "\n"; out << "poly_info:\n"; - for (unsigned i = 0; i < m_info.size(); i++) { + for (unsigned i = 0; i < m_info.size(); ++i) { out << " roots:"; poly_info const & info = m_info[i]; - for (unsigned j = 0; j < info.m_num_roots; j++) { + for (unsigned j = 0; j < info.m_num_roots; ++j) { out << " "; out << m_poly_sections[info.m_first_section+j]; } out << ", signs:"; - for (unsigned j = 0; j < info.m_num_roots+1; j++) { + for (unsigned j = 0; j < info.m_num_roots+1; ++j) { out << " "; int s = m_poly_signs[info.m_first_sign+j]; if (s < 0) out << "-"; @@ -407,7 +407,7 @@ namespace nlsat { atom::kind k = a->get_kind(); unsigned sz = a->size(); int sign = 1; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { int curr_sign = eval_sign(a->p(i)); if (a->is_even(i) && curr_sign < 0) curr_sign = 1; @@ -477,7 +477,7 @@ namespace nlsat { sign sign_at(ineq_atom * a, sign_table const & t, unsigned c) const { auto sign = sign_pos; unsigned num_ps = a->size(); - for (unsigned i = 0; i < num_ps; i++) { + for (unsigned i = 0; i < num_ps; ++i) { ::sign curr_sign = t.sign_at(i, c); TRACE(nlsat_evaluator_bug, tout << "sign of i: " << i << " at cell " << c << "\n"; m_pm.display(tout, a->p(i)); @@ -497,14 +497,14 @@ namespace nlsat { TRACE(nlsat_evaluator, m_solver.display(tout, *a) << "\n";); unsigned num_ps = a->size(); var x = a->max_var(); - for (unsigned i = 0; i < num_ps; i++) { + for (unsigned i = 0; i < num_ps; ++i) { add(a->p(i), x, table); TRACE(nlsat_evaluator_bug, tout << "table after:\n"; m_pm.display(tout, a->p(i)); tout << "\n"; table.display_raw(tout);); } TRACE(nlsat_evaluator, tout << "sign table for:\n"; - for (unsigned i = 0; i < num_ps; i++) { m_pm.display(tout, a->p(i)); tout << "\n"; } + for (unsigned i = 0; i < num_ps; ++i) { m_pm.display(tout, a->p(i)); tout << "\n"; } table.display(tout);); interval_set_ref result(m_ism); @@ -519,7 +519,7 @@ namespace nlsat { unsigned prev_root_id = UINT_MAX; unsigned num_cells = table.num_cells(); - for (unsigned c = 0; c < num_cells; c++) { + for (unsigned c = 0; c < num_cells; ++c) { TRACE(nlsat_evaluator, tout << "cell: " << c << "\n"; tout << "prev_sat: " << prev_sat << "\n"; diff --git a/src/nlsat/nlsat_explain.cpp b/src/nlsat/nlsat_explain.cpp index e92e5629c..bceb46dc0 100644 --- a/src/nlsat/nlsat_explain.cpp +++ b/src/nlsat/nlsat_explain.cpp @@ -62,7 +62,7 @@ namespace nlsat { void reset() { pmanager & pm = m_set.m(); unsigned sz = m_set.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_in_set[pm.id(m_set.get(i))] = false; } m_set.reset(); @@ -85,7 +85,7 @@ namespace nlsat { pmanager & pm = m_set.m(); var max = null_var; unsigned sz = m_set.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = pm.max_var(m_set.get(i)); SASSERT(x != null_var); if (max == null_var || x > max) @@ -104,7 +104,7 @@ namespace nlsat { pmanager & pm = m_set.m(); unsigned sz = m_set.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly * p = m_set.get(i); var y = pm.max_var(p); SASSERT(y <= x); @@ -168,7 +168,7 @@ namespace nlsat { } std::ostream& display(std::ostream & out, polynomial_ref_vector const & ps, char const * delim = "\n") const { - for (unsigned i = 0; i < ps.size(); i++) { + for (unsigned i = 0; i < ps.size(); ++i) { if (i > 0) out << delim; m_pm.display(out, ps.get(i), m_solver.display_proc()); @@ -245,12 +245,12 @@ namespace nlsat { */ void collect_polys(unsigned num, literal const * ls, polynomial_ref_vector & ps) { ps.reset(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { atom * a = m_atoms[ls[i].var()]; SASSERT(a != 0); if (a->is_ineq_atom()) { unsigned sz = to_ineq_atom(a)->size(); - for (unsigned j = 0; j < sz; j++) + for (unsigned j = 0; j < sz; ++j) ps.push_back(to_ineq_atom(a)->p(j)); } else { @@ -317,7 +317,7 @@ namespace nlsat { m_am.display_decimal(tout, y_val); tout << "\n";); polynomial_ref p(m_pm); unsigned sz = ps.size(); - for (unsigned k = 0; k < sz; k++) { + for (unsigned k = 0; k < sz; ++k) { p = ps.get(k); if (max_var(p) != y) continue; @@ -334,7 +334,7 @@ namespace nlsat { tout << "\n"; }); bool all_lt = true; - for (unsigned i = 0; i < num_roots; i++) { + for (unsigned i = 0; i < num_roots; ++i) { int s = m_am.compare(y_val, roots[i]); TRACE(nlsat_explain, m_am.display_decimal(tout << "comparing root: ", roots[i]); tout << "\n"; @@ -487,7 +487,7 @@ namespace nlsat { unsigned j = 0; unsigned sz = ps.size(); polynomial_ref p(m_pm); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p = ps.get(i); elim_vanishing(p); if (!is_const(p)) { @@ -536,7 +536,7 @@ namespace nlsat { int atom_sign = 1; unsigned sz = a->size(); bool normalized = false; // true if the literal needs to be normalized - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p = a->p(i); if (max_var(p) == max) elim_vanishing(p); // eliminate vanishing coefficients of max @@ -615,7 +615,7 @@ namespace nlsat { void normalize(scoped_literal_vector & C, var max) { unsigned sz = C.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal new_l = normalize(C[i], max); if (new_l == true_literal) continue; @@ -641,7 +641,7 @@ namespace nlsat { var max = max_var(ps.get(0)); SASSERT(max != null_var); // there are no constant polynomials in ps unsigned sz = ps.size(); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { var curr = m_pm.max_var(ps.get(i)); SASSERT(curr != null_var); if (curr > max) @@ -663,7 +663,7 @@ namespace nlsat { */ var max_var(unsigned sz, literal const * ls) { var max = null_var; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = ls[i]; atom * a = m_atoms[l.var()]; if (a != nullptr) { @@ -682,7 +682,7 @@ namespace nlsat { void keep_p_x(polynomial_ref_vector & ps, var x, polynomial_ref_vector & qs) { unsigned sz = ps.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly * q = ps.get(i); if (max_var(q) != x) { qs.push_back(q); @@ -709,7 +709,7 @@ namespace nlsat { factor(p, m_factors); TRACE(nlsat_explain, display(tout << "adding factors of\n", p); tout << "\n" << m_factors << "\n";); polynomial_ref f(m_pm); - for (unsigned i = 0; i < m_factors.size(); i++) { + for (unsigned i = 0; i < m_factors.size(); ++i) { f = m_factors.get(i); elim_vanishing(f); if (!is_const(f)) { @@ -731,7 +731,7 @@ namespace nlsat { polynomial_ref coeff(m_pm); // Add the leading or all coeffs, depening on being square-free - for (unsigned i = 0; i < ps.size(); i++) { + for (unsigned i = 0; i < ps.size(); ++i) { p = ps.get(i); unsigned k_deg = m_pm.degree(p, x); if (k_deg == 0) continue; @@ -752,9 +752,9 @@ namespace nlsat { polynomial_ref q(m_pm); SASSERT(samples.size() <= 2); - for (unsigned i = 0; i < ps.size(); i++){ + for (unsigned i = 0; i < ps.size(); ++i){ p = ps.get(i); - for (unsigned j = 0; j < samples.size(); j++){ + for (unsigned j = 0; j < samples.size(); ++j){ q = samples.get(j); if (!m_pm.eq(p, q)) { psc(p, q, x); @@ -772,7 +772,7 @@ namespace nlsat { m_is_even.reset(); polynomial_ref f(m_pm); bool have_zero = false; - for (unsigned i = 0; i < num_factors; i++) { + for (unsigned i = 0; i < num_factors; ++i) { f = m_factors.get(i); if (coeffs_are_zeroes_in_factor(f)) { have_zero = true; @@ -784,7 +784,7 @@ namespace nlsat { var x = max_var(f); unsigned n = degree(f, x); auto c = polynomial_ref(this->m_pm); - for (unsigned j = 0; j <= n; j++) { + for (unsigned j = 0; j <= n; ++j) { c = m_pm.coeff(s, x, j); SASSERT(sign(c) == 0); ensure_sign(c); @@ -797,7 +797,7 @@ namespace nlsat { var x = max_var(s); unsigned n = degree(s, x); auto c = polynomial_ref(this->m_pm); - for (unsigned j = 0; j <= n; j++) { + for (unsigned j = 0; j <= n; ++j) { c = m_pm.coeff(s, x, j); if (sign(c) != 0) return false; @@ -820,7 +820,7 @@ namespace nlsat { tout << "psc: " << s << "\n"; }); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { s = S.get(i); TRACE(nlsat_explain, display(tout << "processing psc(" << i << ")\n", s) << "\n";); if (is_zero(s)) { @@ -860,7 +860,7 @@ namespace nlsat { polynomial_ref p(m_pm); polynomial_ref p_prime(m_pm); unsigned sz = ps.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p = ps.get(i); if (degree(p, x) < 2) continue; @@ -881,9 +881,9 @@ namespace nlsat { polynomial_ref p(m_pm); polynomial_ref q(m_pm); unsigned sz = ps.size(); - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { p = ps.get(i); - for (unsigned j = i + 1; j < sz; j++) { + for (unsigned j = i + 1; j < sz; ++j) { q = ps.get(j); psc(p, q, x); } @@ -1090,7 +1090,7 @@ namespace nlsat { */ bool all_univ(polynomial_ref_vector const & ps, var x) { unsigned sz = ps.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly * p = ps.get(i); if (max_var(p) != x) return false; @@ -1146,7 +1146,7 @@ namespace nlsat { return; m_todo.reset(); - for (unsigned i = 0; i < ps.size(); i++) { + for (unsigned i = 0; i < ps.size(); ++i) { polynomial_ref p(m_pm); p = ps.get(i); insert_fresh_factors_in_todo(p); @@ -1298,7 +1298,7 @@ namespace nlsat { polynomial_ref_buffer new_factors(m_pm); sbuffer new_factors_even; polynomial_ref new_factor(m_pm); - for (unsigned s = 0; s < num_factors; s++) { + for (unsigned s = 0; s < num_factors; ++s) { poly * f = _a->p(s); bool is_even = _a->is_even(s); if (m_pm.degree(f, info.m_x) < info.m_k) { @@ -1445,7 +1445,7 @@ namespace nlsat { scoped_literal new_lit(m_solver); unsigned sz = C.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = C[i]; new_lit = null_literal; simplify(l, info, max, new_lit); @@ -1484,7 +1484,7 @@ namespace nlsat { poly * r = nullptr; unsigned min_d = UINT_MAX; unsigned sz = C.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = C[i]; if (l.sign()) continue; @@ -1526,7 +1526,7 @@ namespace nlsat { continue; // we don't rewrite root atoms ineq_atom * _a = to_ineq_atom(a); unsigned num_factors = _a->size(); - for (unsigned j = 0; j < num_factors; j++) { + for (unsigned j = 0; j < num_factors; ++j) { poly * p = _a->p(j); xs.reset(); m_pm.vars(p, xs); @@ -1627,7 +1627,7 @@ namespace nlsat { interval_set_ref r(ism); // Copy the union of the infeasible intervals of core into r. unsigned sz = core.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = core[i]; atom * a = m_atoms[l.var()]; SASSERT(a != 0); @@ -1646,7 +1646,7 @@ namespace nlsat { } // Copy the union of the infeasible intervals of todo into r until r becomes full. sz = todo.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = todo[i]; atom * a = m_atoms[l.var()]; SASSERT(a != 0); diff --git a/src/nlsat/nlsat_interval_set.cpp b/src/nlsat/nlsat_interval_set.cpp index d5674774b..dc5740e10 100644 --- a/src/nlsat/nlsat_interval_set.cpp +++ b/src/nlsat/nlsat_interval_set.cpp @@ -99,7 +99,7 @@ namespace nlsat { // Check if the intervals are valid, ordered, and are disjoint. bool check_interval_set(anum_manager & am, unsigned sz, interval const * ints) { #ifdef Z3DEBUG - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { interval const & curr = ints[i]; SASSERT(check_interval(am, curr)); SASSERT(i >= sz - 1 || check_no_overlap(am, curr, ints[i+1])); @@ -118,7 +118,7 @@ namespace nlsat { return; unsigned num = s->m_num_intervals; unsigned obj_sz = interval_set::get_obj_size(num); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { m_am.del(s->m_intervals[i].m_lower); m_am.del(s->m_intervals[i].m_upper); } @@ -473,7 +473,7 @@ namespace nlsat { // Remark: we only combine adjacent intervals when they have the same justification unsigned j = 0; unsigned sz = result.size(); - for (unsigned i = 1; i < sz; i++) { + for (unsigned i = 1; i < sz; ++i) { interval & curr = result[j]; interval & next = result[i]; if (curr.m_justification == next.m_justification && @@ -498,7 +498,7 @@ namespace nlsat { } } j++; - for (unsigned i = j; i < sz; i++) { + for (unsigned i = j; i < sz; ++i) { interval & curr = result[i]; m_am.del(curr.m_lower); m_am.del(curr.m_upper); @@ -509,7 +509,7 @@ namespace nlsat { SASSERT(sz >= 1); bool found_slack = !result[0].m_lower_inf || !result[sz-1].m_upper_inf; // Check if full - for (unsigned i = 0; i < sz - 1 && !found_slack; i++) { + for (unsigned i = 0; i < sz - 1 && !found_slack; ++i) { if (!adjacent(m_am, result[i], result[i+1])) found_slack = true; } @@ -635,7 +635,7 @@ namespace nlsat { return s1 == s2; if (s1->m_num_intervals != s2->m_num_intervals) return false; - for (unsigned i = 0; i < s1->m_num_intervals; i++) { + for (unsigned i = 0; i < s1->m_num_intervals; ++i) { interval const & int1 = s1->m_intervals[i]; interval const & int2 = s2->m_intervals[i]; if (int1.m_lower_inf != int2.m_lower_inf || @@ -654,7 +654,7 @@ namespace nlsat { js.reset(); clauses.reset(); unsigned num = num_intervals(s); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { literal l = s->m_intervals[i].m_justification; unsigned lidx = l.index(); if (m_already_visited.get(lidx, false)) @@ -664,7 +664,7 @@ namespace nlsat { if (s->m_intervals[i].m_clause) clauses.push_back(const_cast(s->m_intervals[i].m_clause)); } - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { literal l = s->m_intervals[i].m_justification; unsigned lidx = l.index(); m_already_visited[lidx] = false; @@ -746,7 +746,7 @@ namespace nlsat { // Try to find a gap that is not an unit. - for (unsigned i = 1; i < num; i++) { + for (unsigned i = 1; i < num; ++i) { if (m_am.lt(s->m_intervals[i-1].m_upper, s->m_intervals[i].m_lower)) { n++; if (n == 1 || m_rand()%n == 0) @@ -761,7 +761,7 @@ namespace nlsat { // Try to find a rational unsigned irrational_i = UINT_MAX; - for (unsigned i = 1; i < num; i++) { + for (unsigned i = 1; i < num; ++i) { if (s->m_intervals[i-1].m_upper_open && s->m_intervals[i].m_lower_open) { SASSERT(m_am.eq(s->m_intervals[i-1].m_upper, s->m_intervals[i].m_lower)); // otherwise we would have found it in the previous step if (m_am.is_rational(s->m_intervals[i-1].m_upper)) { @@ -784,7 +784,7 @@ namespace nlsat { return out; } out << "{"; - for (unsigned i = 0; i < s->m_num_intervals; i++) { + for (unsigned i = 0; i < s->m_num_intervals; ++i) { if (i > 0) out << ", "; nlsat::display(out, m_am, s->m_intervals[i]); diff --git a/src/nlsat/nlsat_scoped_literal_vector.h b/src/nlsat/nlsat_scoped_literal_vector.h index 9b4b62fe8..63c0b2df7 100644 --- a/src/nlsat/nlsat_scoped_literal_vector.h +++ b/src/nlsat/nlsat_scoped_literal_vector.h @@ -55,13 +55,13 @@ namespace nlsat { unsigned sz = m_lits.size(); if (new_sz == sz) return; - for (unsigned i = new_sz; i < sz; i++) { + for (unsigned i = new_sz; i < sz; ++i) { m_solver.dec_ref(m_lits[i]); } m_lits.shrink(new_sz); } void append(unsigned sz, literal const * ls) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) push_back(ls[i]); } void append(scoped_literal_vector const& ls) { diff --git a/src/nlsat/nlsat_solver.cpp b/src/nlsat/nlsat_solver.cpp index 1f1e21c93..e3908dfd2 100644 --- a/src/nlsat/nlsat_solver.cpp +++ b/src/nlsat/nlsat_solver.cpp @@ -427,7 +427,7 @@ namespace nlsat { */ var max_var(unsigned sz, literal const * cls) const { var x = null_var; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = cls[i]; if (is_arith_literal(l)) { var y = max_var(l); @@ -462,7 +462,7 @@ namespace nlsat { unsigned max = 0; unsigned sz = to_ineq_atom(a)->size(); var x = a->max_var(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned d = m_pm.degree(to_ineq_atom(a)->p(i), x); if (d > max) max = d; @@ -552,7 +552,7 @@ namespace nlsat { else if (a->is_ineq_atom()) { unsigned sz = to_ineq_atom(a)->size(); var_vector new_vs; - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { m_found_vars.reset(); m_pm.vars(to_ineq_atom(a)->p(j), new_vs); for (unsigned i = 0; i < new_vs.size(); ++i) { @@ -599,7 +599,7 @@ namespace nlsat { m_ineq_atoms.erase(a); del(a->bvar()); unsigned sz = a->size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m_pm.dec_ref(a->p(i)); deallocate(a); } @@ -637,7 +637,7 @@ namespace nlsat { polynomial_ref p(m_pm); ptr_buffer uniq_ps; var max = null_var; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p = m_pm.flip_sign_if_lm_neg(ps[i]); if (p.get() != ps[i] && !is_even[i]) { sign = -sign; @@ -678,7 +678,7 @@ namespace nlsat { SASSERT(atom->max_var() == max); is_new = (atom == tmp_atom); if (is_new) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_pm.inc_ref(atom->p(i)); } } @@ -804,7 +804,7 @@ namespace nlsat { remove_clause_from_watches(*cls); m_cid_gen.recycle(cls->id()); unsigned sz = cls->size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) dec_ref((*cls)[i]); _assumption_set a = static_cast<_assumption_set>(cls->assumptions()); dec_ref(a); @@ -1130,7 +1130,7 @@ namespace nlsat { bool_vector used_vars(num_vars(), false); bool_vector used_bools(usize(m_atoms), false); var_vector vars; - for (unsigned j = 0; j < n; j++) { + for (unsigned j = 0; j < n; ++j) { literal lit = cls[j]; bool_var b = lit.var(); if (b != null_bool_var && b < used_bools.size()) @@ -1162,7 +1162,7 @@ namespace nlsat { unsigned cid = m_cid_gen.mk(); void * mem = m_allocator.allocate(clause::get_obj_size(num_lits)); clause * cls = new (mem) clause(cid, num_lits, lits, learned, a); - for (unsigned i = 0; i < num_lits; i++) + for (unsigned i = 0; i < num_lits; ++i) inc_ref(lits[i]); inc_ref(a); return cls; @@ -1452,7 +1452,7 @@ namespace nlsat { \brief Return true if the given clause is false in the current partial interpretation. */ bool is_inconsistent(unsigned sz, literal const * cls) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (value(cls[i]) != l_false) { TRACE(is_inconsistent, tout << "literal is not false:\n"; display(tout, cls[i]); tout << "\n";); return false; @@ -1471,7 +1471,7 @@ namespace nlsat { unsigned num_undef = 0; unsigned first_undef = UINT_MAX; unsigned sz = cls.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = cls[i]; SASSERT(m_atoms[l.var()] == nullptr); SASSERT(value(l) != l_true); @@ -1646,7 +1646,7 @@ namespace nlsat { if (num_undef == 1) { CTRACE(nlsat, cls.size() > 1, tout << "num_undef=1, "; display(tout, cls) << "\n"; - for (unsigned i = 0; i < cls.size(); i++) { + for (unsigned i = 0; i < cls.size(); ++i) { tout << value(cls[i]) << ", "; } ); @@ -1922,7 +1922,7 @@ namespace nlsat { vector> bounds; - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (is_int(x) && m_assignment.is_assigned(x) && !m_am.is_int(m_assignment.value(x))) { scoped_anum v(m_am), vlo(m_am); v = m_assignment.value(x); @@ -2209,7 +2209,7 @@ namespace nlsat { TRACE(nlsat_proof, tout << "resolving "; if (b != null_bool_var) display_atom(tout, b) << "\n"; display(tout, sz, c); tout << "\n";); TRACE(nlsat_proof_sk, tout << "resolving "; if (b != null_bool_var) tout << "b" << b; tout << "\n"; display_abst(tout, sz, c); tout << "\n";); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (c[i].var() != b) process_antecedent(c[i]); } @@ -2224,7 +2224,7 @@ namespace nlsat { std::ostream& print_out_as_math(std::ostream& out, lazy_justification const & jst) { literal_vector core; - for (unsigned i = 0; i < jst.num_lits(); i++) { + for (unsigned i = 0; i < jst.num_lits(); ++i) { core.push_back(~jst.lit(i)); } display_mathematica_lemma(out, core.size(), core.data(), true); @@ -2313,7 +2313,7 @@ namespace nlsat { m_lazy_clause.reset(); m_explain.main_operator(jst.num_lits(), jst.lits(), m_lazy_clause); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m_lazy_clause.push_back(~jst.lit(i)); // lazy clause is a valid clause @@ -2340,7 +2340,7 @@ namespace nlsat { #ifdef Z3DEBUG { unsigned sz = m_lazy_clause.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = m_lazy_clause[i]; if (l.var() != b) { if (value(l) != l_false) @@ -2369,7 +2369,7 @@ namespace nlsat { \brief Return true if all literals in ls are from previous stages. */ bool only_literals_from_previous_stages(unsigned num, literal const * ls) const { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (max_var(ls[i]) == m_xk) return false; } @@ -2383,7 +2383,7 @@ namespace nlsat { */ unsigned max_scope_lvl(unsigned num, literal const * ls) { unsigned max = 0; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { literal l = ls[i]; bool_var b = l.var(); SASSERT(value(ls[i]) == l_false); @@ -2412,7 +2412,7 @@ namespace nlsat { TRACE(nlsat_resolve, tout << "removing literals from lvl: " << lvl << " and stage " << m_xk << "\n";); unsigned sz = lemma.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = lemma[i]; bool_var b = l.var(); SASSERT(is_marked(b)); @@ -2431,7 +2431,7 @@ namespace nlsat { \brief Return true if it is a Boolean lemma. */ bool is_bool_lemma(unsigned sz, literal const * ls) const { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_atoms[ls[i].var()] != nullptr) return false; } @@ -2448,7 +2448,7 @@ namespace nlsat { SASSERT(!is_bool_lemma(sz, lemma)); unsigned new_lvl = 0; bool found_lvl = false; - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { literal l = lemma[i]; if (max_var(l) == m_xk) { bool_var b = l.var(); @@ -2665,10 +2665,10 @@ namespace nlsat { bool check_watches() const { #ifdef Z3DEBUG - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { clause_vector const & cs = m_watches[x]; unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(max_var(*(cs[i])) == x); } } @@ -2678,10 +2678,10 @@ namespace nlsat { bool check_bwatches() const { #ifdef Z3DEBUG - for (bool_var b = 0; b < m_bwatches.size(); b++) { + for (bool_var b = 0; b < m_bwatches.size(); ++b) { clause_vector const & cs = m_bwatches[b]; unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { clause const & c = *(cs[i]); (void)c; SASSERT(max_var(c) == null_var); @@ -2700,7 +2700,7 @@ namespace nlsat { bool check_satisfied(clause_vector const & cs) { unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { clause const & c = *(cs[i]); if (!is_satisfied(c)) { TRACE(nlsat, tout << "not satisfied\n"; display(tout, c); tout << "\n";); @@ -2715,14 +2715,14 @@ namespace nlsat { unsigned num = usize(m_atoms); if (m_bk != null_bool_var) num = m_bk; - for (bool_var b = 0; b < num; b++) { + for (bool_var b = 0; b < num; ++b) { if (!check_satisfied(m_bwatches[b])) { UNREACHABLE(); return false; } } if (m_xk != null_var) { - for (var x = 0; x < m_xk; x++) { + for (var x = 0; x < m_xk; ++x) { if (!check_satisfied(m_watches[x])) { UNREACHABLE(); return false; @@ -2777,7 +2777,7 @@ namespace nlsat { m_vars.reset(); pm.vars(p, m_vars); unsigned sz = m_vars.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { var x = m_vars[i]; unsigned k = pm.degree(p, x); m_num_occs[x]++; @@ -2793,7 +2793,7 @@ namespace nlsat { return; if (a->is_ineq_atom()) { unsigned sz = to_ineq_atom(a)->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { collect(to_ineq_atom(a)->p(i)); } } @@ -2804,19 +2804,19 @@ namespace nlsat { void collect(clause const & c) { unsigned sz = c.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) collect(c[i]); } void collect(clause_vector const & cs) { unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) collect(*(cs[i])); } std::ostream& display(std::ostream & out, display_var_proc const & proc) { unsigned sz = m_num_occs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { proc(out, i); out << " -> " << m_max_degree[i] << " : " << m_num_occs[i] << "\n"; } return out; @@ -2850,15 +2850,15 @@ namespace nlsat { init_shuffle(collector.m_shuffle); TRACE(nlsat_reorder, collector.display(tout, m_display_var);); var_vector new_order; - for (var x = 0; x < num; x++) + for (var x = 0; x < num; ++x) new_order.push_back(x); std::sort(new_order.begin(), new_order.end(), reorder_lt(collector)); TRACE(nlsat_reorder, - tout << "new order: "; for (unsigned i = 0; i < num; i++) tout << new_order[i] << " "; tout << "\n";); + tout << "new order: "; for (unsigned i = 0; i < num; ++i) tout << new_order[i] << " "; tout << "\n";); var_vector perm; perm.resize(num, 0); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { perm[new_order[x]] = x; } reorder(perm.size(), perm.data()); @@ -2867,7 +2867,7 @@ namespace nlsat { void init_shuffle(var_vector& p) { unsigned num = num_vars(); - for (var x = 0; x < num; x++) + for (var x = 0; x < num; ++x) p.push_back(x); random_gen r(++m_random_seed); @@ -2898,7 +2898,7 @@ namespace nlsat { TRACE(nlsat_reorder, tout << "solver before variable reorder\n"; display(tout); display_vars(tout); tout << "\npermutation:\n"; - for (unsigned i = 0; i < sz; i++) tout << p[i] << " "; tout << "\n"; + for (unsigned i = 0; i < sz; ++i) tout << p[i] << " "; tout << "\n"; ); // verbose_stream() << "\npermutation: " << p[0] << " count " << count << " " << m_rlimit.is_canceled() << "\n"; reinit_cache(); @@ -2906,7 +2906,7 @@ namespace nlsat { TRACE(nlsat_bool_assignment_bug, tout << "before reset watches\n"; display_bool_assignment(tout, false, nullptr);); reset_watches(); assignment new_assignment(m_am); - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (m_assignment.is_assigned(x)) new_assignment.set(p[x], m_assignment.value(x)); } @@ -2917,12 +2917,12 @@ namespace nlsat { undo_until_stage(null_var); m_cache.reset(); #ifdef Z3DEBUG - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { SASSERT(m_watches[x].empty()); } #endif // update m_perm mapping - for (unsigned ext_x = 0; ext_x < sz; ext_x++) { + for (unsigned ext_x = 0; ext_x < sz; ++ext_x) { // p: internal -> new pos // m_perm: internal -> external // m_inv_perm: external -> internal @@ -2931,13 +2931,13 @@ namespace nlsat { } bool_vector is_int; is_int.swap(m_is_int); - for (var x = 0; x < sz; x++) { + for (var x = 0; x < sz; ++x) { m_is_int.setx(p[x], is_int[x], false); SASSERT(m_infeasible[x] == 0); } m_inv_perm.swap(new_inv_perm); #ifdef Z3DEBUG - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { SASSERT(x == m_inv_perm[m_perm[x]]); SASSERT(m_watches[x].empty()); } @@ -2964,7 +2964,7 @@ namespace nlsat { p.append(m_perm); reorder(p.size(), p.data()); #ifdef Z3DEBUG - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { SASSERT(m_perm[x] == x); SASSERT(m_inv_perm[x] == x); } @@ -3028,7 +3028,7 @@ namespace nlsat { else if (a->is_ineq_atom()) { var max = 0; unsigned sz = to_ineq_atom(a)->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { poly * p = to_ineq_atom(a)->p(i); VERIFY(m_cache.mk_unique(p) == p); var x = m_pm.max_var(p); @@ -3046,7 +3046,7 @@ namespace nlsat { void reset_watches() { unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { m_watches[x].clear(); } } @@ -3082,17 +3082,17 @@ namespace nlsat { void sort_clauses_by_degree(unsigned sz, clause ** cs) { if (sz <= 1) return; - TRACE(nlsat_reorder_clauses, tout << "before:\n"; for (unsigned i = 0; i < sz; i++) { display(tout, *(cs[i])); tout << "\n"; }); + TRACE(nlsat_reorder_clauses, tout << "before:\n"; for (unsigned i = 0; i < sz; ++i) { display(tout, *(cs[i])); tout << "\n"; }); m_cs_degrees.reset(); m_cs_p.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_cs_p.push_back(i); m_cs_degrees.push_back(degree(*(cs[i]))); } std::sort(m_cs_p.begin(), m_cs_p.end(), degree_lt(m_cs_degrees)); TRACE(nlsat_reorder_clauses, tout << "permutation: "; ::display(tout, m_cs_p.begin(), m_cs_p.end()); tout << "\n";); apply_permutation(sz, cs, m_cs_p.data()); - TRACE(nlsat_reorder_clauses, tout << "after:\n"; for (unsigned i = 0; i < sz; i++) { display(tout, *(cs[i])); tout << "\n"; }); + TRACE(nlsat_reorder_clauses, tout << "after:\n"; for (unsigned i = 0; i < sz; ++i) { display(tout, *(cs[i])); tout << "\n"; }); } @@ -3122,11 +3122,11 @@ namespace nlsat { void sort_clauses_by_degree_lit_num(unsigned sz, clause ** cs) { if (sz <= 1) return; - TRACE(nlsat_reorder_clauses, tout << "before:\n"; for (unsigned i = 0; i < sz; i++) { display(tout, *(cs[i])); tout << "\n"; }); + TRACE(nlsat_reorder_clauses, tout << "before:\n"; for (unsigned i = 0; i < sz; ++i) { display(tout, *(cs[i])); tout << "\n"; }); m_dl_degrees.reset(); m_dl_lit_num.reset(); m_dl_p.reset(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_dl_degrees.push_back(degree(*(cs[i]))); m_dl_lit_num.push_back(cs[i]->size()); m_dl_p.push_back(i); @@ -3134,12 +3134,12 @@ namespace nlsat { std::sort(m_dl_p.begin(), m_dl_p.end(), degree_lit_num_lt(m_dl_degrees, m_dl_lit_num)); TRACE(nlsat_reorder_clauses, tout << "permutation: "; ::display(tout, m_dl_p.begin(), m_dl_p.end()); tout << "\n";); apply_permutation(sz, cs, m_dl_p.data()); - TRACE(nlsat_reorder_clauses, tout << "after:\n"; for (unsigned i = 0; i < sz; i++) { display(tout, *(cs[i])); tout << "\n"; }); + TRACE(nlsat_reorder_clauses, tout << "after:\n"; for (unsigned i = 0; i < sz; ++i) { display(tout, *(cs[i])); tout << "\n"; }); } void sort_watched_clauses() { unsigned num = num_vars(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { clause_vector & ws = m_watches[i]; sort_clauses_by_degree(ws.size(), ws.data()); } @@ -3358,7 +3358,7 @@ namespace nlsat { std::ostream& display_num_assignment(std::ostream & out, display_var_proc const & proc, bool_vector const* used_vars = nullptr) const { bool restrict = used_vars != nullptr; - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (restrict && (x >= used_vars->size() || !(*used_vars)[x])) continue; if (!m_assignment.is_assigned(x)) @@ -3396,7 +3396,7 @@ namespace nlsat { std::ostream& display_bool_assignment(std::ostream & out, bool eval_atoms = false, bool_vector const* used = nullptr) const { unsigned sz = usize(m_atoms); if (used != nullptr) { - for (bool_var b = 0; b < sz; b++) { + for (bool_var b = 0; b < sz; ++b) { if (b >= used->size() || !(*used)[b]) continue; if (m_atoms[b] != nullptr) @@ -3409,7 +3409,7 @@ namespace nlsat { return out; } if (!eval_atoms) { - for (bool_var b = 0; b < sz; b++) { + for (bool_var b = 0; b < sz; ++b) { if (m_bvalues[b] == l_undef) continue; if (m_atoms[b] == nullptr) @@ -3421,7 +3421,7 @@ namespace nlsat { } } else { //if (eval_atoms) { - for (bool_var b = 0; b < sz; b++) { + for (bool_var b = 0; b < sz; ++b) { if (m_atoms[b] == nullptr) continue; lbool val = to_lbool(m_evaluator.eval(m_atoms[b], false)); out << "b" << b << " -> " << val << " "; @@ -3439,7 +3439,7 @@ namespace nlsat { bool display_mathematica_assignment(std::ostream & out) const { bool first = true; - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (m_assignment.is_assigned(x)) { if (first) first = false; @@ -3531,7 +3531,7 @@ namespace nlsat { std::ostream& display_ineq(std::ostream & out, ineq_atom const & a, display_var_proc const & proc, bool use_star = false) const { unsigned sz = a.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (use_star && i > 0) out << "*"; bool is_even = a.is_even(i); @@ -3554,7 +3554,7 @@ namespace nlsat { std::ostream& display_mathematica(std::ostream & out, ineq_atom const & a) const { unsigned sz = a.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) out << "*"; bool is_even = a.is_even(i); @@ -3591,7 +3591,7 @@ namespace nlsat { unsigned sz = a.size(); if (sz > 1) out << "(* "; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) out << " "; if (a.is_even(i)) { out << "(* "; @@ -3956,7 +3956,7 @@ namespace nlsat { } std::ostream& display(std::ostream & out, unsigned num, literal const * ls, display_var_proc const & proc) const { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i > 0) out << " or "; display(out, ls[i], proc); @@ -3969,7 +3969,7 @@ namespace nlsat { } std::ostream& display_not(std::ostream & out, unsigned num, literal const * ls, display_var_proc const & proc) const { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i > 0) out << " or "; display(out, ~ls[i], proc); @@ -4002,7 +4002,7 @@ namespace nlsat { if (m_display_eval) { polynomial_ref q(m_pm); q = p; - for (var x = 0; x < num_vars(); x++) + for (var x = 0; x < num_vars(); ++x) if (m_assignment.is_assigned(x)) { auto& a = m_assignment.value(x); if (!m_am.is_rational(a)) @@ -4034,7 +4034,7 @@ namespace nlsat { } else { out << "(or"; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { out << " "; display_smt2(out, ls[i], proc); } @@ -4063,7 +4063,7 @@ namespace nlsat { } std::ostream& display_abst(std::ostream & out, unsigned num, literal const * ls) const { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i > 0) out << " or "; display_abst(out, ls[i]); @@ -4082,7 +4082,7 @@ namespace nlsat { std::ostream& display_mathematica(std::ostream & out, clause const & c) const { out << "("; unsigned sz = c.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) out << " || "; display_mathematica(out, c[i]); @@ -4097,7 +4097,7 @@ namespace nlsat { std::ostream& display_mathematica_lemma(std::ostream & out, unsigned num, literal const * ls, bool include_assignment = false) const { bool_vector used_vars(num_vars(), false); var_vector vars; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { vars.reset(); this->vars(ls[i], vars); for (var v : vars) @@ -4105,7 +4105,7 @@ namespace nlsat { } if (include_assignment) { - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (m_assignment.is_assigned(x)) used_vars[x] = true; } @@ -4113,7 +4113,7 @@ namespace nlsat { out << "Resolve[ForAll[{"; bool first = true; - for (var x = 0; x < num_vars(); x++) { + for (var x = 0; x < num_vars(); ++x) { if (used_vars[x] == false) continue; if (!first) out << ", "; first = false; @@ -4128,7 +4128,7 @@ namespace nlsat { out << ") || "; } - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i > 0) out << " || "; display_mathematica(out, ls[i]); @@ -4150,7 +4150,7 @@ namespace nlsat { std::ostream& display_mathematica(std::ostream & out, clause_vector const & cs) const { unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i > 0) out << ",\n"; display_mathematica(out << " ", *(cs[i])); } @@ -4191,7 +4191,7 @@ namespace nlsat { } std::ostream& display_vars(std::ostream & out) const { - for (unsigned i = 0; i < num_vars(); i++) { + for (unsigned i = 0; i < num_vars(); ++i) { out << i << " -> "; m_display_var(out, i); out << "\n"; } return out; @@ -4203,7 +4203,7 @@ namespace nlsat { std::ostream& display_smt2_arith_decls(std::ostream & out, bool_vector& used_vars) const { unsigned sz = m_is_int.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (!used_vars[i]) continue; out << "(declare-fun "; m_display_var(out, i); @@ -4221,7 +4221,7 @@ namespace nlsat { std::ostream& display_smt2_bool_decls(std::ostream & out, const bool_vector& used_bools) const { unsigned sz = usize(m_atoms); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_atoms[i] == nullptr && used_bools[i]) out << "(declare-fun b" << i << " () Bool)\n"; } diff --git a/src/nlsat/nlsat_types.cpp b/src/nlsat/nlsat_types.cpp index dbf7ab360..42c41cec1 100644 --- a/src/nlsat/nlsat_types.cpp +++ b/src/nlsat/nlsat_types.cpp @@ -26,7 +26,7 @@ namespace nlsat { ineq_atom::ineq_atom(kind k, unsigned sz, poly * const * ps, bool const * is_even, var max_var): atom(k, max_var), m_size(sz) { - for (unsigned i = 0; i < m_size; i++) { + for (unsigned i = 0; i < m_size; ++i) { m_ps[i] = TAG(poly *, ps[i], is_even[i] ? 1 : 0); } SASSERT(is_ineq_atom()); @@ -40,7 +40,7 @@ namespace nlsat { if (a1->m_size != a2->m_size || a1->m_kind != a2->m_kind) return false; unsigned sz = a1->m_size; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (a1->m_ps[i] != a2->m_ps[i]) return false; } diff --git a/src/nlsat/nlsat_variable_ordering_strategy.cpp b/src/nlsat/nlsat_variable_ordering_strategy.cpp index 3b94e568c..3e58c3dc8 100644 --- a/src/nlsat/nlsat_variable_ordering_strategy.cpp +++ b/src/nlsat/nlsat_variable_ordering_strategy.cpp @@ -88,7 +88,7 @@ namespace nlsat { m_max_degree[x] = k; if (m_vos_type == FEATURE){ - for (unsigned kl = 0; kl <= k; kl++) { + for (unsigned kl = 0; kl <= k; ++kl) { scoped_numeral curr(pm.m()); if (pm.const_coeff(p, x, kl, curr)) { pm.m().abs(curr); @@ -115,7 +115,7 @@ namespace nlsat { return; if (a->is_ineq_atom()) { unsigned sz = to_ineq_atom(a)->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { collect(to_ineq_atom(a)->p(i)); } } @@ -126,13 +126,13 @@ namespace nlsat { void collect(clause const & c) { unsigned sz = c.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) collect(c[i]); } void collect(clause_vector const & cs) { unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) collect(*(cs[i])); } @@ -216,7 +216,7 @@ namespace nlsat { bool check_invariant() const {return true;} // what is the invariant void operator()(var_vector &perm) { var_vector new_order; - for (var x = 0; x < num_vars; x++) { + for (var x = 0; x < num_vars; ++x) { new_order.push_back(x); } if (m_vos_type == BROWN) { @@ -241,12 +241,12 @@ namespace nlsat { } TRACE(reorder, tout << "new order: "; - for (unsigned i = 0; i < num_vars; i++) + for (unsigned i = 0; i < num_vars; ++i) tout << new_order[i] << " "; tout << "\n"; ); perm.resize(num_vars, 0); - for (var x = 0; x < num_vars; x++) { + for (var x = 0; x < num_vars; ++x) { perm[new_order[x]] = x; } @@ -254,7 +254,7 @@ namespace nlsat { } // std::ostream& display(std::ostream & out, display_var_proc const & proc) { // unsigned sz = m_num_occs.size(); - // for (unsigned i = 0; i < sz; i++) { + // for (unsigned i = 0; i < sz; ++i) { // proc(out, i); out << " -> " << m_max_degree[i] << " : " << m_num_occs[i] << "\n"; // } // return out; diff --git a/src/nlsat/tactic/goal2nlsat.cpp b/src/nlsat/tactic/goal2nlsat.cpp index 44f780600..d79a7658a 100644 --- a/src/nlsat/tactic/goal2nlsat.cpp +++ b/src/nlsat/tactic/goal2nlsat.cpp @@ -100,7 +100,7 @@ struct goal2nlsat::imp { m_pm.factor(p, fs, m_fparams); TRACE(goal2nlsat_bug, tout << "factors:\n" << fs << "\n";); SASSERT(fs.distinct_factors() > 0); - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { ps.push_back(fs[i]); is_even.push_back(fs.get_degree(i) % 2 == 0); } @@ -245,7 +245,7 @@ struct goal2nlsat::imp { lits = &f; } sbuffer ls; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { ls.push_back(process_literal(lits[i])); } m_solver.mk_clause(ls.size(), ls.data(), dep); @@ -256,7 +256,7 @@ struct goal2nlsat::imp { if (has_term_ite(g)) throw tactic_exception("eliminate term-ite before applying nlsat"); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { process(g.form(i), g.dep(i)); } } diff --git a/src/nlsat/tactic/nlsat_tactic.cpp b/src/nlsat/tactic/nlsat_tactic.cpp index ed7aa9066..c47a586f8 100644 --- a/src/nlsat/tactic/nlsat_tactic.cpp +++ b/src/nlsat/tactic/nlsat_tactic.cpp @@ -60,13 +60,13 @@ class nlsat_tactic : public tactic { } bool contains_unsupported(expr_ref_vector & b2a, expr_ref_vector & x2t) { - for (unsigned x = 0; x < x2t.size(); x++) { + for (unsigned x = 0; x < x2t.size(); ++x) { if (!is_uninterp_const(x2t.get(x))) { TRACE(unsupported, tout << "unsupported atom:\n" << mk_ismt2_pp(x2t.get(x), m) << "\n";); return true; } } - for (unsigned b = 0; b < b2a.size(); b++) { + for (unsigned b = 0; b < b2a.size(); ++b) { expr * a = b2a.get(b); if (a == nullptr) continue; @@ -82,7 +82,7 @@ class nlsat_tactic : public tactic { bool eval_model(model& model, goal& g) { unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (model.is_false(g.form(i))) { TRACE(nlsat, tout << mk_pp(g.form(i), m) << " -> " << model(g.form(i)) << "\n";); IF_VERBOSE(0, verbose_stream() << mk_pp(g.form(i), m) << " -> " << model(g.form(i)) << "\n";); @@ -99,7 +99,7 @@ class nlsat_tactic : public tactic { bool ok = true; model_ref md = alloc(model, m); arith_util util(m); - for (unsigned x = 0; x < x2t.size(); x++) { + for (unsigned x = 0; x < x2t.size(); ++x) { expr * t = x2t.get(x); if (!is_uninterp_const(t)) continue; @@ -116,7 +116,7 @@ class nlsat_tactic : public tactic { } md->register_decl(to_app(t)->get_decl(), v); } - for (unsigned b = 0; b < b2a.size(); b++) { + for (unsigned b = 0; b < b2a.size(); ++b) { expr * a = b2a.get(b); if (a == nullptr || !is_uninterp_const(a)) continue; diff --git a/src/opt/opt_context.cpp b/src/opt/opt_context.cpp index da85108a7..763a988fc 100644 --- a/src/opt/opt_context.cpp +++ b/src/opt/opt_context.cpp @@ -873,7 +873,7 @@ namespace opt { quick_for_each_expr(proc, visited, ms[j]); } unsigned sz = get_solver().get_num_assertions(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) quick_for_each_expr(proc, visited, get_solver().get_assertion(i)); for (expr* f : m_hard_constraints) quick_for_each_expr(proc, visited, f); diff --git a/src/opt/opt_solver.cpp b/src/opt/opt_solver.cpp index ea414d441..9aeb79133 100644 --- a/src/opt/opt_solver.cpp +++ b/src/opt/opt_solver.cpp @@ -339,7 +339,7 @@ namespace opt { void opt_solver::get_unsat_core(expr_ref_vector & r) { r.reset(); unsigned sz = m_context.get_unsat_core_size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { r.push_back(m_context.get_unsat_core_expr(i)); } } diff --git a/src/params/context_params.cpp b/src/params/context_params.cpp index 702e0898d..adb2b4063 100644 --- a/src/params/context_params.cpp +++ b/src/params/context_params.cpp @@ -52,7 +52,7 @@ void context_params::set_uint(unsigned & opt, char const * param, char const * v } static void lower_case(std::string& p) { - for (size_t i = 0; i < p.size(); i++) { + for (size_t i = 0; i < p.size(); ++i) { if (p[i] >= 'A' && p[i] <= 'Z') p[i] = p[i] - 'A' + 'a'; else if (p[i] == '-') diff --git a/src/parsers/smt2/smt2parser.cpp b/src/parsers/smt2/smt2parser.cpp index 5d0ce85ff..3f04ad9f0 100644 --- a/src/parsers/smt2/smt2parser.cpp +++ b/src/parsers/smt2/smt2parser.cpp @@ -942,7 +942,7 @@ namespace smt2 { dts->commit(pm()); m_ctx.insert_aux_pdecl(dts.get()); } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { pdatatype_decl * d = new_dt_decls[i]; check_duplicate(d, line, pos); if (!is_smt2_6) { @@ -2036,7 +2036,7 @@ namespace smt2 { unsigned begin_pats = fr->m_pat_spos; unsigned end_pats = pattern_stack().size(); unsigned j = begin_pats; - for (unsigned i = begin_pats; i < end_pats; i++) { + for (unsigned i = begin_pats; i < end_pats; ++i) { expr * pat = pattern_stack().get(i); if (!pat_validator()(num_decls, pat, m_scanner.get_line(), m_scanner.get_pos())) { if (!ignore_bad_patterns()) @@ -2724,7 +2724,7 @@ namespace smt2 { expr ** expr_it = expr_stack().data() + spos; expr ** expr_end = expr_it + m_cached_strings.size(); md->compress(); - for (unsigned i = 0; expr_it < expr_end; expr_it++, i++) { + for (unsigned i = 0; expr_it < expr_end; ++expr_it, ++i) { model::scoped_model_completion _scm(md, true); expr_ref v = (*md)(*expr_it); if (i > 0) diff --git a/src/parsers/smt2/smt2scanner.cpp b/src/parsers/smt2/smt2scanner.cpp index ce3f83bc5..f7c44f8af 100644 --- a/src/parsers/smt2/smt2scanner.cpp +++ b/src/parsers/smt2/smt2scanner.cpp @@ -389,7 +389,7 @@ namespace smt2 { begin++; while (begin < end && isspace(m_cache[end-1])) end--; - for (unsigned i = begin; i < end; i++) + for (unsigned i = begin; i < end; ++i) m_cache_result.push_back(m_cache[i]); m_cache_result.push_back(0); return m_cache_result.begin(); diff --git a/src/qe/lite/qe_lite_tactic.cpp b/src/qe/lite/qe_lite_tactic.cpp index 4ced596ae..e3b9a4cb1 100644 --- a/src/qe/lite/qe_lite_tactic.cpp +++ b/src/qe/lite/qe_lite_tactic.cpp @@ -121,7 +121,7 @@ namespace qel { // eliminate self loops, and definitions containing quantifiers. bool found = false; - for (unsigned i = 0; i < definitions.size(); i++) { + for (unsigned i = 0; i < definitions.size(); ++i) { var * v = vars[i]; expr * t = definitions[i]; if (t == nullptr || has_quantifiers(t) || strict_occurs_var(v->get_idx(), t)) @@ -141,7 +141,7 @@ namespace qel { unsigned vidx, num; - for (unsigned i = 0; i < definitions.size(); i++) { + for (unsigned i = 0; i < definitions.size(); ++i) { if (definitions[i] == nullptr) continue; var * v = vars[i]; @@ -323,7 +323,7 @@ namespace qel { void get_elimination_order() { TRACE(top_sort, tout << "DEFINITIONS: " << std::endl; - for(unsigned i = 0; i < m_map.size(); i++) + for(unsigned i = 0; i < m_map.size(); ++i) if(m_map[i]) tout << "VAR " << i << " = " << mk_pp(m_map[i], m) << std::endl; ); @@ -377,7 +377,7 @@ namespace qel { // get a new expression m_new_args.reset(); - for(unsigned i = 0; i < num_args; i++) { + for(unsigned i = 0; i < num_args; ++i) { int x = m_pos2var[i]; if (x == -1 || m_map[x] == 0) { m_new_args.push_back(args[i]); @@ -406,12 +406,12 @@ namespace qel { // don't forget to update the quantifier patterns expr_ref_buffer new_patterns(m); expr_ref_buffer new_no_patterns(m); - for (unsigned j = 0; j < q->get_num_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_patterns(); ++j) { expr_ref new_pat = m_subst(q->get_pattern(j), m_subst_map.size(), m_subst_map.data()); new_patterns.push_back(new_pat); } - for (unsigned j = 0; j < q->get_num_no_patterns(); j++) { + for (unsigned j = 0; j < q->get_num_no_patterns(); ++j) { expr_ref new_nopat = m_subst(q->get_no_pattern(j), m_subst_map.size(), m_subst_map.data()); new_no_patterns.push_back(new_nopat); } @@ -482,7 +482,7 @@ namespace qel { m_pos2var.reserve(num_args, -1); // Find all definitions - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { checkpoint(); ptr_vector vs; expr_ref_vector ts(m); @@ -1078,7 +1078,7 @@ namespace fm { expr_fast_mark2 visited; bool all_forbidden = true; - for (unsigned i = 0; i < num_mons; i++) { + for (unsigned i = 0; i < num_mons; ++i) { expr * x; if (!is_linear_mon_core(mons[i], x)) return false; @@ -1108,7 +1108,7 @@ namespace fm { if (m_fm_occ && m.is_or(t)) { unsigned num = to_app(t)->get_num_args(); bool found = false; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * l = to_app(t)->get_arg(i); if (is_literal(l)) { continue; @@ -1142,7 +1142,7 @@ namespace fm { } void del_constraints(unsigned sz, constraint * const * cs) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) del_constraint(cs[i]); } @@ -1166,18 +1166,18 @@ namespace fm { cnstr->m_strict = strict; cnstr->m_num_vars = num_vars; cnstr->m_lits = reinterpret_cast(mem_lits); - for (unsigned i = 0; i < num_lits; i++) + for (unsigned i = 0; i < num_lits; ++i) cnstr->m_lits[i] = lits[i]; cnstr->m_xs = reinterpret_cast(mem_xs); cnstr->m_as = reinterpret_cast(mem_as); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { TRACE(qe_lite, tout << "xs[" << i << "]: " << xs[i] << "\n";); cnstr->m_xs[i] = xs[i]; new (cnstr->m_as + i) rational(as[i]); } cnstr->m_c = c; DEBUG_CODE({ - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { SASSERT(cnstr->m_xs[i] == xs[i]); SASSERT(cnstr->m_as[i] == as[i]); } @@ -1198,13 +1198,13 @@ namespace fm { // multiply as and c, by the lcm of their denominators void mk_int(unsigned num, rational * as, rational & c) { rational l = denominator(c); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) l = lcm(l, denominator(as[i])); if (l.is_one()) return; c *= l; SASSERT(c.is_int()); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { as[i] *= l; SASSERT(as[i].is_int()); } @@ -1217,7 +1217,7 @@ namespace fm { rational g = c.m_c; if (g.is_neg()) g.neg(); - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (g.is_one()) break; if (c.m_as[i].is_pos()) @@ -1228,12 +1228,12 @@ namespace fm { if (g.is_one()) return; c.m_c /= g; - for (unsigned i = 0; i < c.m_num_vars; i++) + for (unsigned i = 0; i < c.m_num_vars; ++i) c.m_as[i] /= g; } void display(std::ostream & out, constraint const & c) const { - for (unsigned i = 0; i < c.m_num_lits; i++) { + for (unsigned i = 0; i < c.m_num_lits; ++i) { literal l = c.m_lits[i]; if (sign(l)) out << "~"; @@ -1244,7 +1244,7 @@ namespace fm { out << "("; if (c.m_num_vars == 0) out << "0"; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (i > 0) out << " + "; if (!c.m_as[i].is_one()) @@ -1282,12 +1282,12 @@ namespace fm { m_counter += c1.m_num_lits + c2.m_num_lits; - for (unsigned i = 0; i < c1.m_num_vars; i++) { + for (unsigned i = 0; i < c1.m_num_vars; ++i) { m_var2pos[c1.m_xs[i]] = i; } bool failed = false; - for (unsigned i = 0; i < c2.m_num_vars; i++) { + for (unsigned i = 0; i < c2.m_num_vars; ++i) { unsigned pos1 = m_var2pos[c2.m_xs[i]]; if (pos1 == UINT_MAX || c1.m_as[pos1] != c2.m_as[i]) { failed = true; @@ -1295,21 +1295,21 @@ namespace fm { } } - for (unsigned i = 0; i < c1.m_num_vars; i++) { + for (unsigned i = 0; i < c1.m_num_vars; ++i) { m_var2pos[c1.m_xs[i]] = UINT_MAX; } if (failed) return false; - for (unsigned i = 0; i < c2.m_num_lits; i++) { + for (unsigned i = 0; i < c2.m_num_lits; ++i) { literal l = c2.m_lits[i]; bvar b = lit2bvar(l); SASSERT(m_bvar2sign[b] == 0); m_bvar2sign[b] = sign(l) ? -1 : 1; } - for (unsigned i = 0; i < c1.m_num_lits; i++) { + for (unsigned i = 0; i < c1.m_num_lits; ++i) { literal l = c1.m_lits[i]; bvar b = lit2bvar(l); char s = sign(l) ? -1 : 1; @@ -1319,7 +1319,7 @@ namespace fm { } } - for (unsigned i = 0; i < c2.m_num_lits; i++) { + for (unsigned i = 0; i < c2.m_num_lits; ++i) { literal l = c2.m_lits[i]; bvar b = lit2bvar(l); m_bvar2sign[b] = 0; @@ -1337,7 +1337,7 @@ namespace fm { var best = UINT_MAX; unsigned best_sz = UINT_MAX; bool best_lower = false; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { var xi = c.m_xs[i]; if (is_forbidden(xi)) continue; // variable is not in the index @@ -1436,7 +1436,7 @@ namespace fm { expr_fast_mark1 visited; forbidden_proc proc(*this); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g[i]; if (is_occ(f)) { TRACE(qe_lite, tout << "OCC: " << mk_ismt2_pp(f, m) << "\n";); @@ -1488,7 +1488,7 @@ namespace fm { } bool all_int(constraint const & c) const { - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (!is_int(c.m_xs[i])) return false; } @@ -1507,7 +1507,7 @@ namespace fm { else { bool int_cnstr = all_int(c); ptr_buffer ms; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { expr * x = m_var2expr.get(c.m_xs[i]); if (!int_cnstr && is_int(c.m_xs[i])) x = m_util.mk_to_real(x); @@ -1538,7 +1538,7 @@ namespace fm { } ptr_buffer lits; - for (unsigned i = 0; i < c.m_num_lits; i++) { + for (unsigned i = 0; i < c.m_num_lits; ++i) { literal l = c.m_lits[i]; if (sign(l)) lits.push_back(m.mk_not(m_bvar2expr.get(lit2bvar(l)))); @@ -1634,7 +1634,7 @@ namespace fm { #if Z3DEBUG bool found_ineq = false; #endif - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * l = args[i]; if (is_literal(l)) { lits.push_back(to_literal(l)); @@ -1665,7 +1665,7 @@ namespace fm { } bool all_int = true; - for (unsigned j = 0; j < num_mons; j++) { + for (unsigned j = 0; j < num_mons; ++j) { expr * monomial = mons[j]; expr * a; rational a_val; @@ -1693,7 +1693,7 @@ namespace fm { } } - TRACE(qe_lite, tout << "before mk_constraint: "; for (unsigned i = 0; i < xs.size(); i++) tout << " " << xs[i]; tout << "\n";); + TRACE(qe_lite, tout << "before mk_constraint: "; for (unsigned i = 0; i < xs.size(); ++i) tout << " " << xs[i]; tout << "\n";); constraint * new_c = mk_constraint(lits.size(), lits.data(), @@ -1723,7 +1723,7 @@ namespace fm { bool r = false; - for (unsigned i = 0; i < c->m_num_vars; i++) { + for (unsigned i = 0; i < c->m_num_vars; ++i) { var x = c->m_xs[i]; if (!is_forbidden(x)) { r = true; @@ -1749,7 +1749,7 @@ namespace fm { void init_use_list(expr_ref_vector const & g) { unsigned sz = g.size(); - for (unsigned i = 0; !m_inconsistent && i < sz; i++) { + for (unsigned i = 0; !m_inconsistent && i < sz; ++i) { expr * f = g[i]; if (is_occ(f)) add_constraint(f, nullptr); @@ -1787,7 +1787,7 @@ namespace fm { void sort_candidates(var_vector & xs) { svector x_cost_vector; unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (!is_forbidden(x)) { x_cost_vector.push_back(x_cost(x, get_cost(x))); } @@ -1807,7 +1807,7 @@ namespace fm { void cleanup_constraints(constraints & cs) { unsigned j = 0; unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { constraint * c = cs[i]; if (c->m_dead) continue; @@ -1823,7 +1823,7 @@ namespace fm { void analyze(constraint const & c, var x, bool & all_int, bool & unit_coeff) const { all_int = true; unit_coeff = true; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (!is_int(c.m_xs[i])) { all_int = false; return; @@ -1884,7 +1884,7 @@ namespace fm { } void get_coeff(constraint const & c, var x, rational & a) { - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (c.m_xs[i] == x) { a = c.m_as[i]; return; @@ -1913,7 +1913,7 @@ namespace fm { rational new_c = l.m_c*b + u.m_c*a; bool new_strict = l.m_strict || u.m_strict; - for (unsigned i = 0; i < l.m_num_vars; i++) { + for (unsigned i = 0; i < l.m_num_vars; ++i) { var xi = l.m_xs[i]; if (xi == x) continue; @@ -1926,7 +1926,7 @@ namespace fm { SASSERT(new_xs.size() == new_as.size()); } - for (unsigned i = 0; i < u.m_num_vars; i++) { + for (unsigned i = 0; i < u.m_num_vars; ++i) { var xi = u.m_xs[i]; if (xi == x) continue; @@ -1944,7 +1944,7 @@ namespace fm { bool all_int = true; unsigned sz = new_xs.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (new_as[i].is_zero()) continue; if (!is_int(new_xs[i])) @@ -1964,7 +1964,7 @@ namespace fm { } // reset m_var2pos - for (unsigned i = 0; i < l.m_num_vars; i++) { + for (unsigned i = 0; i < l.m_num_vars; ++i) { m_var2pos[l.m_xs[i]] = UINT_MAX; } @@ -1978,7 +1978,7 @@ namespace fm { } new_lits.reset(); - for (unsigned i = 0; i < l.m_num_lits; i++) { + for (unsigned i = 0; i < l.m_num_lits; ++i) { literal lit = l.m_lits[i]; bvar p = lit2bvar(lit); m_bvar2sign[p] = sign(lit) ? -1 : 1; @@ -1986,7 +1986,7 @@ namespace fm { } bool tautology = false; - for (unsigned i = 0; i < u.m_num_lits && !tautology; i++) { + for (unsigned i = 0; i < u.m_num_lits && !tautology; ++i) { literal lit = u.m_lits[i]; bvar p = lit2bvar(lit); switch (m_bvar2sign[p]) { @@ -2007,7 +2007,7 @@ namespace fm { } // reset m_bvar2sign - for (unsigned i = 0; i < l.m_num_lits; i++) { + for (unsigned i = 0; i < l.m_num_lits; ++i) { literal lit = l.m_lits[i]; bvar p = lit2bvar(lit); m_bvar2sign[p] = 0; @@ -2090,8 +2090,8 @@ namespace fm { unsigned limit = num_old_cnstrs + m_fm_extra; unsigned num_new_cnstrs = 0; new_constraints.reset(); - for (unsigned i = 0; i < num_lowers; i++) { - for (unsigned j = 0; j < num_uppers; j++) { + for (unsigned i = 0; i < num_lowers; ++i) { + for (unsigned j = 0; j < num_uppers; ++j) { if (m_inconsistent || num_new_cnstrs > limit) { TRACE(qe_lite, tout << "too many new constraints: " << num_new_cnstrs << "\n";); del_constraints(new_constraints.size(), new_constraints.data()); @@ -2113,7 +2113,7 @@ namespace fm { m_counter += sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { constraint * c = new_constraints[i]; backward_subsumption(*c); register_constraint(c); @@ -2167,7 +2167,7 @@ namespace fm { sort_candidates(candidates); unsigned num = candidates.size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { checkpoint(); if (m_counter > m_fm_limit) break; @@ -2199,7 +2199,7 @@ namespace fm { void display(std::ostream & out) const { unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (is_forbidden(x)) continue; out << mk_ismt2_pp(m_var2expr.get(x), m) << "\n"; diff --git a/src/qe/mbp/mbp_arrays.cpp b/src/qe/mbp/mbp_arrays.cpp index 201096bcd..269aea213 100644 --- a/src/qe/mbp/mbp_arrays.cpp +++ b/src/qe/mbp/mbp_arrays.cpp @@ -230,7 +230,7 @@ namespace mbp { expr_ref val (m); unsigned num_diff = diff_val_consts.size (); SASSERT (num_diff == I.size ()); - for (unsigned i = 0; i < num_diff; i++) { + for (unsigned i = 0; i < num_diff; ++i) { // mk val term ptr_vector sel_args; sel_args.push_back (arr); @@ -276,7 +276,7 @@ namespace mbp { expr_ref_vector idx_diseq (m); if (!I.empty ()) { expr_ref_vector vals = (*m_mev)(idxs); - for (unsigned i = 0; i < I.size () && !idx_in_I; i++) { + for (unsigned i = 0; i < I.size () && !idx_in_I; ++i) { if (is_eq(idxs, I.get(i))) { idx_in_I = true; } @@ -351,7 +351,7 @@ namespace mbp { TRACE(qe, tout << "after factoring selects:\n"; tout << mk_pp (p_exp, m) << "\n"; - for (unsigned i = m_aux_lits_v.size () - m_aux_vars.size (); i < m_aux_lits_v.size (); i++) { + for (unsigned i = m_aux_lits_v.size () - m_aux_vars.size (); i < m_aux_lits_v.size (); ++i) { tout << mk_pp (m_aux_lits_v.get (i), m) << "\n"; } ); @@ -402,7 +402,7 @@ namespace mbp { } unsigned nd = 0; // nesting depth - for (nd = 1; m_arr_u.is_store (store); nd++, store = to_app (store->get_arg (0))) { + for (nd = 1; m_arr_u.is_store (store); ++nd, store = to_app (store->get_arg (0))) { /* empty */ ; } if (store != m_v) { @@ -445,7 +445,7 @@ namespace mbp { DEBUG_CODE(for (unsigned i = 0; i + 1 < true_eqs.size(); ++i) SASSERT(true_eqs[i].first <= true_eqs[i+1].first);); // search for subst term - for (unsigned i = 0; !m_subst_term_v && i < true_eqs.size(); i++) { + for (unsigned i = 0; !m_subst_term_v && i < true_eqs.size(); ++i) { app* eq = true_eqs[i].second; m_true_sub_v.insert (eq, m.mk_true ()); // try to find subst term @@ -502,7 +502,7 @@ namespace mbp { m_mev = &mev; unsigned j = 0; - for (unsigned i = 0; i < arr_vars.size (); i++) { + for (unsigned i = 0; i < arr_vars.size (); ++i) { reset_v (); m_v = arr_vars.get (i); if (!m_arr_u.is_array (m_v)) { @@ -898,7 +898,7 @@ namespace mbp { expr_ref_vector idxs(m, arity, a->get_args() + 1); expr_ref_vector vals = (*m_mev)(idxs); bool is_new = true; - for (unsigned j = start; j < m_idxs.size (); j++) { + for (unsigned j = start; j < m_idxs.size (); ++j) { if (!is_eq(m_idxs[j].val, vals)) continue; // idx belongs to the jth equivalence class; // substitute sel term with ith sel const diff --git a/src/qe/mbp/mbp_arrays_tg.cpp b/src/qe/mbp/mbp_arrays_tg.cpp index 6efd27143..8073ea866 100644 --- a/src/qe/mbp/mbp_arrays_tg.cpp +++ b/src/qe/mbp/mbp_arrays_tg.cpp @@ -409,10 +409,10 @@ struct mbp_array_tg::impl { } if (!m_use_mdl) return progress; - for (unsigned i = 0; i < rdTerms.size(); i++) { + for (unsigned i = 0; i < rdTerms.size(); ++i) { app* e1 = rdTerms.get(i); expr* a1 = e1->get_arg(0); - for (unsigned j = i + 1; j < rdTerms.size(); j++) { + for (unsigned j = i + 1; j < rdTerms.size(); ++j) { app* e2 = rdTerms.get(j); if (!is_seen(e1, e2) && a1 == e2) { mark_seen(e1, e2); diff --git a/src/qe/mbp/mbp_dt_tg.cpp b/src/qe/mbp/mbp_dt_tg.cpp index 824c7140b..aee54c459 100644 --- a/src/qe/mbp/mbp_dt_tg.cpp +++ b/src/qe/mbp/mbp_dt_tg.cpp @@ -85,7 +85,7 @@ struct mbp_dt_tg::impl { m_dt_util.get_accessor_constructor(to_app(term)->get_decl()); ptr_vector const *accessors = m_dt_util.get_constructor_accessors(cons); - for (unsigned i = 0; i < accessors->size(); i++) { + for (unsigned i = 0; i < accessors->size(); ++i) { func_decl *d = accessors->get(i); sel = m.mk_app(d, v); u = m_tg.get_const_in_class(sel); @@ -111,7 +111,7 @@ struct mbp_dt_tg::impl { tout << "applying deconstruct_eq on " << expr_ref(cons, m);); ptr_vector const *accessors = m_dt_util.get_constructor_accessors(to_app(cons)->get_decl()); - for (unsigned i = 0; i < accessors->size(); i++) { + for (unsigned i = 0; i < accessors->size(); ++i) { expr_ref a(m.mk_app(accessors->get(i), rhs), m); expr *newRhs = to_app(cons)->get_arg(i); m_tg.add_eq(a, newRhs); @@ -139,7 +139,7 @@ struct mbp_dt_tg::impl { } m_tg.add_lit(a); - for (unsigned i = 0; i < accessors->size(); i++) { + for (unsigned i = 0; i < accessors->size(); ++i) { expr_ref a(m.mk_app(accessors->get(i), rhs), m); expr *newRhs = to_app(cons)->get_arg(i); if (!m_mdl.are_equal(a, newRhs)) { @@ -156,7 +156,7 @@ struct mbp_dt_tg::impl { TRACE(mbp_tg, tout << "Iterating over terms of tg";); // Not resetting terms because get_terms calls resize on terms m_tg.get_terms(terms, false); - for (unsigned i = 0; i < terms.size(); i++) { + for (unsigned i = 0; i < terms.size(); ++i) { term = terms.get(i); if (is_seen(term)) continue; if (m_tg.is_cgr(term)) continue; diff --git a/src/qe/qe_tactic.cpp b/src/qe/qe_tactic.cpp index 76f4f5715..6c3c357f4 100644 --- a/src/qe/qe_tactic.cpp +++ b/src/qe/qe_tactic.cpp @@ -55,7 +55,7 @@ class qe_tactic : public tactic { bool produce_proofs = g->proofs_enabled(); unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); if (g->inconsistent()) break; diff --git a/src/sat/sat_asymm_branch.cpp b/src/sat/sat_asymm_branch.cpp index 29ef5f56e..0aed69d61 100644 --- a/src/sat/sat_asymm_branch.cpp +++ b/src/sat/sat_asymm_branch.cpp @@ -354,7 +354,7 @@ namespace sat { bool found_conflict = false; unsigned i = 0, sz = c.size(); s.push(); - for (i = 0; !found_conflict && i < sz; i++) { + for (i = 0; !found_conflict && i < sz; ++i) { if (i == flip_index) continue; found_conflict = propagate_literal(c, ~c[i]); } @@ -369,7 +369,7 @@ namespace sat { bool asymm_branch::cleanup(scoped_detach& scoped_d, clause& c, unsigned skip_idx, unsigned new_sz) { unsigned j = 0; - for (unsigned i = 0; i < new_sz; i++) { + for (unsigned i = 0; i < new_sz; ++i) { if (skip_idx == i) continue; literal l = c[i]; switch (s.value(l)) { @@ -441,7 +441,7 @@ namespace sat { SASSERT(sz > 0); unsigned i; // check if the clause is already satisfied - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { if (s.value(c[i]) == l_true) { s.detach_clause(c); s.del_clause(c); diff --git a/src/sat/sat_big.cpp b/src/sat/sat_big.cpp index 8da963729..96ab78cb1 100644 --- a/src/sat/sat_big.cpp +++ b/src/sat/sat_big.cpp @@ -32,7 +32,7 @@ namespace sat { literal_vector lits, r; SASSERT(num_lits == m_dag.size() && num_lits == m_roots.size()); size_t_map seen_idx; - for (unsigned l_idx = 0; l_idx < num_lits; l_idx++) { + for (unsigned l_idx = 0; l_idx < num_lits; ++l_idx) { literal u = to_literal(l_idx); if (s.was_eliminated(u.var())) continue; @@ -122,7 +122,7 @@ namespace sat { } svector todo; // retrieve literals that have no predecessors - for (unsigned l_idx = 0; l_idx < num_lits; l_idx++) { + for (unsigned l_idx = 0; l_idx < num_lits; ++l_idx) { literal u(to_literal(l_idx)); if (m_roots[u.index()]) { todo.push_back(pframe(null_literal, u)); diff --git a/src/sat/sat_clause.cpp b/src/sat/sat_clause.cpp index 351a80281..c59ce7289 100644 --- a/src/sat/sat_clause.cpp +++ b/src/sat/sat_clause.cpp @@ -42,7 +42,7 @@ namespace sat { var_approx_set clause::approx(unsigned num, literal const * lits) { var_approx_set r; - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) r.insert(lits[i].var()); return r; } @@ -75,12 +75,12 @@ namespace sat { void clause::elim(literal l) { unsigned i; - for (i = 0; i < m_size; i++) + for (i = 0; i < m_size; ++i) if (m_lits[i] == l) break; SASSERT(i < m_size); i++; - for (; i < m_size; i++) + for (; i < m_size; ++i) m_lits[i-1] = m_lits[i]; m_lits[m_size-1] = l; m_size--; @@ -151,7 +151,7 @@ namespace sat { memcpy(m_clause->m_lits, lits, sizeof(literal) * num_lits); } SASSERT(m_clause->m_size <= m_clause->m_capacity); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { SASSERT((*m_clause)[i] == lits[i]); } } @@ -205,7 +205,7 @@ namespace sat { std::ostream & operator<<(std::ostream & out, clause const & c) { out << "("; - for (unsigned i = 0; i < c.size(); i++) { + for (unsigned i = 0; i < c.size(); ++i) { if (i > 0) out << " "; out << c[i]; } @@ -225,7 +225,7 @@ namespace sat { bool clause_wrapper::contains(literal l) const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (operator[](i) == l) return true; return false; @@ -233,7 +233,7 @@ namespace sat { bool clause_wrapper::contains(bool_var v) const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (operator[](i).var() == v) return true; return false; diff --git a/src/sat/sat_cleaner.cpp b/src/sat/sat_cleaner.cpp index 20545476d..46b94b52c 100644 --- a/src/sat/sat_cleaner.cpp +++ b/src/sat/sat_cleaner.cpp @@ -87,12 +87,12 @@ namespace sat { for (; it != end; ++it) { clause & c = *(*it); TRACE(sat_cleaner_bug, tout << "cleaning: " << c << "\n"; - for (unsigned i = 0; i < c.size(); i++) tout << c[i] << ": " << s.value(c[i]) << "\n";); + for (unsigned i = 0; i < c.size(); ++i) tout << c[i] << ": " << s.value(c[i]) << "\n";); CTRACE(sat_cleaner_frozen, c.frozen(), tout << c << "\n";); unsigned sz = c.size(); unsigned i = 0, j = 0; m_cleanup_counter += sz; - for (; i < sz; i++) { + for (; i < sz; ++i) { switch (s.value(c[i])) { case l_true: goto end_loop; diff --git a/src/sat/sat_elim_eqs.cpp b/src/sat/sat_elim_eqs.cpp index 05e0fc3a8..f761ef926 100644 --- a/src/sat/sat_elim_eqs.cpp +++ b/src/sat/sat_elim_eqs.cpp @@ -104,7 +104,7 @@ namespace sat { TRACE(sats, tout << "processing: " << c << "\n";); unsigned sz = c.size(); unsigned i; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { literal l = c[i]; literal r = norm(roots, l); if (l != r) @@ -127,7 +127,7 @@ namespace sat { } // apply substitution - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { literal lit = c[i]; c[i] = norm(roots, lit); VERIFY(c[i] == norm(roots, c[i])); @@ -145,7 +145,7 @@ namespace sat { // remove duplicates, and check if it is a tautology unsigned j = 0; literal l_prev = null_literal; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { literal l = c[i]; if (l == ~l_prev) { break; diff --git a/src/sat/sat_gc.cpp b/src/sat/sat_gc.cpp index 10e96f243..e9d77d1e7 100644 --- a/src/sat/sat_gc.cpp +++ b/src/sat/sat_gc.cpp @@ -161,7 +161,7 @@ namespace sat { unsigned sz = m_learned.size(); unsigned new_sz = sz/2; // std::min(sz/2, m_clauses.size()*2); unsigned j = new_sz; - for (unsigned i = new_sz; i < sz; i++) { + for (unsigned i = new_sz; i < sz; ++i) { clause & c = *(m_learned[i]); if (can_delete(c)) { detach_clause(c); @@ -200,7 +200,7 @@ namespace sat { // d_tk unsigned h = 0; unsigned V_tk = 0; - for (bool_var v = 0; v < num_vars(); v++) { + for (bool_var v = 0; v < num_vars(); ++v) { if (m_assigned_since_gc[v]) { V_tk++; m_assigned_since_gc[v] = false; @@ -289,7 +289,7 @@ namespace sat { // do some cleanup unsigned sz = c.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = c[i]; switch (value(l)) { case l_true: diff --git a/src/sat/sat_integrity_checker.cpp b/src/sat/sat_integrity_checker.cpp index dac2345f6..b10d243c2 100644 --- a/src/sat/sat_integrity_checker.cpp +++ b/src/sat/sat_integrity_checker.cpp @@ -57,7 +57,7 @@ namespace sat { bool integrity_checker::check_clause(clause const & c) const { CTRACE(sat_bug, c.was_removed(), s.display(tout << "c: " << c.id() << ": " << c << "\n")); SASSERT(!c.was_removed()); - for (unsigned i = 0; i < c.size(); i++) { + for (unsigned i = 0; i < c.size(); ++i) { VERIFY(c[i].var() <= s.num_vars()); CTRACE(sat_bug, s.was_eliminated(c[i].var()), tout << "l: " << c[i].var() << "\n"; @@ -74,7 +74,7 @@ namespace sat { { if (s.value(c[0]) == l_false || s.value(c[1]) == l_false) { bool on_prop_stack = false; - for (unsigned i = s.m_qhead; i < s.m_trail.size(); i++) { + for (unsigned i = s.m_qhead; i < s.m_trail.size(); ++i) { if (s.m_trail[i].var() == c[0].var() || s.m_trail[i].var() == c[1].var()) { on_prop_stack = true; @@ -83,10 +83,10 @@ namespace sat { } // the clause has been satisfied or all other literals are assigned to false. if (!on_prop_stack && s.status(c) != l_true) { - for (unsigned i = 2; i < c.size(); i++) { + for (unsigned i = 2; i < c.size(); ++i) { CTRACE(sat_bug, s.value(c[i]) != l_false, tout << c << " status: " << s.status(c) << "\n"; - for (unsigned i = 0; i < c.size(); i++) tout << "val(" << i << "): " << s.value(c[i]) << "\n";); + for (unsigned i = 0; i < c.size(); ++i) tout << "val(" << i << "): " << s.value(c[i]) << "\n";); VERIFY(s.value(c[i]) == l_false); } } @@ -133,7 +133,7 @@ namespace sat { VERIFY(s.m_phase.size() == s.num_vars()); VERIFY(s.m_prev_phase.size() == s.num_vars()); VERIFY(s.m_assigned_since_gc.size() == s.num_vars()); - for (bool_var v = 0; v < s.num_vars(); v++) { + for (bool_var v = 0; v < s.num_vars(); ++v) { if (s.was_eliminated(v)) { VERIFY(s.get_wlist(literal(v, false)).empty()); VERIFY(s.get_wlist(literal(v, true)).empty()); diff --git a/src/sat/sat_probing.cpp b/src/sat/sat_probing.cpp index 604e8ff6c..f1830623a 100644 --- a/src/sat/sat_probing.cpp +++ b/src/sat/sat_probing.cpp @@ -52,7 +52,7 @@ namespace sat { entry.m_available = true; entry.m_lits.reset(); unsigned tr_sz = s.m_trail.size(); - for (unsigned i = old_tr_sz; i < tr_sz; i++) { + for (unsigned i = old_tr_sz; i < tr_sz; ++i) { entry.m_lits.push_back(s.m_trail[i]); if (s.m_config.m_drat) { s.m_drat.add(~l, s.m_trail[i], status::redundant()); @@ -98,7 +98,7 @@ namespace sat { } // collect literals that were assigned after assigning l unsigned tr_sz = s.m_trail.size(); - for (unsigned i = old_tr_sz; i < tr_sz; i++) { + for (unsigned i = old_tr_sz; i < tr_sz; ++i) { if (m_assigned.contains(s.m_trail[i])) { m_to_assert.push_back(s.m_trail[i]); } @@ -145,7 +145,7 @@ namespace sat { // collect literals that were assigned after assigning l m_assigned.reset(); unsigned tr_sz = s.m_trail.size(); - for (unsigned i = old_tr_sz; i < tr_sz; i++) { + for (unsigned i = old_tr_sz; i < tr_sz; ++i) { literal lit = s.m_trail[i]; m_assigned.insert(lit); @@ -246,7 +246,7 @@ namespace sat { int limit = -static_cast(m_probing_limit); unsigned i; unsigned num = s.num_vars(); - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { bool_var v = (m_stopped_at + i) % num; if (m_counter < limit) { m_stopped_at = v; diff --git a/src/sat/sat_scc.cpp b/src/sat/sat_scc.cpp index c6302594d..8308a7ea5 100644 --- a/src/sat/sat_scc.cpp +++ b/src/sat/sat_scc.cpp @@ -81,7 +81,7 @@ namespace sat { unsigned next_index = 0; svector frames; - for (unsigned l_idx = 0; l_idx < num_lits; l_idx++) { + for (unsigned l_idx = 0; l_idx < num_lits; ++l_idx) { if (index[l_idx] != UINT_MAX) continue; if (m_solver.was_eliminated(to_literal(l_idx).var())) @@ -234,7 +234,7 @@ namespace sat { bool_var_vector to_elim; if (!extract_roots(roots, to_elim)) return 0; - TRACE(scc, for (unsigned i = 0; i < roots.size(); i++) { tout << i << " -> " << roots[i] << "\n"; } + TRACE(scc, for (unsigned i = 0; i < roots.size(); ++i) { tout << i << " -> " << roots[i] << "\n"; } tout << "to_elim: "; for (unsigned v : to_elim) tout << v << " "; tout << "\n";); m_num_elim += to_elim.size(); elim_eqs eliminator(m_solver); diff --git a/src/sat/sat_simplifier.cpp b/src/sat/sat_simplifier.cpp index e4a797d0f..18e628820 100644 --- a/src/sat/sat_simplifier.cpp +++ b/src/sat/sat_simplifier.cpp @@ -316,7 +316,7 @@ namespace sat { if (learned && vars_eliminated) { unsigned sz = c.size(); unsigned i; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { if (was_eliminated(c[i].var())) break; } @@ -585,7 +585,7 @@ namespace sat { bool r = false; unsigned sz = c.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = c[i]; switch (value(l)) { case l_undef: @@ -625,7 +625,7 @@ namespace sat { bool simplifier::cleanup_clause(literal_vector & c) { unsigned sz = c.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = c[i]; switch (value(l)) { case l_undef: @@ -653,7 +653,7 @@ namespace sat { return; m_use_list.reserve(s.num_vars()); unsigned new_trail_sz = s.m_trail.size(); - for (unsigned i = old_trail_sz; i < new_trail_sz; i++) { + for (unsigned i = old_trail_sz; i < new_trail_sz; ++i) { literal l = s.m_trail[i]; // put clauses with literals assigned to false back into todo-list for (auto it = m_use_list.get(~l).mk_iterator(); !it.at_end(); it.next()) { @@ -727,12 +727,12 @@ namespace sat { bool simplifier::subsume_with_binaries() { unsigned init = s.m_rand(); // start in a random place, since subsumption can be aborted unsigned num_lits = s.m_watches.size(); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { unsigned l_idx = (i + init) % num_lits; watch_list & wlist = get_wlist(to_literal(l_idx)); literal l = ~to_literal(l_idx); // should not traverse wlist using iterators, since back_subsumption1 may add new binary clauses there - for (unsigned j = 0; j < wlist.size(); j++) { + for (unsigned j = 0; j < wlist.size(); ++j) { watched w = wlist[j]; if (w.is_binary_non_learned_clause()) { literal l2 = w.get_literal(); @@ -1072,7 +1072,7 @@ namespace sat { void insert_queue() { m_queue.reset(); unsigned num_vars = s.s.num_vars(); - for (bool_var v = 0; v < num_vars; v++) { + for (bool_var v = 0; v < num_vars; ++v) { if (process_var(v)) { insert(literal(v, false)); insert(literal(v, true)); @@ -1656,7 +1656,7 @@ namespace sat { m_counter -= c.size(); unsigned sz = c.size(); unsigned i; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { if (s.is_marked(~c[i])) break; } diff --git a/src/sat/sat_solver.cpp b/src/sat/sat_solver.cpp index 5c85d087a..ad2bae1a5 100644 --- a/src/sat/sat_solver.cpp +++ b/src/sat/sat_solver.cpp @@ -151,7 +151,7 @@ namespace sat { } // create new vars - for (bool_var v = num_vars(); v < src.num_vars(); v++) { + for (bool_var v = num_vars(); v < src.num_vars(); ++v) { bool ext = src.m_external[v]; bool dvar = src.m_decision[v]; VERIFY(v == mk_var(ext, dvar)); @@ -344,7 +344,7 @@ namespace sat { DEBUG_CODE({ - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { CTRACE(sat, was_eliminated(lits[i]), tout << lits[i] << " was eliminated\n";); SASSERT(!was_eliminated(lits[i])); } @@ -760,7 +760,7 @@ namespace sat { unsigned max_false_idx = UINT_MAX; unsigned unknown_idx = UINT_MAX; unsigned n = cls.size(); - for (unsigned i = starting_at; i < n; i++) { + for (unsigned i = starting_at; i < n; ++i) { literal l = cls[i]; switch(value(l)) { case l_false: @@ -799,7 +799,7 @@ namespace sat { SASSERT(cls.size() >= 2); unsigned max_false_idx = UINT_MAX; unsigned num_lits = cls.size(); - for (unsigned i = 1; i < num_lits; i++) { + for (unsigned i = 1; i < num_lits; ++i) { literal l = cls[i]; CTRACE(sat, value(l) != l_false, tout << l << ":=" << value(l);); SASSERT(value(l) == l_false); @@ -815,7 +815,7 @@ namespace sat { literal prev = null_literal; unsigned i = 0; unsigned j = 0; - for (; i < num_lits; i++) { + for (; i < num_lits; ++i) { literal curr = lits[i]; lbool val = value(curr); if (!lvl0 && lvl(curr) > 0) @@ -2140,7 +2140,7 @@ namespace sat { m_model_is_current = true; unsigned num = num_vars(); m_model.resize(num, l_undef); - for (bool_var v = 0; v < num; v++) { + for (bool_var v = 0; v < num; ++v) { if (!was_eliminated(v)) { m_model[v] = value(v); m_phase[v] = value(v) == l_true; @@ -2150,7 +2150,7 @@ namespace sat { TRACE(sat_mc_bug, m_mc.display(tout);); #if 0 - IF_VERBOSE(2, for (bool_var v = 0; v < num; v++) verbose_stream() << v << ": " << m_model[v] << "\n";); + IF_VERBOSE(2, for (bool_var v = 0; v < num; ++v) verbose_stream() << v << ": " << m_model[v] << "\n";); for (auto p : big::s_del_bin) { if (value(p.first) != l_true && value(p.second) != l_true) { IF_VERBOSE(2, verbose_stream() << "binary violation: " << p.first << " " << p.second << "\n"); @@ -2174,12 +2174,12 @@ namespace sat { if (m_clone && !check_clauses(m_model)) { IF_VERBOSE(1, verbose_stream() << "failure checking clauses on transformed model\n";); IF_VERBOSE(10, m_mc.display(verbose_stream())); - IF_VERBOSE(1, for (bool_var v = 0; v < num; v++) verbose_stream() << v << ": " << m_model[v] << "\n";); + IF_VERBOSE(1, for (bool_var v = 0; v < num; ++v) verbose_stream() << v << ": " << m_model[v] << "\n";); throw solver_exception("check model failed"); } - TRACE(sat, for (bool_var v = 0; v < num; v++) tout << v << ": " << m_model[v] << "\n";); + TRACE(sat, for (bool_var v = 0; v < num; ++v) tout << v << ": " << m_model[v] << "\n";); if (m_clone) { IF_VERBOSE(1, verbose_stream() << "\"checking model (on original set of clauses)\"\n";); @@ -2529,7 +2529,7 @@ namespace sat { } } unsigned sz = c.size(); - for (; i < sz; i++) + for (; i < sz; ++i) process_antecedent(~c[i], num_marks); break; } @@ -2699,7 +2699,7 @@ namespace sat { } } unsigned sz = c.size(); - for (; i < sz; i++) + for (; i < sz; ++i) process_antecedent_for_unsat_core(~c[i]); break; } @@ -2910,7 +2910,7 @@ namespace sat { unsigned from_lvl = m_conflict_lvl; unsigned head = from_lvl == 0 ? 0 : m_scopes[from_lvl - 1].m_trail_lim; unsigned sz = m_trail.size(); - for (unsigned i = head; i < sz; i++) { + for (unsigned i = head; i < sz; ++i) { bool_var v = m_trail[i].var(); TRACE(forget_phase, tout << "forgetting phase of v" << v << "\n";); m_phase[v] = m_rand() % 2 == 0; @@ -3079,7 +3079,7 @@ namespace sat { unsigned solver::num_diff_levels(unsigned num, literal const * lits) { m_diff_levels.reserve(scope_lvl() + 1, false); unsigned r = 0; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { SASSERT(value(lits[i]) != l_undef); unsigned lit_lvl = lvl(lits[i]); if (!m_diff_levels[lit_lvl]) { @@ -3088,7 +3088,7 @@ namespace sat { } } // reset m_diff_levels. - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) m_diff_levels[lvl(lits[i])] = false; return r; } @@ -3097,7 +3097,7 @@ namespace sat { m_diff_levels.reserve(scope_lvl() + 1, false); glue = 0; unsigned i = 0; - for (; i < num && glue < max_glue; i++) { + for (; i < num && glue < max_glue; ++i) { SASSERT(value(lits[i]) != l_undef); unsigned lit_lvl = lvl(lits[i]); if (!m_diff_levels[lit_lvl]) { @@ -3115,7 +3115,7 @@ namespace sat { m_diff_levels.reserve(scope_lvl() + 1, false); glue = 0; unsigned i = 0; - for (; i < num && glue < max_glue; i++) { + for (; i < num && glue < max_glue; ++i) { if (value(lits[i]) == l_false) { unsigned lit_lvl = lvl(lits[i]); if (!m_diff_levels[lit_lvl]) { @@ -3201,7 +3201,7 @@ namespace sat { i = 2; } unsigned sz = c.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { if (!process_antecedent_for_minimization(~c[i])) { reset_unmark(old_size); return false; @@ -3236,7 +3236,7 @@ namespace sat { */ void solver::reset_unmark(unsigned old_size) { unsigned curr_size = m_unmark.size(); - for(unsigned i = old_size; i < curr_size; i++) + for(unsigned i = old_size; i < curr_size; ++i) reset_mark(m_unmark[i]); m_unmark.shrink(old_size); } @@ -3296,7 +3296,7 @@ namespace sat { unsigned sz = m_lemma.size(); unsigned i = 1; // the first literal is the FUIP unsigned j = 1; - for (; i < sz; i++) { + for (; i < sz; ++i) { literal l = m_lemma[i]; if (implied_by_marked(l)) { m_unmark.push_back(l.var()); @@ -3380,7 +3380,7 @@ namespace sat { */ bool solver::dyn_sub_res() { unsigned sz = m_lemma.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { mark_lit(m_lemma[i]); } @@ -3390,7 +3390,7 @@ namespace sat { // In the following loop, we use unmark_lit(l) to remove a // literal from m_lemma. - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = m_lemma[i]; if (!is_marked_lit(l)) continue; // literal was eliminated @@ -3466,7 +3466,7 @@ namespace sat { SASSERT(is_marked_lit(m_lemma[0])); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal l = m_lemma[i]; if (is_marked_lit(l)) { unmark_lit(l); @@ -3664,7 +3664,7 @@ namespace sat { unsigned sz = m_clauses_to_reinit.size(); SASSERT(old_sz <= sz); unsigned j = old_sz; - for (unsigned i = old_sz; i < sz; i++) { + for (unsigned i = old_sz; i < sz; ++i) { clause_wrapper cw = m_clauses_to_reinit[i]; bool reinit = false; if (cw.is_binary()) { @@ -3836,7 +3836,7 @@ namespace sat { void solver::collect_bin_clauses(svector & r, bool redundant, bool learned_only) const { SASSERT(redundant || !learned_only); unsigned sz = m_watches.size(); - for (unsigned l_idx = 0; l_idx < sz; l_idx++) { + for (unsigned l_idx = 0; l_idx < sz; ++l_idx) { literal l = to_literal(l_idx); l.neg(); for (watched const& w : m_watches[l_idx]) { @@ -3872,7 +3872,7 @@ namespace sat { } bool solver::check_marks() const { - for (bool_var v = 0; v < num_vars(); v++) { + for (bool_var v = 0; v < num_vars(); ++v) { SASSERT(!is_marked(v)); } return true; @@ -3880,7 +3880,7 @@ namespace sat { std::ostream& solver::display_model(std::ostream& out) const { unsigned num = num_vars(); - for (bool_var v = 0; v < num; v++) { + for (bool_var v = 0; v < num; ++v) { out << v << ": " << m_model[v] << "\n"; } return out; @@ -3888,7 +3888,7 @@ namespace sat { void solver::display_binary(std::ostream & out) const { unsigned sz = m_watches.size(); - for (unsigned l_idx = 0; l_idx < sz; l_idx++) { + for (unsigned l_idx = 0; l_idx < sz; ++l_idx) { literal l = to_literal(l_idx); l.neg(); for (watched const& w : m_watches[l_idx]) { @@ -4002,7 +4002,7 @@ namespace sat { } } clause_vector const * vs[2] = { &m_clauses, &m_learned }; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { clause_vector const & cs = *(vs[i]); for (auto cp : cs) { for (literal l : *cp) { @@ -4037,7 +4037,7 @@ namespace sat { ++l_idx; } clause_vector const * vs[2] = { &m_clauses, &m_learned }; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { clause_vector const & cs = *(vs[i]); for (clause const* cp : cs) { clause const & c = *cp; @@ -4704,14 +4704,14 @@ namespace sat { } } unsigned num_elim = 0; - for (bool_var v = 0; v < num_vars(); v++) { + for (bool_var v = 0; v < num_vars(); ++v) { if (m_eliminated[v]) num_elim++; } unsigned num_ter = 0; unsigned num_cls = 0; clause_vector const * vs[2] = { &m_clauses, &m_learned }; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { clause_vector const & cs = *(vs[i]); for (clause* cp : cs) { clause & c = *cp; diff --git a/src/sat/sat_types.h b/src/sat/sat_types.h index 0a0695b68..b027d4f2e 100644 --- a/src/sat/sat_types.h +++ b/src/sat/sat_types.h @@ -70,7 +70,7 @@ namespace sat { inline std::ostream & operator<<(std::ostream & out, model const & m) { bool first = true; - for (bool_var v = 0; v < m.size(); v++) { + for (bool_var v = 0; v < m.size(); ++v) { if (m[v] == l_undef) continue; if (first) first = false; else out << " "; if (m[v] == l_true) out << v; else out << "-" << v; diff --git a/src/sat/smt/array_axioms.cpp b/src/sat/smt/array_axioms.cpp index 662314992..a28ac36cd 100644 --- a/src/sat/smt/array_axioms.cpp +++ b/src/sat/smt/array_axioms.cpp @@ -157,7 +157,7 @@ namespace array { unsigned num_args = select->get_num_args(); bool has_diff = false; - for (unsigned i = 1; i < num_args; i++) + for (unsigned i = 1; i < num_args; ++i) has_diff |= expr2enode(select->get_arg(i))->get_root() != expr2enode(store->get_arg(i))->get_root(); if (!has_diff) return false; @@ -165,7 +165,7 @@ namespace array { sel1_args.push_back(store); sel2_args.push_back(store->get_arg(0)); - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { sel1_args.push_back(select->get_arg(i)); sel2_args.push_back(select->get_arg(i)); } @@ -204,7 +204,7 @@ namespace array { return s().value(sel_eq) != l_true; }; - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { expr* idx1 = store->get_arg(i); expr* idx2 = select->get_arg(i); euf::enode* r1 = expr2enode(idx1); @@ -482,7 +482,7 @@ namespace array { args2.push_back(e2); svector names; sort_ref_vector sorts(m); - for (unsigned i = 0; i < dimension; i++) { + for (unsigned i = 0; i < dimension; ++i) { sort * asrt = get_array_domain(srt, i); sorts.push_back(asrt); names.push_back(symbol(i)); @@ -547,7 +547,7 @@ namespace array { return false; unsigned num_vars = get_num_vars(); bool change = false; - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { auto& d = get_var_data(v); if (!d.m_prop_upward) continue; @@ -634,7 +634,7 @@ namespace array { void solver::collect_shared_vars(sbuffer& roots) { ptr_buffer to_unmark; unsigned num_vars = get_num_vars(); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { euf::enode * n = var2enode(i); if (!is_array(n)) continue; @@ -663,7 +663,7 @@ namespace array { */ bool solver::check_lambdas() { unsigned num_vars = get_num_vars(); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { auto* n = var2enode(i); if (a.is_as_array(n->get_expr()) || is_lambda(n->get_expr())) for (euf::enode* p : euf::enode_parents(n)) diff --git a/src/sat/smt/array_internalize.cpp b/src/sat/smt/array_internalize.cpp index 5ada91ac7..7a62286e6 100644 --- a/src/sat/smt/array_internalize.cpp +++ b/src/sat/smt/array_internalize.cpp @@ -211,13 +211,13 @@ namespace array { unsigned num_args = parent->num_args(); if (a.is_store(p)) { set_array(parent->get_arg(0)); - for (unsigned i = 1; i < num_args - 1; i++) + for (unsigned i = 1; i < num_args - 1; ++i) set_index(parent->get_arg(i)); set_value(parent->get_arg(num_args - 1)); } else if (a.is_select(p)) { set_array(parent->get_arg(0)); - for (unsigned i = 1; i < num_args - 1; i++) + for (unsigned i = 1; i < num_args - 1; ++i) set_index(parent->get_arg(i)); } else if (a.is_const(p)) { diff --git a/src/sat/smt/array_model.cpp b/src/sat/smt/array_model.cpp index dfc4ad871..c4e75979e 100644 --- a/src/sat/smt/array_model.cpp +++ b/src/sat/smt/array_model.cpp @@ -166,7 +166,7 @@ namespace array { bool solver::sel_eq::operator()(euf::enode * n1, euf::enode * n2) const { SASSERT(n1->num_args() == n2->num_args()); unsigned num_args = n1->num_args(); - for (unsigned i = 1; i < num_args; i++) + for (unsigned i = 1; i < num_args; ++i) if (n1->get_arg(i)->get_root() != n2->get_arg(i)->get_root()) return false; return true; @@ -199,7 +199,7 @@ namespace array { for (euf::enode * r : m_selects_domain) for (euf::enode* sel : *get_select_set(r)) propagate_select_to_store_parents(r, sel, todo); - for (unsigned qhead = 0; qhead < todo.size(); qhead++) { + for (unsigned qhead = 0; qhead < todo.size(); ++qhead) { euf::enode_pair & pair = todo[qhead]; euf::enode * r = pair.first; euf::enode * sel = pair.second; @@ -229,7 +229,7 @@ namespace array { // check whether the sel idx was overwritten by the store unsigned num_args = sel->num_args(); unsigned i = 1; - for (; i < num_args; i++) { + for (; i < num_args; ++i) { if (sel->get_arg(i)->get_root() != parent->get_arg(i)->get_root()) break; } diff --git a/src/sat/smt/atom2bool_var.cpp b/src/sat/smt/atom2bool_var.cpp index b12f51fb0..68a263c85 100644 --- a/src/sat/smt/atom2bool_var.cpp +++ b/src/sat/smt/atom2bool_var.cpp @@ -83,7 +83,7 @@ struct collect_boolean_interface_proc { decl_kind k = to_app(t)->get_decl_kind(); if (k == OP_OR || k == OP_NOT || ((k == OP_EQ || k == OP_ITE) && m.is_bool(to_app(t)->get_arg(1)))) { unsigned num = to_app(t)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = to_app(t)->get_arg(i); if (fvisited.is_marked(arg)) continue; @@ -102,7 +102,7 @@ struct collect_boolean_interface_proc { void operator()(T const & g) { unsigned sz = g.size(); ptr_vector deps, all_deps; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (g.dep(i)) { deps.reset(); m.linearize(g.dep(i), deps); @@ -110,17 +110,17 @@ struct collect_boolean_interface_proc { } } - for (unsigned i = 0; i < all_deps.size(); i++) { + for (unsigned i = 0; i < all_deps.size(); ++i) { quick_for_each_expr(proc, tvisited, all_deps[i]); } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { process(g.form(i)); } } void operator()(unsigned sz, expr * const * fs) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) process(fs[i]); } }; diff --git a/src/sat/smt/bv_internalize.cpp b/src/sat/smt/bv_internalize.cpp index 438e806f0..e8ead7704 100644 --- a/src/sat/smt/bv_internalize.cpp +++ b/src/sat/smt/bv_internalize.cpp @@ -244,7 +244,7 @@ namespace bv { expr* e = var2expr(v); unsigned bv_size = get_bv_size(v); m_bits[v].reset(); - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { expr_ref b2b(bv.mk_bit2bool(e, i), m); m_bits[v].push_back(sat::null_literal); sat::literal lit = ctx.internalize(b2b, false, false); @@ -390,7 +390,7 @@ namespace bv { SASSERT(bits.size() == sz); SASSERT(m_bits[v].empty()); sat::literal true_literal = mk_true(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr* l = bits.get(i); SASSERT(m.is_true(l) || m.is_false(l)); m_bits[v].push_back(m.is_true(l) ? true_literal : ~true_literal); diff --git a/src/sat/smt/bv_invariant.cpp b/src/sat/smt/bv_invariant.cpp index 490fa53e3..0fe986b04 100644 --- a/src/sat/smt/bv_invariant.cpp +++ b/src/sat/smt/bv_invariant.cpp @@ -74,7 +74,7 @@ namespace bv { theory_var curr = v; do { literal_vector const& lits = m_bits[curr]; - for (unsigned i = 0; i < lits.size(); i++) { + for (unsigned i = 0; i < lits.size(); ++i) { literal l = lits[i]; if (l.var() == mk_true().var()) { assigned.push_back(l); diff --git a/src/sat/smt/bv_solver.cpp b/src/sat/smt/bv_solver.cpp index 5ff0ff0ae..fac5db9f4 100644 --- a/src/sat/smt/bv_solver.cpp +++ b/src/sat/smt/bv_solver.cpp @@ -733,7 +733,7 @@ namespace bv { unsigned num_vars = get_num_vars(); if (num_vars > 0) out << "bv-solver:\n"; - for (unsigned v = 0; v < num_vars; v++) + for (unsigned v = 0; v < num_vars; ++v) out << pp(v); return out; } @@ -896,7 +896,7 @@ namespace bv { unsigned sz = m_bits[v1].size(); if (sz == 1) return; - for (unsigned idx = 0; !s().inconsistent() && idx < sz; idx++) { + for (unsigned idx = 0; !s().inconsistent() && idx < sz; ++idx) { literal bit1 = m_bits[v1][idx]; literal bit2 = m_bits[v2][idx]; CTRACE(bv, bit1 == ~bit2, tout << pp(v1) << pp(v2) << "idx: " << idx << "\n";); @@ -1025,7 +1025,7 @@ namespace bv { }; scoped_reset _sr(*this, bits1); - DEBUG_CODE(for (unsigned i = 0; i < bv_size; i++) SASSERT(m_merge_aux[0][i] == euf::null_theory_var || m_merge_aux[1][i] == euf::null_theory_var);); + DEBUG_CODE(for (unsigned i = 0; i < bv_size; ++i) SASSERT(m_merge_aux[0][i] == euf::null_theory_var || m_merge_aux[1][i] == euf::null_theory_var);); // save info about bits1 for (auto& zo : bits1) @@ -1046,7 +1046,7 @@ namespace bv { bits1.push_back(zo); } // reset m_merge_aux vector - DEBUG_CODE(for (unsigned i = 0; i < bv_size; i++) { SASSERT(m_merge_aux[0][i] == euf::null_theory_var || m_merge_aux[1][i] == euf::null_theory_var); }); + DEBUG_CODE(for (unsigned i = 0; i < bv_size; ++i) { SASSERT(m_merge_aux[0][i] == euf::null_theory_var || m_merge_aux[1][i] == euf::null_theory_var); }); return true; } diff --git a/src/sat/smt/dt_solver.cpp b/src/sat/smt/dt_solver.cpp index 1d4dc7c67..65746231d 100644 --- a/src/sat/smt/dt_solver.cpp +++ b/src/sat/smt/dt_solver.cpp @@ -727,7 +727,7 @@ namespace dt { sat::check_result r = sat::check_result::CR_DONE; final_check_st _guard(*this); int start = s().rand()(); - for (int i = 0; i < num_vars; i++) { + for (int i = 0; i < num_vars; ++i) { theory_var v = (i + start) % num_vars; if (v != static_cast(m_find.find(v))) continue; @@ -881,7 +881,7 @@ namespace dt { unsigned num_vars = get_num_vars(); if (num_vars > 0) out << "Theory datatype:\n"; - for (unsigned v = 0; v < num_vars; v++) + for (unsigned v = 0; v < num_vars; ++v) display_var(out, v); return out; } diff --git a/src/sat/smt/fpa_solver.cpp b/src/sat/smt/fpa_solver.cpp index 699724b30..8754745e6 100644 --- a/src/sat/smt/fpa_solver.cpp +++ b/src/sat/smt/fpa_solver.cpp @@ -429,12 +429,12 @@ namespace fpa { for (func_decl* f : seen) mdl.unregister_decl(f); - for (unsigned i = 0; i < new_model.get_num_constants(); i++) { + for (unsigned i = 0; i < new_model.get_num_constants(); ++i) { func_decl* f = new_model.get_constant(i); mdl.register_decl(f, new_model.get_const_interp(f)); } - for (unsigned i = 0; i < new_model.get_num_functions(); i++) { + for (unsigned i = 0; i < new_model.get_num_functions(); ++i) { func_decl* f = new_model.get_function(i); func_interp* fi = new_model.get_func_interp(f)->copy(); mdl.register_decl(f, fi); diff --git a/src/sat/smt/pb_solver.cpp b/src/sat/smt/pb_solver.cpp index 823ad97aa..cf51bfa17 100644 --- a/src/sat/smt/pb_solver.cpp +++ b/src/sat/smt/pb_solver.cpp @@ -704,7 +704,7 @@ namespace pb { } } unsigned sz = c.size(); - for (; i < sz; i++) + for (; i < sz; ++i) process_antecedent(c[i], offset); break; } @@ -1022,7 +1022,7 @@ namespace pb { } inc_bound(1); unsigned sz = c.size(); - for (; i < sz; i++) + for (; i < sz; ++i) process_antecedent(c[i]); break; } @@ -1872,7 +1872,7 @@ namespace pb { unsigned sz = m_learned.size(); unsigned new_sz = sz/2; unsigned removed = 0; - for (unsigned i = new_sz; i < sz; i++) { + for (unsigned i = new_sz; i < sz; ++i) { constraint* c = m_learned[i]; if (!m_constraint_to_reinit.contains(c)) { remove_constraint(*c, "gc"); diff --git a/src/sat/smt/q_ematch.cpp b/src/sat/smt/q_ematch.cpp index f56f10b7d..7eb195cde 100644 --- a/src/sat/smt/q_ematch.cpp +++ b/src/sat/smt/q_ematch.cpp @@ -93,7 +93,7 @@ namespace q { void ematch::ensure_ground_enodes(clause const& c) { quantifier* q = c.q(); unsigned num_patterns = q->get_num_patterns(); - for (unsigned i = 0; i < num_patterns; i++) + for (unsigned i = 0; i < num_patterns; ++i) ensure_ground_enodes(q->get_pattern(i)); for (auto const& lit : c.m_lits) { ensure_ground_enodes(lit.lhs); @@ -589,12 +589,12 @@ namespace q { bool has_unary_pattern = false; unsigned num_patterns = q->get_num_patterns(); - for (unsigned i = 0; i < num_patterns && !has_unary_pattern; i++) + for (unsigned i = 0; i < num_patterns && !has_unary_pattern; ++i) has_unary_pattern = (1 == to_app(q->get_pattern(i))->get_num_args()); unsigned num_eager_multi_patterns = ctx.get_config().m_qi_max_eager_multipatterns; if (!has_unary_pattern) num_eager_multi_patterns++; - for (unsigned i = 0, j = 0; i < num_patterns; i++) { + for (unsigned i = 0, j = 0; i < num_patterns; ++i) { app * mp = to_app(q->get_pattern(i)); SASSERT(m.is_pattern(mp)); bool unary = (mp->get_num_args() == 1); diff --git a/src/sat/smt/q_queue.cpp b/src/sat/smt/q_queue.cpp index 38572c8cf..5621958a1 100644 --- a/src/sat/smt/q_queue.cpp +++ b/src/sat/smt/q_queue.cpp @@ -105,7 +105,7 @@ namespace q { m_vals[SCOPE] = static_cast(ctx.s().num_scopes()); m_vals[NESTED_QUANTIFIERS] = static_cast(stat->get_num_nested_quantifiers()); m_vals[CS_FACTOR] = static_cast(stat->get_case_split_factor()); - TRACE(q_detail, for (unsigned i = 0; i < m_vals.size(); i++) { tout << m_vals[i] << " "; } tout << "\n";); + TRACE(q_detail, for (unsigned i = 0; i < m_vals.size(); ++i) { tout << m_vals[i] << " "; } tout << "\n";); } float queue::get_cost(binding& f) { diff --git a/src/sat/tactic/goal2sat.cpp b/src/sat/tactic/goal2sat.cpp index abc112592..0e6d88b1a 100644 --- a/src/sat/tactic/goal2sat.cpp +++ b/src/sat/tactic/goal2sat.cpp @@ -144,7 +144,7 @@ struct goal2sat::imp : public sat::sat_internalizer { } void mk_clause(unsigned n, sat::literal * lits, euf::th_proof_hint* ph) { - TRACE(goal2sat, tout << "mk_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";); + TRACE(goal2sat, tout << "mk_clause: "; for (unsigned i = 0; i < n; ++i) tout << lits[i] << " "; tout << "\n";); if (relevancy_enabled()) ensure_euf()->add_aux(n, lits); m_solver.add_clause(n, lits, mk_status(ph)); @@ -166,7 +166,7 @@ struct goal2sat::imp : public sat::sat_internalizer { } void mk_root_clause(unsigned n, sat::literal * lits, euf::th_proof_hint* ph = nullptr) { - TRACE(goal2sat, tout << "mk_root_clause: "; for (unsigned i = 0; i < n; i++) tout << lits[i] << " "; tout << "\n";); + TRACE(goal2sat, tout << "mk_root_clause: "; for (unsigned i = 0; i < n; ++i) tout << lits[i] << " "; tout << "\n";); if (relevancy_enabled()) ensure_euf()->add_root(n, lits); m_solver.add_clause(n, lits, ph ? mk_status(ph) : sat::status::input()); @@ -410,7 +410,7 @@ struct goal2sat::imp : public sat::sat_internalizer { SASSERT(num == m_result_stack.size()); if (sign) { // this case should not really happen. - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sat::literal l = m_result_stack[i]; l.neg(); mk_root_clause(l); @@ -429,7 +429,7 @@ struct goal2sat::imp : public sat::sat_internalizer { sat::literal l(k, false); cache(t, l); sat::literal * lits = m_result_stack.end() - num; - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) mk_clause(~lits[i], l, mk_tseitin(~lits[i], l)); m_result_stack.push_back(~l); @@ -477,7 +477,7 @@ struct goal2sat::imp : public sat::sat_internalizer { sat::literal * lits = m_result_stack.end() - num; // l => /\ lits - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { mk_clause(~l, lits[i], mk_tseitin(~l, lits[i])); } // /\ lits => l @@ -933,7 +933,7 @@ struct goal2sat::imp : public sat::sat_internalizer { expr_ref_vector fmls(m); if (m_euf) ensure_euf(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { f = g.form(idx); // Add assumptions. if (g.dep(idx)) { diff --git a/src/sat/tactic/sat_tactic.cpp b/src/sat/tactic/sat_tactic.cpp index 9ebeff7e6..1ec319cae 100644 --- a/src/sat/tactic/sat_tactic.cpp +++ b/src/sat/tactic/sat_tactic.cpp @@ -112,7 +112,7 @@ class sat_tactic : public tactic { if (produce_models) { model_ref md = alloc(model, m); sat::model const & ll_m = m_solver->get_model(); - TRACE(sat_tactic, for (unsigned i = 0; i < ll_m.size(); i++) tout << i << ":" << ll_m[i] << " "; tout << "\n";); + TRACE(sat_tactic, for (unsigned i = 0; i < ll_m.size(); ++i) tout << i << ":" << ll_m[i] << " "; tout << "\n";); for (auto const& kv : map) { expr * n = kv.m_key; sat::bool_var v = kv.m_value; diff --git a/src/shell/dimacs_frontend.cpp b/src/shell/dimacs_frontend.cpp index 6310c0dd1..c1bc41b35 100644 --- a/src/shell/dimacs_frontend.cpp +++ b/src/shell/dimacs_frontend.cpp @@ -68,7 +68,7 @@ static void STD_CALL on_ctrl_c(int) { static void display_model(sat::solver const & s) { sat::model const & m = s.get_model(); std::cout << "v "; - for (unsigned i = 1; i < m.size(); i++) { + for (unsigned i = 1; i < m.size(); ++i) { switch (m[i]) { case l_false: std::cout << "-" << i << " "; break; case l_undef: break; @@ -151,7 +151,7 @@ void verify_solution(char const * file_name) { parse_dimacs(in, std::cerr, solver); sat::model const & m = g_solver->get_model(); - for (unsigned i = 1; i < m.size(); i++) { + for (unsigned i = 1; i < m.size(); ++i) { sat::literal lit(i, false); switch (m[i]) { case l_false: lit.neg(); break; diff --git a/src/shell/main.cpp b/src/shell/main.cpp index 4bf0370d6..19e617e55 100644 --- a/src/shell/main.cpp +++ b/src/shell/main.cpp @@ -147,7 +147,7 @@ static void parse_cmd_line_args(std::string& input_file, int argc, char ** argv) } i++; input_file = ""; - for (; i < argc; i++) { + for (; i < argc; ++i) { input_file += argv[i]; if (i < argc - 1) input_file += " "; diff --git a/src/smt/diff_logic.h b/src/smt/diff_logic.h index 320950683..877bb6c89 100644 --- a/src/smt/diff_logic.h +++ b/src/smt/diff_logic.h @@ -225,7 +225,7 @@ class dl_graph { SASSERT(m_assignment.size() <= m_heap.get_bounds()); SASSERT(m_in_edges.size() == m_out_edges.size()); int n = m_out_edges.size(); - for (dl_var id = 0; id < n; id++) { + for (dl_var id = 0; id < n; ++id) { const edge_id_vector & e_ids = m_out_edges[id]; for (edge_id e_id : e_ids) { SASSERT(static_cast(e_id) <= m_edges.size()); @@ -233,7 +233,7 @@ class dl_graph { SASSERT(e.get_source() == id); } } - for (dl_var id = 0; id < n; id++) { + for (dl_var id = 0; id < n; ++id) { const edge_id_vector & e_ids = m_in_edges[id]; for (edge_id e_id : e_ids) { SASSERT(static_cast(e_id) <= m_edges.size()); @@ -242,7 +242,7 @@ class dl_graph { } } n = m_edges.size(); - for (int i = 0; i < n; i++) { + for (int i = 0; i < n; ++i) { const edge & e = m_edges[i]; SASSERT(std::find(m_out_edges[e.get_source()].begin(), m_out_edges[e.get_source()].end(), i) != m_out_edges[e.get_source()].end()); @@ -884,7 +884,7 @@ public: unsigned num_edges = m_edges.size(); SASSERT(old_num_edges <= num_edges); unsigned to_delete = num_edges - old_num_edges; - for (unsigned i = 0; i < to_delete; i++) { + for (unsigned i = 0; i < to_delete; ++i) { const edge & e = m_edges.back(); TRACE(dl_bug, tout << "deleting edge:\n"; display_edge(tout, e);); dl_var source = e.get_source(); @@ -990,7 +990,7 @@ public: out << "digraph "" {\n"; unsigned n = m_assignment.size(); - for (unsigned v = 0; v < n; v++) { + for (unsigned v = 0; v < n; ++v) { if (vars.contains(v)) { out << "\"" << v << "\" [label=\"" << v << ":" << m_assignment[v] << "\"]\n"; } @@ -1029,7 +1029,7 @@ public: template void display_assignment(std::ostream & out, FilterAssignmentProc p) const { unsigned n = m_assignment.size(); - for (unsigned v = 0; v < n; v++) { + for (unsigned v = 0; v < n; ++v) { if (p(v)) { out << "$" << v << " := " << m_assignment[v] << "\n"; } @@ -1201,13 +1201,13 @@ public: scc_id.resize(n, -1); m_next_dfs_time = 0; m_next_scc_id = 0; - for (dl_var v = 0; v < n; v++) { + for (dl_var v = 0; v < n; ++v) { if (m_dfs_time[v] == -1) { dfs(v, scc_id); } } TRACE(eq_scc, - for (dl_var v = 0; v < n; v++) { + for (dl_var v = 0; v < n; ++v) { tout << "$" << v << " -> " << scc_id[v] << "\n"; }); } diff --git a/src/smt/dyn_ack.cpp b/src/smt/dyn_ack.cpp index 3a80908bd..f28a4f10d 100644 --- a/src/smt/dyn_ack.cpp +++ b/src/smt/dyn_ack.cpp @@ -74,7 +74,7 @@ namespace smt { unsigned num_args = m_app1->get_num_args(); proof_ref_vector prs(m); expr_ref_vector lits(m); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg1 = m_app1->get_arg(i); expr * arg2 = m_app2->get_arg(i); if (arg1 != arg2) { @@ -411,7 +411,7 @@ namespace smt { TRACE(dyn_ack, tout << "expanding Ackermann's rule for:\n" << mk_pp(n1, m) << "\n" << mk_pp(n2, m) << "\n";); unsigned num_args = n1->get_num_args(); literal_buffer lits; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg1 = n1->get_arg(i); expr * arg2 = n2->get_arg(i); if (arg1 != arg2) diff --git a/src/smt/fingerprints.cpp b/src/smt/fingerprints.cpp index 9b0ee3374..f59d1dc3f 100644 --- a/src/smt/fingerprints.cpp +++ b/src/smt/fingerprints.cpp @@ -36,7 +36,7 @@ namespace smt { if (f1->get_num_args() != f2->get_num_args()) return false; unsigned n = f1->get_num_args(); - for(unsigned i = 0; i < n; i++) + for(unsigned i = 0; i < n; ++i) if (f1->get_arg(i) != f2->get_arg(i)) return false; return true; @@ -86,7 +86,7 @@ namespace smt { fingerprint * d = mk_dummy(data, data_hash, num_args, args); if (m_set.contains(d)) return nullptr; - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) d->m_args[i] = d->m_args[i]->get_root(); if (m_set.contains(d)) { TRACE(fingerprint_bug, tout << "failed: " << *d;); @@ -104,7 +104,7 @@ namespace smt { fingerprint * d = mk_dummy(data, data_hash, num_args, args); if (m_set.contains(d)) return true; - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) d->m_args[i] = d->m_args[i]->get_root(); if (m_set.contains(d)) return true; @@ -130,7 +130,7 @@ namespace smt { if (old_size == 0 && size > 0) m_set.reset(); else { - for (unsigned i = old_size; i < size; i++) + for (unsigned i = old_size; i < size; ++i) m_set.erase(m_fingerprints[i]); } m_fingerprints.shrink(old_size); @@ -158,7 +158,7 @@ namespace smt { if (f->get_num_args() != num_args) continue; unsigned i = 0; - for (i = 0; i < num_args; i++) + for (i = 0; i < num_args; ++i) if (f->get_arg(i)->get_root() != args[i]->get_root()) break; if (i == num_args) { diff --git a/src/smt/mam.cpp b/src/smt/mam.cpp index 3030bda4d..a27fc293f 100644 --- a/src/smt/mam.cpp +++ b/src/smt/mam.cpp @@ -91,7 +91,7 @@ namespace { void display(std::ostream & out) const { out << "lbl-hasher:\n"; bool first = true; - for (unsigned i = 0; i < m_lbl2hash.size(); i++) { + for (unsigned i = 0; i < m_lbl2hash.size(); ++i) { if (m_lbl2hash[i] != -1) { if (first) first = false; @@ -258,14 +258,14 @@ namespace { out << "(GET_CGR"; display_num_args(out, c.m_num_args); out << " " << c.m_label->get_name() << " " << c.m_oreg; - for (unsigned i = 0; i < c.m_num_args; i++) + for (unsigned i = 0; i < c.m_num_args; ++i) out << " " << c.m_iregs[i]; out << ")"; } void display_is_cgr(std::ostream & out, const is_cgr & c) { out << "(IS_CGR " << c.m_label->get_name() << " " << c.m_ireg; - for (unsigned i = 0; i < c.m_num_args; i++) + for (unsigned i = 0; i < c.m_num_args; ++i) out << " " << c.m_iregs[i]; out << ")"; } @@ -274,14 +274,14 @@ namespace { out << "(YIELD"; display_num_args(out, y.m_num_bindings); out << " #" << y.m_qa->get_id(); - for (unsigned i = 0; i < y.m_num_bindings; i++) { + for (unsigned i = 0; i < y.m_num_bindings; ++i) { out << " " << y.m_bindings[i]; } out << ")"; } void display_joints(std::ostream & out, unsigned num_joints, enode * const * joints) { - for (unsigned i = 0; i < num_joints; i++) { + for (unsigned i = 0; i < num_joints; ++i) { if (i > 0) out << " "; enode * bare = joints[i]; @@ -399,7 +399,7 @@ namespace { friend class code_tree_manager; void display_seq(std::ostream & out, instruction * head, unsigned indent) const { - for (unsigned i = 0; i < indent; i++) { + for (unsigned i = 0; i < indent; ++i) { out << " "; } instruction * curr = head; @@ -440,7 +440,7 @@ namespace { } else { out << p->get_decl()->get_name() << ":" << m_lbl_hasher(p->get_decl()) << " "; - for (unsigned i = 0; i < p->get_num_args(); i++) { + for (unsigned i = 0; i < p->get_num_args(); ++i) { expr * arg = p->get_arg(i); if (is_app(arg)) display_label_hashes(out, to_app(arg)); @@ -451,7 +451,7 @@ namespace { void display_label_hashes(std::ostream & out, app * p) const { ast_manager & m = m_context->get_manager(); if (m.is_pattern(p)) { - for (unsigned i = 0; i < p->get_num_args(); i++) { + for (unsigned i = 0; i < p->get_num_args(); ++i) { expr * arg = p->get_arg(i); if (is_app(arg)) { display_label_hashes_core(out, to_app(arg)); @@ -833,7 +833,7 @@ namespace { app * p = to_app(mp->get_arg(first_idx)); SASSERT(t->get_root_lbl() == p->get_decl()); unsigned num_args = p->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(i+1, p->get_arg(i)); m_todo.push_back(i+1); } @@ -841,7 +841,7 @@ namespace { if (num_decls > m_vars.size()) { m_vars.resize(num_decls, -1); } - for (unsigned j = 0; j < num_decls; j++) { + for (unsigned j = 0; j < num_decls; ++j) { m_vars[j] = -1; } } @@ -993,7 +993,7 @@ namespace { if (IS_CGR_SUPPORT && all_args_are_bound_vars(first_app)) { // use IS_CGR instead of BIND sbuffer iregs; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = to_app(first_app)->get_arg(i); SASSERT(is_var(arg)); SASSERT(m_vars[to_var(arg)->get_idx()] != -1); @@ -1005,7 +1005,7 @@ namespace { // Generate a BIND operation for this application. unsigned oreg = m_tree->m_num_regs; m_tree->m_num_regs += num_args; - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { set_register(oreg + j, first_app->get_arg(j)); m_aux.push_back(oreg + j); } @@ -1030,7 +1030,7 @@ namespace { return 0; } unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = n->get_arg(i); if (is_var(arg)) { unsigned var_id = to_var(arg)->get_idx(); @@ -1066,7 +1066,7 @@ namespace { sbuffer iregs; unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = n->get_arg(i); if (is_var(arg)) { SASSERT(m_vars[to_var(arg)->get_idx()] != -1); @@ -1090,13 +1090,13 @@ namespace { void linearise_multi_pattern(unsigned first_idx) { unsigned num_args = m_mp->get_num_args(); // multi_pattern support - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { // select the pattern with the biggest number of bound variables app * best = nullptr; unsigned best_num_bvars = 0; unsigned best_j = 0; bool found_bounded_mp = false; - for (unsigned j = 0; j < m_mp->get_num_args(); j++) { + for (unsigned j = 0; j < m_mp->get_num_args(); ++j) { if (m_mp_already_processed[j]) continue; app * p = to_app(m_mp->get_arg(j)); @@ -1132,7 +1132,7 @@ namespace { m_tree->m_num_regs += num_args; ptr_buffer joints; bool has_depth1_joint = false; // VAR_TAG or GROUND_TERM_TAG - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * curr = p->get_arg(j); SASSERT(!is_quantifier(curr)); set_register(oreg + j, curr); @@ -1145,7 +1145,7 @@ namespace { } if (has_depth1_joint) { - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * curr = p->get_arg(j); if (is_var(curr)) { @@ -1170,7 +1170,7 @@ namespace { } else { // Only try to use depth2 joints if there is no depth1 joint. - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * curr = p->get_arg(j); if (!is_app(curr)) { joints.push_back(0); @@ -1178,7 +1178,7 @@ namespace { } unsigned num_args2 = to_app(curr)->get_num_args(); unsigned k = 0; - for (; k < num_args2; k++) { + for (; k < num_args2; ++k) { expr * arg = to_app(curr)->get_arg(k); if (!is_var(arg)) continue; @@ -1219,7 +1219,7 @@ namespace { } // check that all variables are captured by pattern. - for (unsigned i = 0; i < m_qa->get_num_decls(); i++) + for (unsigned i = 0; i < m_qa->get_num_decls(); ++i) if (m_vars[i] == -1) return; @@ -1405,7 +1405,7 @@ namespace { bool is_compatible(cont * instr) const { unsigned oreg = instr->m_oreg; - for (unsigned i = 0; i < instr->m_num_args; i++) + for (unsigned i = 0; i < instr->m_num_args; ++i) if (m_registers[oreg + i] != 0) return false; return true; @@ -1439,7 +1439,7 @@ namespace { unsigned oreg = static_cast(curr)->m_oreg; unsigned num_args = static_cast(curr)->m_num_args; SASSERT(n->get_num_args() == num_args); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(oreg + i, n->get_arg(i)); m_to_reset.push_back(oreg + i); } @@ -1500,7 +1500,7 @@ namespace { app * app = to_app(m_registers[ireg]); unsigned oreg = bnd->m_oreg; unsigned num_args = bnd->m_num_args; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { set_register(oreg + i, app->get_arg(i)); m_todo.push_back(oreg + i); } @@ -1948,13 +1948,13 @@ namespace { return false; default: { m_args.reserve(num_args+1, 0); - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) m_args[i] = m_registers[pc->m_iregs[i]]->get_root(); SASSERT(n != 0); do { if (n->get_decl() == f && n->get_num_args() == num_args) { unsigned i = 0; - for (; i < num_args; i++) { + for (; i < num_args; ++i) { if (n->get_arg(i)->get_root() != m_args[i]) break; } @@ -2126,7 +2126,7 @@ namespace { unsigned short num_args = c->m_num_args; enode * r; // quick filter... check if any of the joint points have zero parents... - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { void * bare = c->m_joints[i]; enode * n = nullptr; switch (GET_TAG(bare)) { @@ -2151,7 +2151,7 @@ namespace { } // traverse each joint and select the best one. enode_vector * best_v = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * bare = c->m_joints[i]; enode_vector * curr_v = nullptr; switch (GET_TAG(bare)) { @@ -2253,7 +2253,7 @@ namespace { display_reg(out, static_cast(instr)->m_reg); break; case YIELD1: case YIELD2: case YIELD3: case YIELD4: case YIELD5: case YIELD6: case YIELDN: - for (unsigned i = 0; i < static_cast(instr)->m_num_bindings; i++) { + for (unsigned i = 0; i < static_cast(instr)->m_num_bindings; ++i) { display_reg(out, static_cast(instr)->m_bindings[i]); } break; @@ -2383,7 +2383,7 @@ namespace { m_num_args = m_app->get_num_args(); if (m_num_args != static_cast(m_pc)->m_num_args) goto backtrack; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[i+1] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2525,7 +2525,7 @@ namespace { case BINDN: BIND_COMMON(); m_num_args = static_cast(m_pc)->m_num_args; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2587,7 +2587,7 @@ namespace { case YIELDN: m_num_args = static_cast(m_pc)->m_num_bindings; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_bindings[i] = m_registers[static_cast(m_pc)->m_bindings[m_num_args - i - 1]]; ON_MATCH(m_num_args); goto backtrack; @@ -2662,7 +2662,7 @@ namespace { case GET_CGRN: m_num_args = static_cast(m_pc)->m_num_args; m_args.reserve(m_num_args, 0); - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_args[i] = m_registers[static_cast(m_pc)->m_iregs[i]]; GET_CGR_COMMON(); @@ -2680,7 +2680,7 @@ namespace { goto backtrack; m_pattern_instances.push_back(m_app); TRACE(mam_int, tout << "continue candidate:\n" << mk_ll_pp(m_app->get_expr(), m);); - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_pc->m_next; goto main_loop; @@ -2798,7 +2798,7 @@ namespace { case BINDN: BBIND_COMMON(); m_num_args = m_b->m_num_args; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = m_b->m_next; goto main_loop; @@ -2825,7 +2825,7 @@ namespace { TRACE(mam_int, tout << "continue next candidate:\n" << mk_ll_pp(m_app->get_expr(), m);); m_num_args = c->m_num_args; m_oreg = c->m_oreg; - for (unsigned i = 0; i < m_num_args; i++) + for (unsigned i = 0; i < m_num_args; ++i) m_registers[m_oreg+i] = m_app->get_arg(i); m_pc = c->m_next; goto main_loop; @@ -3061,7 +3061,7 @@ namespace { void display(std::ostream & out, unsigned indent) { path_tree * curr = this; while (curr != nullptr) { - for (unsigned i = 0; i < indent; i++) out << " "; + for (unsigned i = 0; i < indent; ++i) out << " "; out << curr->m_label->get_name() << ":" << curr->m_arg_idx; if (curr->m_ground_arg) out << ":#" << curr->m_ground_arg->get_owner_id() << ":" << curr->m_ground_arg_idx; @@ -3207,7 +3207,7 @@ namespace { void update_children_plbls(enode * app, unsigned char elem) { unsigned num_args = app->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * c = app->get_arg(i); approx_set & r_plbls = c->get_root()->get_plbls(); if (!r_plbls.may_contain(elem)) { @@ -3243,8 +3243,8 @@ namespace { } void reset_pp_pc() { - for (unsigned i = 0; i < APPROX_SET_CAPACITY; i++) { - for (unsigned j = 0; j < APPROX_SET_CAPACITY; j++) { + for (unsigned i = 0; i < APPROX_SET_CAPACITY; ++i) { + for (unsigned j = 0; j < APPROX_SET_CAPACITY; ++j) { m_pp[i][j].first = 0; m_pp[i][j].second = 0; m_pc[i][j] = nullptr; @@ -3409,7 +3409,7 @@ namespace { enode * get_ground_arg(app * pat, quantifier * qa, unsigned & pos) { pos = 0; unsigned num_args = pat->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = pat->get_arg(i); if (is_ground(arg)) { pos = i; @@ -3429,7 +3429,7 @@ namespace { unsigned ground_arg_pos = 0; enode * ground_arg = get_ground_arg(pat, qa, ground_arg_pos); func_decl * plbl = pat->get_decl(); - for (unsigned short i = 0; i < num_args; i++) { + for (unsigned short i = 0; i < num_args; ++i) { expr * child = pat->get_arg(i); path * new_path = new (m_tmp_region) path(plbl, i, ground_arg_pos, ground_arg, pat_idx, p); @@ -3471,7 +3471,7 @@ namespace { unsigned num_vars = qa->get_num_decls(); if (num_vars >= m_var_paths.size()) m_var_paths.resize(num_vars+1); - for (unsigned i = 0; i < num_vars; i++) + for (unsigned i = 0; i < num_vars; ++i) m_var_paths[i].reset(); m_tmp_region.reset(); // Given a multi-pattern (p_1, ..., p_n) @@ -3481,15 +3481,15 @@ namespace { // ... // (p_n, p_2, ..., p_1) unsigned num_patterns = mp->get_num_args(); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { app * pat = to_app(mp->get_arg(i)); update_filters(pat, nullptr, qa, mp, i); } } void display_filter_info(std::ostream & out) { - for (unsigned i = 0; i < APPROX_SET_CAPACITY; i++) { - for (unsigned j = 0; j < APPROX_SET_CAPACITY; j++) { + for (unsigned i = 0; i < APPROX_SET_CAPACITY; ++i) { + for (unsigned j = 0; j < APPROX_SET_CAPACITY; ++j) { if (m_pp[i][j].first) { out << "pp[" << i << "][" << j << "]:\n"; m_pp[i][j].first->display(out, 1); @@ -3778,7 +3778,7 @@ namespace { void collect_ground_exprs(quantifier * qa, app * mp) { ptr_buffer todo; unsigned num_patterns = mp->get_num_args(); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { app * pat = to_app(mp->get_arg(i)); TRACE(mam_pat, tout << mk_ismt2_pp(qa, m) << "\npat:\n" << mk_ismt2_pp(pat, m) << "\n";); SASSERT(!pat->is_ground()); @@ -3794,7 +3794,7 @@ namespace { } else { unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = n->get_arg(i); if (is_app(arg)) todo.push_back(to_app(arg)); @@ -3834,7 +3834,7 @@ namespace { // However, the simplifier may turn a non-ground pattern into a ground one. // So, we should check it again here. unsigned num_patterns = mp->get_num_args(); - for (unsigned i = 0; i < num_patterns; i++) + for (unsigned i = 0; i < num_patterns; ++i) if (is_ground(mp->get_arg(i))) return; // ignore multi-pattern containing ground pattern. update_filters(qa, mp); @@ -3844,7 +3844,7 @@ namespace { // e-matching. So, for a multi-pattern [ p_1, ..., p_n ], // we have to make n insertions. In the i-th insertion, // the pattern p_i is assumed to be the first one. - for (unsigned i = 0; i < num_patterns; i++) + for (unsigned i = 0; i < num_patterns; ++i) m_trees.add_pattern(qa, mp, i); } @@ -3933,7 +3933,7 @@ namespace { if (!m_context.slow_contains_instance(qa, num_bindings, bindings)) { TRACE(missing_instance, tout << "qa:\n" << mk_ll_pp(qa, m) << "\npat:\n" << mk_ll_pp(pat, m); - for (unsigned i = 0; i < num_bindings; i++) + for (unsigned i = 0; i < num_bindings; ++i) tout << "#" << bindings[i]->get_expr_id() << "\n" << mk_ll_pp(bindings[i]->get_expr(), m) << "\n"; ); UNREACHABLE(); @@ -3941,7 +3941,7 @@ namespace { return; } DEBUG_CODE( - for (unsigned i = 0; i < num_bindings; i++) { + for (unsigned i = 0; i < num_bindings; ++i) { SASSERT(bindings[i]->get_generation() <= max_generation); }); diff --git a/src/smt/proto_model/proto_model.cpp b/src/smt/proto_model/proto_model.cpp index f3e4f5206..2d97c4522 100644 --- a/src/smt/proto_model/proto_model.cpp +++ b/src/smt/proto_model/proto_model.cpp @@ -386,7 +386,7 @@ model * proto_model::mk_model() { m_finterp.reset(); // m took the ownership of the func_interp's unsigned sz = get_num_uninterpreted_sorts(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sort * s = get_uninterpreted_sort(i); TRACE(proto_model, tout << "copying uninterpreted sorts...\n" << mk_pp(s, m) << "\n";); ptr_vector const& buf = get_universe(s); diff --git a/src/smt/qi_queue.cpp b/src/smt/qi_queue.cpp index 10a8ab7c6..c49dba7de 100644 --- a/src/smt/qi_queue.cpp +++ b/src/smt/qi_queue.cpp @@ -113,7 +113,7 @@ namespace smt { m_vals[SCOPE] = static_cast(m_context.get_scope_level()); m_vals[NESTED_QUANTIFIERS] = static_cast(stat->get_num_nested_quantifiers()); m_vals[CS_FACTOR] = static_cast(stat->get_case_split_factor()); - TRACE(qi_queue_detail, for (unsigned i = 0; i < m_vals.size(); i++) { tout << m_vals[i] << " "; } tout << "\n";); + TRACE(qi_queue_detail, for (unsigned i = 0; i < m_vals.size(); ++i) { tout << m_vals[i] << " "; } tout << "\n";); return stat; } @@ -139,7 +139,7 @@ namespace smt { TRACE(qi_queue_detail, tout << "new instance of " << q->get_qid() << ", weight " << q->get_weight() << ", generation: " << generation << ", scope_level: " << m_context.get_scope_level() << ", cost: " << cost << "\n"; - for (unsigned i = 0; i < f->get_num_args(); i++) { + for (unsigned i = 0; i < f->get_num_args(); ++i) { tout << "#" << f->get_arg(i)->get_expr_id() << " d:" << f->get_arg(i)->get_expr()->get_depth() << " "; } tout << "\n";); @@ -340,7 +340,7 @@ namespace smt { app * n = to_app(lemma); bool has_unassigned = false; expr * true_child = 0; - for (unsigned i = 0; i < n->get_num_args(); i++) { + for (unsigned i = 0; i < n->get_num_args(); ++i) { expr * arg = n->get_arg(i); switch(m_context.get_assignment(arg)) { case l_undef: has_unassigned = true; break; @@ -379,7 +379,7 @@ namespace smt { scope & s = m_scopes[new_lvl]; unsigned old_sz = s.m_instantiated_trail_lim; unsigned sz = m_instantiated_trail.size(); - for (unsigned i = old_sz; i < sz; i++) + for (unsigned i = old_sz; i < sz; ++i) m_delayed_entries[m_instantiated_trail[i]].m_instantiated = false; m_instantiated_trail.shrink(old_sz); m_delayed_entries.shrink(s.m_delayed_entries_lim); @@ -409,7 +409,7 @@ namespace smt { bool init = false; float min_cost = 0.0; unsigned sz = m_delayed_entries.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { entry & e = m_delayed_entries[i]; TRACE(qi_queue, tout << e.m_qb << ", cost: " << e.m_cost << ", instantiated: " << e.m_instantiated << "\n";); if (!e.m_instantiated && e.m_cost <= m_params.m_qi_lazy_threshold && (!init || e.m_cost < min_cost)) { @@ -419,7 +419,7 @@ namespace smt { } TRACE(qi_queue_min_cost, tout << "min_cost: " << min_cost << ", scope_level: " << m_context.get_scope_level() << "\n";); bool result = true; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { entry & e = m_delayed_entries[i]; TRACE(qi_queue, tout << e.m_qb << ", cost: " << e.m_cost << " min-cost: " << min_cost << ", instantiated: " << e.m_instantiated << "\n";); if (!e.m_instantiated && e.m_cost <= min_cost) { @@ -435,7 +435,7 @@ namespace smt { } bool result = true; - for (unsigned i = 0; i < m_delayed_entries.size(); i++) { + for (unsigned i = 0; i < m_delayed_entries.size(); ++i) { entry & e = m_delayed_entries[i]; TRACE(qi_queue, tout << e.m_qb << ", cost: " << e.m_cost << ", instantiated: " << e.m_instantiated << "\n";); if (!e.m_instantiated && e.m_cost <= m_params.m_qi_lazy_threshold) { @@ -489,7 +489,7 @@ namespace smt { min = 0.0f; max = 0.0f; bool found = false; - for (unsigned i = 0; i < m_delayed_entries.size(); i++) { + for (unsigned i = 0; i < m_delayed_entries.size(); ++i) { if (!m_delayed_entries[i].m_instantiated) { float c = m_delayed_entries[i].m_cost; if (found) { diff --git a/src/smt/smt_almost_cg_table.cpp b/src/smt/smt_almost_cg_table.cpp index 0a0157446..dbbd6b888 100644 --- a/src/smt/smt_almost_cg_table.cpp +++ b/src/smt/smt_almost_cg_table.cpp @@ -82,7 +82,7 @@ namespace smt { unsigned num_args = n1->get_num_args(); if (num_args != n2->get_num_args()) return false; - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { enode * arg1 = n1->get_arg(j)->get_root(); enode * arg2 = n2->get_arg(j)->get_root(); if (arg1 == arg2) diff --git a/src/smt/smt_case_split_queue.cpp b/src/smt/smt_case_split_queue.cpp index 73f1cda55..b1ff7347e 100644 --- a/src/smt/smt_case_split_queue.cpp +++ b/src/smt/smt_case_split_queue.cpp @@ -280,7 +280,7 @@ namespace { ptr_vector undef_children; bool found_undef = false; unsigned num_args = parent->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = parent->get_arg(i); lbool arg_val = ctx.get_assignment(arg); if (arg_val == val) @@ -420,7 +420,7 @@ namespace { void next_case_split_core(ptr_vector & queue, unsigned & head, bool_var & next, lbool & phase) { phase = l_undef; unsigned sz = queue.size(); - for (; head < sz; head++) { + for (; head < sz; ++head) { expr * curr = queue[head]; bool is_or = m_manager.is_or(curr); bool is_and = m_manager.is_and(curr); @@ -480,7 +480,7 @@ namespace { if (queue.empty()) return; unsigned sz = queue.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i == head) out << "[HEAD" << idx << "]=> "; out << "#" << queue[i]->get_id() << " "; @@ -614,7 +614,7 @@ namespace { void next_case_split_core(bool_var & next, lbool & phase) { phase = l_undef; unsigned sz = m_queue.size(); - for (; m_head < sz; m_head++) { + for (; m_head < sz; ++m_head) { expr * curr = m_queue[m_head]; bool is_or = m_manager.is_or(curr); bool is_and = m_manager.is_and(curr); @@ -675,7 +675,7 @@ namespace { if (m_queue.empty()) return; unsigned sz = m_queue.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i == m_head) out << "[HEAD]=> "; out << "#" << m_queue[i]->get_id() << " "; @@ -856,14 +856,14 @@ namespace { m_current_generation = s.m_generation; m_current_goal = s.m_goal; - for (unsigned i = s.m_queue2_trail; i < m_queue2.size(); i++) { + for (unsigned i = s.m_queue2_trail; i < m_queue2.size(); ++i) { //TRACE(case_split, tout << "ld[" << i << "] = " << m_queue2[i].m_last_decided << " cont " << SASSERT((m_queue2[i].m_last_decided == -1) == m_priority_queue2.contains(i)); if (m_priority_queue2.contains(i)) m_priority_queue2.erase(i); } - for (unsigned i = 0; i < s.m_queue2_trail; i++) { + for (unsigned i = 0; i < s.m_queue2_trail; ++i) { queue_entry & e = m_queue2[i]; if (e.m_last_decided > static_cast(new_lvl)) { @@ -923,7 +923,7 @@ namespace { next = null_bool_var; unsigned sz = m_queue.size(); - for (; m_head < sz; m_head++) { + for (; m_head < sz; ++m_head) { expr * curr = m_queue[m_head]; next_case_split_core(curr, next, phase); if (next != null_bool_var) @@ -955,7 +955,7 @@ namespace { if (queue.empty()) return; unsigned sz = queue.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i == head) out << "[HEAD" << idx << "]=> "; out << "#" << queue[i]->get_id() << " "; diff --git a/src/smt/smt_cg_table.cpp b/src/smt/smt_cg_table.cpp index 8f35229fc..018a543c0 100644 --- a/src/smt/smt_cg_table.cpp +++ b/src/smt/smt_cg_table.cpp @@ -57,7 +57,7 @@ namespace smt { if (num != n2->get_num_args()) { return false; } - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) if (n1->get_arg(i)->get_root() != n2->get_arg(i)->get_root()) return false; return true; diff --git a/src/smt/smt_checker.cpp b/src/smt/smt_checker.cpp index 9751b33e3..2e405f95a 100644 --- a/src/smt/smt_checker.cpp +++ b/src/smt/smt_checker.cpp @@ -121,7 +121,7 @@ namespace smt { enode * checker::get_enode_eq_to_core(app * n) { ptr_buffer buffer; unsigned num = n->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { enode * arg = get_enode_eq_to(n->get_arg(i)); if (arg == nullptr) return nullptr; diff --git a/src/smt/smt_clause.cpp b/src/smt/smt_clause.cpp index 654ed161f..9086bce06 100644 --- a/src/smt/smt_clause.cpp +++ b/src/smt/smt_clause.cpp @@ -51,7 +51,7 @@ namespace smt { if (js) *(const_cast(cls->get_justification_addr())) = js; if (save_atoms) { - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { expr * atom = bool_var2expr_map[lits[i].var()]; m.inc_ref(atom); const_cast(cls->get_atoms_addr())[i] = TAG(expr*, atom, lits[i].sign()); @@ -62,7 +62,7 @@ namespace smt { SASSERT(!cls->is_lemma() || cls->get_activity() == 1); SASSERT(cls->get_del_eh() == del_eh); SASSERT(cls->get_justification() == js); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { SASSERT((*cls)[i] == lits[i]); SASSERT(!save_atoms || cls->get_atom(i) == bool_var2expr_map[lits[i].var()]); }}); @@ -82,7 +82,7 @@ namespace smt { } } unsigned num_atoms = get_num_atoms(); - for (unsigned i = 0; i < num_atoms; i++) { + for (unsigned i = 0; i < num_atoms; ++i) { SASSERT(m_reinit || get_atom(i) == 0); m.dec_ref(get_atom(i)); } @@ -91,7 +91,7 @@ namespace smt { void clause::release_atoms(ast_manager & m) { unsigned num_atoms = get_num_atoms(); - for (unsigned i = 0; i < num_atoms; i++) { + for (unsigned i = 0; i < num_atoms; ++i) { m.dec_ref(get_atom(i)); const_cast(get_atoms_addr())[i] = nullptr; } @@ -99,7 +99,7 @@ namespace smt { std::ostream& clause::display(std::ostream & out, ast_manager & m, expr * const * bool_var2expr_map) const { out << "(clause"; - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { out << " "; smt::display(out, m_lits[i], m, bool_var2expr_map); } @@ -108,7 +108,7 @@ namespace smt { std::ostream& clause::display_compact(std::ostream & out, ast_manager & m, expr * const * bool_var2expr_map) const { out << "(clause"; - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { out << " "; smt::display_compact(out, m_lits[i], bool_var2expr_map); } @@ -117,7 +117,7 @@ namespace smt { std::ostream& clause::display_smt2(std::ostream & out, ast_manager & m, expr * const * bool_var2expr_map) const { expr_ref_vector args(m); - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { literal lit = m_lits[i]; args.push_back(bool_var2expr_map[lit.var()]); if (lit.sign()) args[args.size()-1] = m.mk_not(args.back()); diff --git a/src/smt/smt_conflict_resolution.cpp b/src/smt/smt_conflict_resolution.cpp index e85137028..d709049ae 100644 --- a/src/smt/smt_conflict_resolution.cpp +++ b/src/smt/smt_conflict_resolution.cpp @@ -135,7 +135,7 @@ namespace smt { mark_eq(lhs->get_arg(1), rhs->get_arg(0)); } else { - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) mark_eq(lhs->get_arg(i), rhs->get_arg(i)); } break; @@ -288,7 +288,7 @@ namespace smt { i = 2; } } - for(; i < num_lits; i++) + for(; i < num_lits; ++i) r = std::max(r, m_ctx.get_assign_level((*cls)[i])); justification * js = cls->get_justification(); if (js) @@ -534,7 +534,7 @@ namespace smt { i = 2; } } - for(; i < num_lits; i++) { + for(; i < num_lits; ++i) { literal l = (*cls)[i]; SASSERT(consequent.var() != l.var()); process_antecedent(~l, num_marks); @@ -619,7 +619,7 @@ namespace smt { */ void conflict_resolution::reset_unmark(unsigned old_size) { unsigned curr_size = m_unmark.size(); - for(unsigned i = old_size; i < curr_size; i++) + for(unsigned i = old_size; i < curr_size; ++i) m_ctx.unset_mark(m_unmark[i]); m_unmark.shrink(old_size); } @@ -689,7 +689,7 @@ namespace smt { clause * cls = js.get_clause(); unsigned num_lits = cls->get_num_literals(); unsigned pos = (*cls)[1].var() == var; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { if (pos != i) { literal l = (*cls)[i]; SASSERT(l.var() != var); @@ -743,7 +743,7 @@ namespace smt { unsigned sz = m_lemma.size(); unsigned i = 1; // the first literal is the FUIP unsigned j = 1; - for (; i < sz; i++) { + for (; i < sz; ++i) { literal l = m_lemma[i]; if (implied_by_marked(l)) { m_unmark.push_back(l.var()); @@ -898,7 +898,7 @@ namespace smt { else { bool visited = true; ptr_buffer prs; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * c1 = n1->get_arg(i); enode * c2 = n2->get_arg(i); if (c1 != c2) { @@ -998,7 +998,7 @@ namespace smt { i = 2; } } - for (; i < num_lits; i++) { + for (; i < num_lits; ++i) { proof * pr = get_proof(~cls->get_literal(i)); prs.push_back(pr); if (!pr) @@ -1010,28 +1010,28 @@ namespace smt { m_ctx.literal2expr(l, l_exr); TRACE(get_proof_bug, tout << "clause:\n"; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { tout << cls->get_literal(i).index() << "\n"; expr_ref l_expr(m); m_ctx.literal2expr(cls->get_literal(i), l_expr); tout << mk_pp(l_expr, m) << "\n"; } tout << "antecedents:\n"; - for (unsigned i = 0; i < prs.size(); i++) { + for (unsigned i = 0; i < prs.size(); ++i) { tout << mk_pp(m.get_fact(prs[i]), m) << "\n"; } tout << "consequent:\n" << mk_pp(l_exr, m) << "\n";); CTRACE(get_proof_bug_after, invocation_counter >= DUMP_AFTER_NUM_INVOCATIONS, tout << "clause, num_lits: " << num_lits << ":\n"; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { tout << cls->get_literal(i).index() << "\n"; expr_ref l_expr(m); m_ctx.literal2expr(cls->get_literal(i), l_expr); tout << mk_pp(l_expr, m) << "\n"; } tout << "antecedents:\n"; - for (unsigned i = 0; i < prs.size(); i++) { + for (unsigned i = 0; i < prs.size(); ++i) { tout << mk_pp(m.get_fact(prs[i]), m) << "\n"; } tout << "consequent:\n" << mk_pp(l_exr, m) << "\n";); @@ -1107,7 +1107,7 @@ namespace smt { i = 2; } } - for (; i < num_lits; i++) { + for (; i < num_lits; ++i) { SASSERT(cls->get_literal(i) != l); if (get_proof(~cls->get_literal(i)) == nullptr) visited = false; @@ -1170,7 +1170,7 @@ namespace smt { visited = false; } else { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * c1 = n1->get_arg(i); enode * c2 = n2->get_arg(i); if (c1 != c2 && get_proof(c1, c2) == nullptr) @@ -1249,7 +1249,7 @@ namespace smt { else { TRACE(mk_transitivity, unsigned sz = prs1.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { tout << mk_ll_pp(prs1[i], m) << "\n"; }); pr = m.mk_transitivity(prs1.size(), prs1.data(), lhs->get_expr(), rhs->get_expr()); @@ -1425,7 +1425,7 @@ namespace smt { i = 2; } } - for(; i < num_lits; i++) { + for(; i < num_lits; ++i) { literal l = cls->get_literal(i); process_antecedent_for_unsat_core(~l); } diff --git a/src/smt/smt_conflict_resolution.h b/src/smt/smt_conflict_resolution.h index 96de16e48..39f7c68d5 100644 --- a/src/smt/smt_conflict_resolution.h +++ b/src/smt/smt_conflict_resolution.h @@ -263,7 +263,7 @@ namespace smt { }; inline void mark_literals(conflict_resolution & cr, unsigned sz, literal const * ls) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) cr.mark_literal(ls[i]); } diff --git a/src/smt/smt_context.cpp b/src/smt/smt_context.cpp index f2b0c0c9a..9b861471e 100644 --- a/src/smt/smt_context.cpp +++ b/src/smt/smt_context.cpp @@ -1210,7 +1210,7 @@ namespace smt { TRACE(is_ext_diseq, tout << "p2: " << enode_pp(p2, *this) << "\n";); if (p1->get_root() != p2->get_root() && p2->get_decl() == f && p2->get_num_args() == num_args) { unsigned j = 0; - for (j = 0; j < num_args; j++) { + for (j = 0; j < num_args; ++j) { enode * arg1 = p1->get_arg(j)->get_root(); enode * arg2 = p2->get_arg(j)->get_root(); if (arg1 == arg2) @@ -1233,7 +1233,7 @@ namespace smt { if (depth >= m_almost_cg_tables.size()) { unsigned old_sz = m_almost_cg_tables.size(); m_almost_cg_tables.resize(depth+1); - for (unsigned i = old_sz; i < depth + 1; i++) + for (unsigned i = old_sz; i < depth + 1; ++i) m_almost_cg_tables[i] = alloc(almost_cg_table); } almost_cg_table & table = *(m_almost_cg_tables[depth]); @@ -1282,7 +1282,7 @@ namespace smt { // TODO } else { - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = r->get_expr()->get_arg(i); SASSERT(e_internalized(arg)); enode * _arg = get_enode(arg); @@ -1306,7 +1306,7 @@ namespace smt { */ bool context::propagate_eqs() { unsigned i = 0; - for (; i < m_eq_propagation_queue.size() && !get_cancel_flag(); i++) { + for (; i < m_eq_propagation_queue.size() && !get_cancel_flag(); ++i) { new_eq & entry = m_eq_propagation_queue[i]; add_eq(entry.m_lhs, entry.m_rhs, entry.m_justification); if (inconsistent()) { @@ -1324,7 +1324,7 @@ namespace smt { bool context::propagate_atoms() { SASSERT(!inconsistent()); CTRACE(propagate_atoms, !m_atom_propagation_queue.empty(), tout << m_atom_propagation_queue << "\n";); - for (unsigned i = 0; i < m_atom_propagation_queue.size() && !get_cancel_flag(); i++) { + for (unsigned i = 0; i < m_atom_propagation_queue.size() && !get_cancel_flag(); ++i) { SASSERT(!inconsistent()); literal l = m_atom_propagation_queue[i]; bool_var v = l.var(); @@ -1652,7 +1652,7 @@ namespace smt { } void context::propagate_th_eqs() { - for (unsigned i = 0; i < m_th_eq_propagation_queue.size() && !inconsistent(); i++) { + for (unsigned i = 0; i < m_th_eq_propagation_queue.size() && !inconsistent(); ++i) { new_th_eq curr = m_th_eq_propagation_queue[i]; theory * th = get_theory(curr.m_th_id); SASSERT(th); @@ -1665,7 +1665,7 @@ namespace smt { } void context::propagate_th_diseqs() { - for (unsigned i = 0; i < m_th_diseq_propagation_queue.size() && !inconsistent(); i++) { + for (unsigned i = 0; i < m_th_diseq_propagation_queue.size() && !inconsistent(); ++i) { new_th_eq curr = m_th_diseq_propagation_queue[i]; theory * th = get_theory(curr.m_th_id); SASSERT(th); @@ -1873,7 +1873,7 @@ namespace smt { counter++; if (counter % 100 == 0) { TRACE(activity_profile, - for (unsigned i=0; iget_num_literals(); - for(unsigned i = 0; i < num_lits; i++) { + for(unsigned i = 0; i < num_lits; ++i) { literal l = c->get_literal(i); if (get_assignment(l) != l_false) return false; @@ -2144,7 +2144,7 @@ namespace smt { bool context::is_unit_clause(clause const * c) const { bool found = false; unsigned num_lits = c->get_num_literals(); - for(unsigned i = 0; i < num_lits; i++) { + for(unsigned i = 0; i < num_lits; ++i) { literal l = c->get_literal(i); switch (get_assignment(l)) { case l_false: @@ -2177,7 +2177,7 @@ namespace smt { SASSERT(!m_clauses_to_reinit.empty()); lim = m_clauses_to_reinit.size() - 1; } - for (unsigned i = new_scope_lvl; i <= lim; i++) { + for (unsigned i = new_scope_lvl; i <= lim; ++i) { clause_vector & v = m_clauses_to_reinit[i]; for (clause* cls : v) { cache_generation(cls, new_scope_lvl); @@ -2188,7 +2188,7 @@ namespace smt { scope & s = m_scopes[new_scope_lvl]; unsigned i = s.m_units_to_reassert_lim; unsigned sz = m_units_to_reassert.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { expr* unit = m_units_to_reassert[i].m_unit.get(); cache_generation(unit, new_scope_lvl); } @@ -2206,7 +2206,7 @@ namespace smt { \brief See cache_generation(unsigned new_scope_lvl) */ void context::cache_generation(unsigned num_lits, literal const * lits, unsigned new_scope_lvl) { - for(unsigned i = 0; i < num_lits; i++) { + for(unsigned i = 0; i < num_lits; ++i) { bool_var v = lits[i].var(); unsigned ilvl = get_intern_level(v); if (ilvl > new_scope_lvl) @@ -2271,7 +2271,7 @@ namespace smt { SASSERT(!m_clauses_to_reinit.empty()); lim = m_clauses_to_reinit.size() - 1; } - for (unsigned i = m_scope_lvl+1; i <= lim; i++) { + for (unsigned i = m_scope_lvl+1; i <= lim; ++i) { clause_vector & v = m_clauses_to_reinit[i]; for (clause* cls : v) { if (cls->deleted()) { @@ -2284,7 +2284,7 @@ namespace smt { bool keep = false; if (cls->reinternalize_atoms()) { SASSERT(cls->get_num_atoms() == cls->get_num_literals()); - for (unsigned j = 0; j < 2; j++) { + for (unsigned j = 0; j < 2; ++j) { literal l = cls->get_literal(j); if (l.var() < num_bool_vars) { // This boolean variable was not deleted during backtracking @@ -2301,7 +2301,7 @@ namespace smt { unsigned ilvl = 0; (void)ilvl; - for (unsigned j = 0; j < num; j++) { + for (unsigned j = 0; j < num; ++j) { expr * atom = cls->get_atom(j); bool sign = cls->get_atom_sign(j); // Atom can be (NOT foo). This can happen, for example, when @@ -2384,7 +2384,7 @@ namespace smt { void context::reassert_units(unsigned units_to_reassert_lim) { unsigned i = units_to_reassert_lim; unsigned sz = m_units_to_reassert.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { auto [unit, sign, is_relevant] = m_units_to_reassert[i]; bool gate_ctx = true; internalize(unit, gate_ctx); @@ -2535,7 +2535,7 @@ namespace smt { unsigned i = 2; unsigned j = i; bool is_taut = false; - for(; i < s; i++) { + for(; i < s; ++i) { literal l = cls[i]; switch(get_assignment(l)) { case l_false: @@ -2602,7 +2602,7 @@ namespace smt { } else if (simplify_clause(*cls)) { TRACE(simplify_clauses_bug, display_clause_smt2(tout << "simplified\n", *cls) << "\n";); - for (unsigned idx = 0; idx < 2; idx++) { + for (unsigned idx = 0; idx < 2; ++idx) { literal l0 = (*cls)[idx]; b_justification l0_js = get_justification(l0.var()); if (l0_js != null_b_justification && @@ -2616,7 +2616,7 @@ namespace smt { SASSERT(m_search_lvl == m_base_lvl); literal_buffer simp_lits; unsigned num_lits = cls->get_num_literals(); - for(unsigned i = 0; i < num_lits; i++) { + for(unsigned i = 0; i < num_lits; ++i) { if (i != idx) { literal l = (*cls)[i]; SASSERT(l != l0); @@ -2760,7 +2760,7 @@ namespace smt { unsigned num_del_cls = 0; TRACE(del_inactive_lemmas, tout << "sz: " << sz << ", start_at: " << start_at << ", end_at: " << end_at << ", start_del_at: " << start_del_at << "\n";); - for (; i < end_at; i++) { + for (; i < end_at; ++i) { clause * cls = m_lemmas[i]; if (can_delete(cls)) { TRACE(del_inactive_lemmas, tout << "deleting: "; display_clause(tout, cls); tout << ", activity: " << @@ -2774,7 +2774,7 @@ namespace smt { } } // keep recent clauses - for (; i < sz; i++) { + for (; i < sz; ++i) { clause * cls = m_lemmas[i]; if (cls->deleted() && can_delete(cls)) { del_clause(true, cls); @@ -2787,7 +2787,7 @@ namespace smt { m_lemmas.shrink(j); if (m_fparams.m_clause_decay > 1) { // rescale activity - for (i = start_at; i < j; i++) { + for (i = start_at; i < j; ++i) { clause * cls = m_lemmas[i]; cls->set_activity(cls->get_activity() / m_fparams.m_clause_decay); } @@ -2814,7 +2814,7 @@ namespace smt { unsigned i = start_at; unsigned j = i; unsigned num_del_cls = 0; - for (; i < sz; i++) { + for (; i < sz; ++i) { clause * cls = m_lemmas[i]; if (can_delete(cls)) { if (cls->deleted()) { @@ -2877,7 +2877,7 @@ namespace smt { expr_mark visited; family_id fid = th->get_id(); unsigned sz = s.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * n = s.get(i); if (uses_theory(n, fid, visited)) { return true; @@ -4198,7 +4198,7 @@ namespace smt { void context::forget_phase_of_vars_in_current_level() { unsigned head = m_scope_lvl == 0 ? 0 : m_scopes[m_scope_lvl - 1].m_assigned_literals_lim; unsigned sz = m_assigned_literals.size(); - for (unsigned i = head; i < sz; i++) { + for (unsigned i = head; i < sz; ++i) { literal l = m_assigned_literals[i]; bool_var v = l.var(); TRACE(forget_phase, tout << "forgetting phase of l: " << l << "\n";); @@ -4265,7 +4265,7 @@ namespace smt { TRACE(resolve_conflict_bug, tout << "m_scope_lvl: " << m_scope_lvl << ", new_lvl: " << new_lvl << ", lemma_intern_lvl: " << m_conflict_resolution->get_lemma_intern_lvl() << "\n"; tout << "num_lits: " << num_lits << "\n"; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; tout << l << " "; display_literal_smt2(tout, l); @@ -4282,7 +4282,7 @@ namespace smt { #ifdef Z3DEBUG expr_ref_vector expr_lits(m); bool_vector expr_signs; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; if (get_assignment(l) != l_false) { std::cout << l << " " << get_assignment(l) << "\n"; @@ -4311,7 +4311,7 @@ namespace smt { // clauses are reinitialized in pop_scope. if (m_conflict_resolution->get_lemma_intern_lvl() > m_scope_lvl) { expr * * atoms = m_conflict_resolution->get_lemma_atoms(); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; if (l.var() >= num_bool_vars) { // This boolean variable was deleted during backtracking, it need to be recreated. @@ -4343,7 +4343,7 @@ namespace smt { tout << "AFTER m_scope_lvl: " << m_scope_lvl << ", new_lvl: " << new_lvl << ", lemma_intern_lvl: " << m_conflict_resolution->get_lemma_intern_lvl() << "\n"; tout << "num_lits: " << num_lits << "\n"; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; tout << l << " "; display_literal(tout, l); @@ -4351,7 +4351,7 @@ namespace smt { << mk_pp(bool_var2expr(l.var()), m) << "\n"; }); #ifdef Z3DEBUG - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; if (expr_signs[i] != l.sign()) { expr* real_atom; @@ -4381,7 +4381,7 @@ namespace smt { } if (counter % 1000 == 0) { verbose_stream() << "[sat] avg. clause size: " << ((double) total/(double) counter) << ", max: " << max << std::endl; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; verbose_stream() << l.sign() << " " << mk_pp(bool_var2expr(l.var()), m) << "\n"; } @@ -4403,7 +4403,7 @@ namespace smt { TRACE(context_lemma, tout << "new lemma: "; literal_vector v(num_lits, lits); std::sort(v.begin(), v.end()); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { display_literal(tout, v[i]); tout << "\n"; smt::display(tout, v[i], m, m_bool_var2expr.data()); @@ -4512,7 +4512,7 @@ namespace smt { void context::get_relevant_literals(expr_ref_vector & result) { SASSERT(!inconsistent()); unsigned sz = m_b_internalized_stack.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * curr = m_b_internalized_stack.get(i); if (is_relevant(curr)) { switch (get_assignment(curr)) { @@ -4538,7 +4538,7 @@ namespace smt { if (m_search_lvl == m_scopes.size()) { // do nothing... there are guesses... } - for (unsigned i = m_search_lvl; i < m_scope_lvl; i++) { + for (unsigned i = m_search_lvl; i < m_scope_lvl; ++i) { // This method assumes the first literal assigned in a non base scope level is a guess. scope & s = m_scopes[i]; unsigned guess_idx = s.m_assigned_literals_lim; diff --git a/src/smt/smt_context.h b/src/smt/smt_context.h index 7d68dc808..a914c8a70 100644 --- a/src/smt/smt_context.h +++ b/src/smt/smt_context.h @@ -1231,7 +1231,7 @@ namespace smt { \brief Return true if the give clause is justifying some literal. */ bool is_justifying(clause * cls) const { - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { b_justification js; js = get_justification((*cls)[i].var()); if (js.get_kind() == b_justification::CLAUSE && js.get_clause() == cls) diff --git a/src/smt/smt_context_inv.cpp b/src/smt/smt_context_inv.cpp index 59ed43e1b..e8f590e1a 100644 --- a/src/smt/smt_context_inv.cpp +++ b/src/smt/smt_context_inv.cpp @@ -206,7 +206,7 @@ namespace smt { check_relevancy(m_b_internalized_stack); check_relevancy(m_e_internalized_stack); unsigned sz = m_asserted_formulas.get_num_formulas(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * n = m_asserted_formulas.get_formula(i); if (m.is_or(n)) { CTRACE(relevancy_bug, !is_relevant(n), tout << "n: " << mk_ismt2_pp(n, m) << "\n";); @@ -267,7 +267,7 @@ namespace smt { if (inconsistent() || get_manager().limit().is_canceled()) { return true; } - for (bool_var v = 0; v < num; v++) { + for (bool_var v = 0; v < num; ++v) { if (has_enode(v)) { enode * n = bool_var2enode(v); if (n->is_eq() && is_relevant(n) && get_assignment(v) == l_false && !m.is_iff(n->get_expr())) { diff --git a/src/smt/smt_context_pp.cpp b/src/smt/smt_context_pp.cpp index 853dc4de3..a1a2b249e 100644 --- a/src/smt/smt_context_pp.cpp +++ b/src/smt/smt_context_pp.cpp @@ -148,7 +148,7 @@ namespace smt { void context::display_watch_lists(std::ostream & out) const { unsigned s = m_watches.size(); - for (unsigned l_idx = 0; l_idx < s; l_idx++) { + for (unsigned l_idx = 0; l_idx < s; ++l_idx) { literal l = to_literal(l_idx); display_watch_list(out, l); out << "\n"; @@ -164,7 +164,7 @@ namespace smt { void context::display_bool_var_defs(std::ostream & out) const { unsigned num = get_num_bool_vars(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { expr * n = m_bool_var2expr[v]; ast_def_ll_pp(out << v << " ", m, n, get_pp_visited(), true, false); } @@ -292,7 +292,7 @@ namespace smt { if (!m_e_internalized_stack.empty()) { out << "expression -> enode:\n"; unsigned sz = m_e_internalized_stack.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * n = m_e_internalized_stack.get(i); out << "(#" << n->get_id() << " -> e!" << i << ") "; } @@ -304,7 +304,7 @@ namespace smt { if (!m_b_internalized_stack.empty()) { out << "expression -> bool_var:\n"; unsigned sz = m_b_internalized_stack.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * n = m_b_internalized_stack.get(i); bool_var v = get_bool_var_of_id(n->get_id()); out << "(#" << n->get_id() << " -> " << literal(v, false) << ") "; @@ -316,7 +316,7 @@ namespace smt { void context::display_hot_bool_vars(std::ostream & out) const { out << "hot bool vars:\n"; unsigned num = get_num_bool_vars(); - for (bool_var v = 0; v < num; v++) { + for (bool_var v = 0; v < num; ++v) { double val = get_activity(v)/m_bvar_inc; if (val > 10.00) { expr * n = m_b_internalized_stack.get(v); @@ -447,7 +447,7 @@ namespace smt { expr_ref_vector fmls(m); visitor.collect(fmls); expr_ref n(m); - for (unsigned i = 0; i < num_antecedents; i++) { + for (unsigned i = 0; i < num_antecedents; ++i) { literal l = antecedents[i]; literal2expr(l, n); fmls.push_back(std::move(n)); @@ -481,12 +481,12 @@ namespace smt { expr_ref_vector fmls(m); visitor.collect(fmls); expr_ref n(m); - for (unsigned i = 0; i < num_antecedents; i++) { + for (unsigned i = 0; i < num_antecedents; ++i) { literal l = antecedents[i]; literal2expr(l, n); fmls.push_back(n); } - for (unsigned i = 0; i < num_eq_antecedents; i++) { + for (unsigned i = 0; i < num_eq_antecedents; ++i) { enode_pair const & p = eq_antecedents[i]; n = m.mk_eq(p.first->get_expr(), p.second->get_expr()); fmls.push_back(n); @@ -550,7 +550,7 @@ namespace smt { out << n->get_decl()->get_name(); if (!n->get_decl()->private_parameters()) display_parameters(out, n->get_decl()->get_num_parameters(), n->get_decl()->get_parameters()); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = n->get_expr()->get_arg(i); if (e_internalized(arg)) { enode * n = get_enode(arg)->get_root(); diff --git a/src/smt/smt_context_stat.cpp b/src/smt/smt_context_stat.cpp index 5b2a541a2..e1ff89c54 100644 --- a/src/smt/smt_context_stat.cpp +++ b/src/smt/smt_context_stat.cpp @@ -49,7 +49,7 @@ namespace smt { lit2num_occs.resize(num_lits, 0); acc_num_occs(m_aux_clauses, lit2num_occs); acc_num_occs(m_lemmas, lit2num_occs); - for (unsigned lidx = 0; lidx < num_lits; lidx++) { + for (unsigned lidx = 0; lidx < num_lits; ++lidx) { literal l = to_literal(lidx); if (lit2num_occs[lidx] > 0) { out << lit2num_occs[lidx] << " "; @@ -91,14 +91,14 @@ namespace smt { acc_var_num_occs(m_aux_clauses, var2num_occs); acc_var_num_occs(m_lemmas, var2num_occs); unsigned_vector histogram; - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { unsigned num_occs = var2num_occs[v]; histogram.reserve(num_occs+1, 0); histogram[num_occs]++; } out << "number of atoms having k occs:\n"; unsigned sz = histogram.size(); - for (unsigned i = 1; i < sz; i++) + for (unsigned i = 1; i < sz; ++i) if (histogram[i] > 0) out << i << ":" << histogram[i] << " "; out << "\n"; @@ -107,7 +107,7 @@ namespace smt { static void acc_var_num_min_occs(clause * cls, unsigned_vector & var2num_min_occs) { unsigned num_lits = cls->get_num_literals(); bool_var min_var = (*cls)[0].var(); - for (unsigned i = 1; i < num_lits; i++) { + for (unsigned i = 1; i < num_lits; ++i) { bool_var v = (*cls)[i].var(); if (v < min_var) min_var = v; @@ -128,7 +128,7 @@ namespace smt { acc_var_num_min_occs(m_aux_clauses, var2num_min_occs); acc_var_num_min_occs(m_lemmas, var2num_min_occs); out << "number of min occs:\n"; - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { if (var2num_min_occs[v] > 0) out << v << ":" << var2num_min_occs[v] << " "; } diff --git a/src/smt/smt_enode.cpp b/src/smt/smt_enode.cpp index 69a0784da..99424c8ed 100644 --- a/src/smt/smt_enode.cpp +++ b/src/smt/smt_enode.cpp @@ -51,7 +51,7 @@ namespace smt { n->m_proof_is_logged = false; n->m_is_shared = 2; unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * arg = app2enode[owner->get_arg(i)->get_id()]; n->m_args[i] = arg; arg->get_root()->m_is_shared = 2; @@ -84,7 +84,7 @@ namespace smt { SASSERT(m_root == this); SASSERT(m_next == this); unsigned num_args = get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * arg = get_arg(i); if (update_children_parent) { SASSERT(arg->get_root()->m_parents.back() == this); @@ -210,7 +210,7 @@ namespace smt { unsigned i = 0; unsigned num_args = parent->get_num_args(); SASSERT(num_args > 0); - for (; i < num_args; i++) { + for (; i < num_args; ++i) { enode * arg = parent->get_arg(i); if (arg->get_root() == m_root) break; @@ -299,7 +299,7 @@ namespace smt { return false; } else { - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (n1->get_arg(i)->get_root() != n2->get_arg(i)->get_root()) return false; return true; @@ -308,7 +308,7 @@ namespace smt { unsigned get_max_generation(unsigned num_enodes, enode * const * enodes) { unsigned max = 0; - for (unsigned i = 0; i < num_enodes; i++) { + for (unsigned i = 0; i < num_enodes; ++i) { unsigned curr = enodes[i]->get_generation(); if (curr > max) max = curr; @@ -317,12 +317,12 @@ namespace smt { } void unmark_enodes(unsigned num_enodes, enode * const * enodes) { - for (unsigned i = 0; i < num_enodes; i++) + for (unsigned i = 0; i < num_enodes; ++i) enodes[i]->unset_mark(); } void unmark_enodes2(unsigned num_enodes, enode * const * enodes) { - for (unsigned i = 0; i < num_enodes; i++) + for (unsigned i = 0; i < num_enodes; ++i) enodes[i]->unset_mark2(); } diff --git a/src/smt/smt_for_each_relevant_expr.cpp b/src/smt/smt_for_each_relevant_expr.cpp index 28da7c70f..e71a848a2 100644 --- a/src/smt/smt_for_each_relevant_expr.cpp +++ b/src/smt/smt_for_each_relevant_expr.cpp @@ -180,7 +180,7 @@ namespace smt { void for_each_relevant_expr::process_app(app * n) { unsigned sz = n->get_num_args(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = n->get_arg(i); if (m_cache.contains(arg)) continue; @@ -197,7 +197,7 @@ namespace smt { void for_each_relevant_expr::process_relevant_child(app * n, lbool val) { unsigned sz = n->get_num_args(); TRACE(for_each_relevant_expr, tout << val << " " << mk_bounded_pp(n, m_manager) << "\n";); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = n->get_arg(i); if (!is_relevant(arg)) continue; @@ -208,7 +208,7 @@ namespace smt { return; // the current child justifies n. } } - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * arg = n->get_arg(i); if (!is_relevant(arg)) continue; diff --git a/src/smt/smt_internalizer.cpp b/src/smt/smt_internalizer.cpp index 90e7686eb..30dfa2e8c 100644 --- a/src/smt/smt_internalizer.cpp +++ b/src/smt/smt_internalizer.cpp @@ -545,10 +545,10 @@ namespace smt { } static bool check_patterns(quantifier * q) { - for (unsigned i = 0; i < q->get_num_patterns(); i++) { + for (unsigned i = 0; i < q->get_num_patterns(); ++i) { SASSERT(check_pattern(q->get_pattern(i))); } - for (unsigned i = 0; i < q->get_num_no_patterns(); i++) { + for (unsigned i = 0; i < q->get_num_no_patterns(); ++i) { SASSERT(check_pattern(q->get_no_pattern(i))); } return true; @@ -1152,7 +1152,7 @@ namespace smt { std::sort(lits, lits + num_lits); literal prev = null_literal; unsigned j = 0; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal curr = lits[i]; lbool val = get_assignment(curr); switch (val) { @@ -1210,7 +1210,7 @@ namespace smt { literal prev = null_literal; unsigned i = 0; unsigned j = 0; - for (; i < num_lits; i++) { + for (; i < num_lits; ++i) { literal curr = lits[i]; bool_var var = curr.var(); lbool val = l_undef; @@ -1258,7 +1258,7 @@ namespace smt { */ unsigned context::get_max_iscope_lvl(unsigned num_lits, literal const * lits) const { unsigned r = 0; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { unsigned ilvl = get_intern_level(lits[i].var()); if (ilvl > r) r = ilvl; @@ -1306,7 +1306,7 @@ namespace smt { int max_false_idx = -1; unsigned max_lvl = UINT_MAX; int num_lits = cls->get_num_literals(); - for (int i = 1; i < num_lits; i++) { + for (int i = 1; i < num_lits; ++i) { literal l = cls->get_literal(i); lbool val = get_assignment(l); SASSERT(val == l_false || val == l_undef); @@ -1349,7 +1349,7 @@ namespace smt { int max_false_idx = -1; int unknown_idx = -1; int n = cls->get_num_literals(); - for (int i = starting_at; i < n; i++) { + for (int i = starting_at; i < n; ++i) { literal l = cls->get_literal(i); switch(get_assignment(l)) { case l_false: @@ -1597,7 +1597,7 @@ namespace smt { proof * context::mk_clause_def_axiom(unsigned num_lits, literal * lits, expr * root_gate) { ptr_buffer new_lits; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; bool_var v = l.var(); expr * atom = m_bool_var2expr[v]; @@ -1619,7 +1619,7 @@ namespace smt { } else if (clause_proof_active()) { ptr_buffer new_lits; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { literal l = lits[i]; bool_var v = l.var(); expr * atom = m_bool_var2expr[v]; diff --git a/src/smt/smt_justification.cpp b/src/smt/smt_justification.cpp index cea8558ed..c5196b1cc 100644 --- a/src/smt/smt_justification.cpp +++ b/src/smt/smt_justification.cpp @@ -77,7 +77,7 @@ namespace smt { void unit_resolution_justification::get_antecedents(conflict_resolution & cr) { if (m_antecedent) cr.mark_justification(m_antecedent); - for (unsigned i = 0; i < m_num_literals; i++) + for (unsigned i = 0; i < m_num_literals; ++i) cr.mark_literal(m_literals[i]); } @@ -90,7 +90,7 @@ namespace smt { if (!pr) return pr; prs.push_back(pr); - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { proof * pr = cr.get_proof(m_literals[i]); if (!pr) return pr; @@ -245,7 +245,7 @@ namespace smt { m_literals = new (r) literal[num_lits]; memcpy(m_literals, lits, sizeof(literal) * num_lits); #ifdef Z3DEBUG - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { SASSERT(lits[i] != null_literal); } #endif @@ -253,13 +253,13 @@ namespace smt { } void simple_justification::get_antecedents(conflict_resolution & cr) { - for (unsigned i = 0; i < m_num_literals; i++) + for (unsigned i = 0; i < m_num_literals; ++i) cr.mark_literal(m_literals[i]); } bool simple_justification::antecedent2proof(conflict_resolution & cr, ptr_buffer & result) { bool visited = true; - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { proof * pr = cr.get_proof(m_literals[i]); if (pr == nullptr) visited = false; @@ -273,7 +273,7 @@ namespace smt { context & ctx = cr.get_context(); ast_manager & m = cr.get_manager(); expr_ref_vector lits(m); - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { expr_ref l(m); ctx.literal2expr(m_literals[i], l); lits.push_back(std::move(l)); @@ -322,7 +322,7 @@ namespace smt { m_eqs = new (r) enode_pair[num_eqs]; std::uninitialized_copy(eqs, eqs + num_eqs, m_eqs); DEBUG_CODE({ - for (unsigned i = 0; i < num_eqs; i++) { + for (unsigned i = 0; i < num_eqs; ++i) { SASSERT(eqs[i].first->get_root() == eqs[i].second->get_root()); } }); @@ -330,7 +330,7 @@ namespace smt { void ext_simple_justification::get_antecedents(conflict_resolution & cr) { simple_justification::get_antecedents(cr); - for (unsigned i = 0; i < m_num_eqs; i++) { + for (unsigned i = 0; i < m_num_eqs; ++i) { enode_pair const & p = m_eqs[i]; cr.mark_eq(p.first, p.second); } @@ -338,7 +338,7 @@ namespace smt { bool ext_simple_justification::antecedent2proof(conflict_resolution & cr, ptr_buffer & result) { bool visited = simple_justification::antecedent2proof(cr, result); - for (unsigned i = 0; i < m_num_eqs; i++) { + for (unsigned i = 0; i < m_num_eqs; ++i) { enode_pair const & p = m_eqs[i]; proof * pr = cr.get_proof(p.first, p.second); if (pr == nullptr) @@ -403,7 +403,7 @@ namespace smt { m_num_literals(num_lits) { ast_manager& m = ctx.get_manager(); m_literals = alloc_svect(expr*, num_lits); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { bool sign = lits[i].sign(); expr * v = ctx.bool_var2expr(lits[i].var()); m.inc_ref(v); @@ -418,7 +418,7 @@ namespace smt { } void theory_lemma_justification::del_eh(ast_manager & m) { - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { expr* v = UNTAG(expr*, m_literals[i]); m.dec_ref(v); } @@ -428,7 +428,7 @@ namespace smt { proof * theory_lemma_justification::mk_proof(conflict_resolution & cr) { ast_manager & m = cr.get_manager(); expr_ref_vector lits(m); - for (unsigned i = 0; i < m_num_literals; i++) { + for (unsigned i = 0; i < m_num_literals; ++i) { bool sign = GET_TAG(m_literals[i]) != 0; expr * v = UNTAG(expr*, m_literals[i]); lits.push_back(sign ? m.mk_not(v) : v); diff --git a/src/smt/smt_kernel.cpp b/src/smt/smt_kernel.cpp index e914dcbf8..a5ce0dcb7 100644 --- a/src/smt/smt_kernel.cpp +++ b/src/smt/smt_kernel.cpp @@ -43,7 +43,7 @@ namespace smt { // TODO: it will be replaced with assertion_stack.display unsigned num = m_kernel.get_num_asserted_formulas(); out << "(kernel"; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr* f = m_kernel.get_asserted_formula(i); out << "\n " << mk_ismt2_pp(f, m(), 2); } diff --git a/src/smt/smt_literal.cpp b/src/smt/smt_literal.cpp index f654f684d..94ac5e567 100644 --- a/src/smt/smt_literal.cpp +++ b/src/smt/smt_literal.cpp @@ -80,7 +80,7 @@ namespace smt { } std::ostream& display_compact(std::ostream & out, unsigned num_lits, literal const * lits, expr * const * bool_var2expr_map) { - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { if (i > 0) out << " "; display_compact(out, lits[i], bool_var2expr_map); @@ -89,7 +89,7 @@ namespace smt { } std::ostream& display_verbose(std::ostream & out, ast_manager& m, unsigned num_lits, literal const * lits, expr * const * bool_var2expr_map, char const* sep) { - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { if (i > 0) out << sep; display(out, lits[i], m, bool_var2expr_map); @@ -103,10 +103,10 @@ namespace smt { */ bool backward_subsumption(unsigned num_lits1, literal const * lits1, unsigned num_lits2, literal const * lits2) { unsigned i = 0; - for (; i < num_lits1; i++) { + for (; i < num_lits1; ++i) { literal l1 = lits1[i]; unsigned j = 0; - for (; j < num_lits2; j++) + for (; j < num_lits2; ++j) if (l1 == lits2[j]) break; if (j == num_lits2) diff --git a/src/smt/smt_model_checker.cpp b/src/smt/smt_model_checker.cpp index dfe5606a8..ce065c219 100644 --- a/src/smt/smt_model_checker.cpp +++ b/src/smt/smt_model_checker.cpp @@ -175,7 +175,7 @@ namespace smt { unsigned num_decls = q->get_num_decls(); subst_args.resize(num_decls, nullptr); sks.resize(num_decls, nullptr); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { sort * s = q->get_decl_sort(num_decls - i - 1); expr * sk = m.mk_fresh_const(nullptr, s); sks[num_decls - i - 1] = sk; @@ -207,7 +207,7 @@ namespace smt { expr_ref def(m); bindings.resize(num_decls); unsigned max_generation = 0; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { expr * sk = sks.get(num_decls - i - 1); func_decl * sk_d = to_app(sk)->get_decl(); expr_ref sk_value(cex->get_some_const_interp(sk_d), m); @@ -579,7 +579,7 @@ namespace smt { unsigned num_decls = q->get_num_decls(); unsigned gen = inst.m_generation; unsigned offset = inst.m_bindings_offset; - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { expr * b = m_pinned_exprs.get(offset + i); if (!m_context->e_internalized(b)) { TRACE(model_checker, tout << "internalizing b:\n" << mk_pp(b, m) << "\n";); diff --git a/src/smt/smt_model_finder.cpp b/src/smt/smt_model_finder.cpp index a39f9e8b7..d2217cd52 100644 --- a/src/smt/smt_model_finder.cpp +++ b/src/smt/smt_model_finder.cpp @@ -1069,7 +1069,7 @@ namespace smt { expr_ref_vector args(m); bool has_proj = false; - for (unsigned i = 0; i < arity; i++) { + for (unsigned i = 0; i < arity; ++i) { var* v = m.mk_var(i, f->get_domain(i)); func_decl* pi = get_f_i_proj(f, i); if (pi != nullptr) { @@ -1205,7 +1205,7 @@ namespace smt { n1->get_root()->display(tout, m); n2->get_root()->display(tout, m); tout << "f signature: "; - for (unsigned i = 0; i < m_f->get_arity(); i++) tout << mk_pp(m_f->get_domain(i), m) << " "; + for (unsigned i = 0; i < m_f->get_arity(); ++i) tout << mk_pp(m_f->get_domain(i), m) << " "; tout << "-> " << mk_pp(m_f->get_range(), m) << "\n"; ); @@ -1726,7 +1726,7 @@ namespace smt { } void process_auf(auf_solver& s, context* ctx) { - for (unsigned i = 0; i < m_flat_q->get_num_decls(); i++) { + for (unsigned i = 0; i < m_flat_q->get_num_decls(); ++i) { // make sure a node exists for each variable. s.get_uvar(m_flat_q, i); } @@ -2007,7 +2007,7 @@ namespace smt { */ void process_u_app(app* t) { unsigned num_args = t->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr* arg = t->get_arg(i); if (is_var(arg)) { SASSERT(t->get_decl()->get_domain(i) == to_var(arg)->get_sort()); @@ -2057,7 +2057,7 @@ namespace smt { unsigned num_args = t->get_num_args(); app* array = to_app(t->get_arg(0)); visit_term(array); // array may be a nested array. - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { expr* arg = t->get_arg(i); if (is_var(arg)) { insert_qinfo(alloc(select_var, m, t, i, to_var(arg)->get_idx())); @@ -2252,7 +2252,7 @@ namespace smt { void process_clause(expr* cls) { SASSERT(is_clause(m, cls)); unsigned num_lits = get_clause_num_literals(m, cls); - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { expr* lit = get_clause_literal(m, cls, i); SASSERT(is_literal(m, lit)); expr* atom; @@ -2365,7 +2365,7 @@ namespace smt { void model_finder::restore_quantifiers(unsigned old_size) { unsigned curr_size = m_quantifiers.size(); SASSERT(old_size <= curr_size); - for (unsigned i = old_size; i < curr_size; i++) { + for (unsigned i = old_size; i < curr_size; ++i) { quantifier* q = m_quantifiers[i]; SASSERT(m_q2info.contains(q)); quantifier_info* info = get_quantifier_info(q); @@ -2548,7 +2548,7 @@ namespace smt { // Remark: sks were created for the flat version of q. SASSERT(get_flat_quantifier(q)->get_num_decls() == sks.size()); SASSERT(sks.size() >= num_decls); - for (unsigned i = 0; i < num_decls; i++) { + for (unsigned i = 0; i < num_decls; ++i) { expr* sk = sks.get(num_decls - i - 1); instantiation_set const* s = get_uvar_inst_set(q, i); if (s == nullptr) @@ -2573,7 +2573,7 @@ namespace smt { void model_finder::restart_eh() { unsigned sz = m_new_constraints.size(); if (sz > 0) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr* c = m_new_constraints.get(i); TRACE(model_finder_bug_detail, tout << "asserting new constraint: " << mk_pp(c, m) << "\n";); m_context->internalize(c, true); diff --git a/src/smt/smt_model_generator.cpp b/src/smt/smt_model_generator.cpp index c85227f08..e49701a33 100644 --- a/src/smt/smt_model_generator.cpp +++ b/src/smt/smt_model_generator.cpp @@ -73,7 +73,7 @@ namespace smt { */ void model_generator::mk_bool_model() { unsigned sz = m_context->get_num_b_internalized(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * p = m_context->get_b_internalized(i); if (is_uninterp_const(p) && m_context->is_relevant(p)) { SASSERT(m.is_bool(p)); @@ -423,7 +423,7 @@ namespace smt { */ void model_generator::mk_func_interps() { unsigned sz = m_context->get_num_e_internalized(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * t = m_context->get_e_internalized(i); if (!m_context->is_relevant(t)) continue; @@ -437,7 +437,7 @@ namespace smt { ptr_buffer args; expr * result = get_value(n); SASSERT(result); - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { app * arg = get_value(n->get_arg(j)); SASSERT(arg); args.push_back(arg); @@ -452,7 +452,7 @@ namespace smt { // The entry must be new because n->get_cg() == n TRACE(model, tout << "insert new entry for:\n" << mk_ismt2_pp(n->get_expr(), m) << "\nargs: "; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { tout << "#" << n->get_arg(i)->get_owner_id() << " "; } tout << "\n"; @@ -508,7 +508,7 @@ namespace smt { unsigned num = m_context->get_num_macros(); TRACE(model, tout << "num. macros: " << num << "\n";); expr_ref v(m); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { func_decl * f = m_context->get_macro_interpretation(i, v); func_interp * fi = alloc(func_interp, m, f->get_arity()); fi->set_else(v); diff --git a/src/smt/smt_quantifier.cpp b/src/smt/smt_quantifier.cpp index 32c785d90..9cd270f1d 100644 --- a/src/smt/smt_quantifier.cpp +++ b/src/smt/smt_quantifier.cpp @@ -267,7 +267,7 @@ namespace smt { // At this point all relevant equalities for the match are logged. out << "[new-match] " << f->get_data_hash() << " #" << q->get_id() << " #" << pat->get_id(); - for (unsigned i = 0; i < num_bindings; i++) { + for (unsigned i = 0; i < num_bindings; ++i) { // I don't want to use mk_pp because it creates expressions for pretty printing. // This nasty side-effect may change the behavior of Z3. out << " #" << bindings[num_bindings - i - 1]->get_owner_id(); @@ -680,7 +680,7 @@ namespace smt { } bool has_unary_pattern = false; unsigned num_patterns = q->get_num_patterns(); - for (unsigned i = 0; i < num_patterns; i++) { + for (unsigned i = 0; i < num_patterns; ++i) { app * mp = to_app(q->get_pattern(i)); if (mp->get_num_args() == 1) { has_unary_pattern = true; @@ -690,7 +690,7 @@ namespace smt { unsigned num_eager_multi_patterns = m_fparams->m_qi_max_eager_multipatterns; if (!has_unary_pattern) num_eager_multi_patterns++; - for (unsigned i = 0, j = 0; i < num_patterns; i++) { + for (unsigned i = 0, j = 0; i < num_patterns; ++i) { app * mp = to_app(q->get_pattern(i)); SASSERT(m.is_pattern(mp)); bool unary = (mp->get_num_args() == 1); diff --git a/src/smt/smt_quick_checker.cpp b/src/smt/smt_quick_checker.cpp index 04acc1a7b..c1b3a7a37 100644 --- a/src/smt/smt_quick_checker.cpp +++ b/src/smt/smt_quick_checker.cpp @@ -34,7 +34,7 @@ namespace smt { m_already_found.reserve(m_num_vars+1, false); m_candidates.reserve(m_num_vars+1); m_tmp_candidates.reserve(m_num_vars+1); - for (unsigned i = 0; i < m_num_vars; i++) { + for (unsigned i = 0; i < m_num_vars; ++i) { m_already_found[i] = false; m_candidates[i].reset(); } @@ -62,7 +62,7 @@ namespace smt { void quick_checker::collector::collect_core(app * n, func_decl * p, unsigned i) { func_decl * f = n->get_decl(); unsigned num_args = n->get_num_args(); - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * arg = n->get_arg(j); if (is_var(arg)) { unsigned idx = to_var(arg)->get_idx(); @@ -121,7 +121,7 @@ namespace smt { void quick_checker::collector::save_result(vector & candidates) { candidates.reserve(m_num_vars+1); - for (unsigned i = 0; i < m_num_vars; i++) { + for (unsigned i = 0; i < m_num_vars; ++i) { enode_vector & v = candidates[i]; v.reset(); enode_set & s = m_candidates[i]; @@ -131,7 +131,7 @@ namespace smt { } TRACE(collector, tout << "candidates:\n"; - for (unsigned i = 0; i < m_num_vars; i++) { + for (unsigned i = 0; i < m_num_vars; ++i) { tout << "var " << i << ":"; enode_vector & v = candidates[i]; for (enode * n : v) @@ -182,10 +182,10 @@ namespace smt { m_candidate_vectors.reset(); m_num_bindings = q->get_num_decls(); m_candidate_vectors.reserve(m_num_bindings+1); - for (unsigned i = 0; i < m_num_bindings; i++) { + for (unsigned i = 0; i < m_num_bindings; ++i) { m_candidate_vectors[i].reset(); sort * s = q->get_decl_sort(i); - for (unsigned j = 0; j < num_candidates; j++) { + for (unsigned j = 0; j < num_candidates; ++j) { if (candidates[j]->get_sort() == s) { expr * n = candidates[j]; m_context.internalize(n, false); @@ -201,17 +201,17 @@ namespace smt { vector> empty_used_enodes; buffer szs; buffer it; - for (unsigned i = 0; i < m_num_bindings; i++) { + for (unsigned i = 0; i < m_num_bindings; ++i) { unsigned sz = m_candidate_vectors[i].size(); if (sz == 0) return false; szs.push_back(sz); it.push_back(0); } - TRACE(quick_checker_sizes, tout << mk_pp(q, m_manager) << "\n"; for (unsigned i = 0; i < szs.size(); i++) tout << szs[i] << " "; tout << "\n";); + TRACE(quick_checker_sizes, tout << mk_pp(q, m_manager) << "\n"; for (unsigned i = 0; i < szs.size(); ++i) tout << szs[i] << " "; tout << "\n";); TRACE(quick_checker_candidates, tout << "candidates:\n"; - for (unsigned i = 0; i < m_num_bindings; i++) { + for (unsigned i = 0; i < m_num_bindings; ++i) { enode_vector & v = m_candidate_vectors[i]; for (enode * n : v) tout << "#" << n->get_owner_id() << " "; @@ -220,12 +220,12 @@ namespace smt { bool result = false; m_bindings.reserve(m_num_bindings+1, 0); do { - for (unsigned i = 0; i < m_num_bindings; i++) + for (unsigned i = 0; i < m_num_bindings; ++i) m_bindings[m_num_bindings - i - 1] = m_candidate_vectors[i][it[i]]; if (!m_context.contains_instance(q, m_num_bindings, m_bindings.data())) { bool is_candidate = false; TRACE(quick_checker, tout << "processing bindings:"; - for (unsigned i = 0; i < m_num_bindings; i++) tout << " #" << m_bindings[i]->get_owner_id(); + for (unsigned i = 0; i < m_num_bindings; ++i) tout << " #" << m_bindings[i]->get_owner_id(); tout << "\n";); if (unsat) is_candidate = check_quantifier(q, false); @@ -234,7 +234,7 @@ namespace smt { if (is_candidate) { TRACE(quick_checker, tout << "found new candidate\n";); TRACE(quick_checker_sizes, tout << "found new candidate\n"; - for (unsigned i = 0; i < m_num_bindings; i++) tout << "#" << m_bindings[i]->get_owner_id() << " "; tout << "\n";); + for (unsigned i = 0; i < m_num_bindings; ++i) tout << "#" << m_bindings[i]->get_owner_id() << " "; tout << "\n";); unsigned max_generation = get_max_generation(m_num_bindings, m_bindings.data()); if (m_context.add_instance(q, nullptr /* no pattern was used */, m_num_bindings, m_bindings.data(), nullptr, max_generation, @@ -259,7 +259,7 @@ namespace smt { bool quick_checker::all_args(app * a, bool is_true) { unsigned num_args = a->get_num_args(); - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (!check(a->get_arg(i), is_true)) return false; return true; @@ -267,7 +267,7 @@ namespace smt { bool quick_checker::any_arg(app * a, bool is_true) { unsigned num_args = a->get_num_args(); - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) if (check(a->get_arg(i), is_true)) return true; return false; @@ -371,7 +371,7 @@ namespace smt { ptr_buffer new_args; ptr_buffer new_arg_enodes; unsigned num_args = to_app(n)->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = canonize(to_app(n)->get_arg(i)); new_args.push_back(arg); if (m_context.e_internalized(arg)) @@ -387,7 +387,7 @@ namespace smt { } } // substitute by values in the model - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = new_args[i]; if (m_context.e_internalized(arg)) { expr_ref new_value(m_manager); diff --git a/src/smt/smt_relevancy.cpp b/src/smt/smt_relevancy.cpp index 80fc9bc8d..720eac6c2 100644 --- a/src/smt/smt_relevancy.cpp +++ b/src/smt/smt_relevancy.cpp @@ -562,7 +562,7 @@ namespace smt { void display(std::ostream & out) const override { if (enabled() && !m_relevant_exprs.empty()) { out << "relevant exprs:\n"; - for (unsigned i = 0; i < m_relevant_exprs.size(); i++) { + for (unsigned i = 0; i < m_relevant_exprs.size(); ++i) { out << "#" << m_relevant_exprs.get(i)->get_id() << " "; } out << "\n"; @@ -573,7 +573,7 @@ namespace smt { bool check_relevancy_app(app * n) const { SASSERT(is_relevant(n)); unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { CTRACE(relevancy_bug, !is_relevant(n->get_arg(i)), tout << "n: " << mk_ismt2_pp(n, get_manager()) << "\ni: " << i << "\n";); SASSERT(is_relevant(n->get_arg(i))); } @@ -586,7 +586,7 @@ namespace smt { return check_relevancy_app(n); if (val == l_true) { unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = n->get_arg(i); if (m_context.find_assignment(arg) == l_true && is_relevant(arg)) return true; @@ -603,7 +603,7 @@ namespace smt { return check_relevancy_app(n); if (val == l_false) { unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = n->get_arg(i); if (m_context.find_assignment(arg) == l_false && is_relevant(arg)) return true; @@ -647,7 +647,7 @@ namespace smt { SASSERT(!can_propagate()); ast_manager & m = get_manager(); unsigned sz = v.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * n = v.get(i); if (is_relevant(n)) { TRACE(check_relevancy, tout << "checking:\n" << mk_ll_pp(n, get_manager()) << "internalized: " << m_context.find_enode(n) << "\n";); diff --git a/src/smt/smt_solver.cpp b/src/smt/smt_solver.cpp index 0fcb5b702..e82f4277c 100644 --- a/src/smt/smt_solver.cpp +++ b/src/smt/smt_solver.cpp @@ -277,7 +277,7 @@ namespace { void get_unsat_core(expr_ref_vector & r) override { unsigned sz = m_context.get_unsat_core_size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { r.push_back(m_context.get_unsat_core_expr(i)); } @@ -397,11 +397,11 @@ namespace { collect_fds_proc p(m, m_fds); unsigned sz = n->get_num_patterns(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) quick_for_each_expr(p, m_visited, n->get_pattern(i)); sz = n->get_num_no_patterns(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) quick_for_each_expr(p, m_visited, n->get_no_pattern(i)); } }; @@ -440,7 +440,7 @@ namespace { func_decl_set pattern_fds; vector assrtn_fds; - for (unsigned d = 0; d < m_core_extend_patterns_max_distance; d++) { + for (unsigned d = 0; d < m_core_extend_patterns_max_distance; ++d) { new_core_literals.reset(); for (expr* c : core) { diff --git a/src/smt/smt_theory.cpp b/src/smt/smt_theory.cpp index 734163cb6..4b3a53baf 100644 --- a/src/smt/smt_theory.cpp +++ b/src/smt/smt_theory.cpp @@ -61,7 +61,7 @@ namespace smt { void theory::display_var2enode(std::ostream & out) const { unsigned sz = m_var2enode.size(); - for (unsigned v = 0; v < sz; v++) { + for (unsigned v = 0; v < sz; ++v) { out << "v" << v << " -> #" << m_var2enode[v]->get_owner_id() << "\n"; } } @@ -75,7 +75,7 @@ namespace smt { out << "(" << d->get_name(); display_parameters(out, d->get_num_parameters(), d->get_parameters()); unsigned num = n->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { out << " "; display_app(out, to_app(n->get_arg(i))); } @@ -101,7 +101,7 @@ namespace smt { n = todo.back(); todo.pop_back(); unsigned num = n->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { app * arg = to_app(n->get_arg(i)); if (d->is_associative() && arg->get_decl() == d) { todo.push_back(arg); diff --git a/src/smt/smt_theory.h b/src/smt/smt_theory.h index e6c361d3d..7050e27dd 100644 --- a/src/smt/smt_theory.h +++ b/src/smt/smt_theory.h @@ -526,7 +526,7 @@ namespace smt { table.reset(); bool result = false; int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { enode * n = get_enode(v); theory_var other = null_theory_var; TRACE(assume_eqs, diff --git a/src/smt/tactic/smt_tactic_core.cpp b/src/smt/tactic/smt_tactic_core.cpp index 2c584d288..69d38a35b 100644 --- a/src/smt/tactic/smt_tactic_core.cpp +++ b/src/smt/tactic/smt_tactic_core.cpp @@ -195,13 +195,13 @@ public: } else if (in->proofs_enabled()) { unsigned sz = in->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_ctx.load()->assert_expr(in->form(i), in->pr(i)); } } else { unsigned sz = in->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_ctx.load()->assert_expr(in->form(i)); } } @@ -259,7 +259,7 @@ public: expr_dependency * lcore = nullptr; if (in->unsat_core_enabled()) { unsigned sz = m_ctx.load()->get_unsat_core_size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * b = m_ctx.load()->get_unsat_core_expr(i); SASSERT(is_uninterp_const(b) && m.is_bool(b)); expr * d = bool2dep.find(b); diff --git a/src/smt/theory_arith_aux.h b/src/smt/theory_arith_aux.h index 80f6c58fe..d4818cec8 100644 --- a/src/smt/theory_arith_aux.h +++ b/src/smt/theory_arith_aux.h @@ -89,7 +89,7 @@ namespace smt { unsigned i = 0; unsigned j = 0; unsigned sz = m_entries.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { row_entry & t1 = m_entries[i]; if (!t1.is_dead()) { if (i != j) { @@ -226,7 +226,7 @@ namespace smt { unsigned i = 0; unsigned j = 0; unsigned sz = m_entries.size(); - for (; i < sz; i++) { + for (; i < sz; ++i) { col_entry & e1 = m_entries[i]; if (!e1.is_dead()) { if (i != j) { @@ -318,10 +318,10 @@ namespace smt { void theory_arith::antecedents_t::init() { if (!m_init && !empty()) { m_params.push_back(parameter(symbol("unknown-arith"))); - for (unsigned i = 0; i < m_lits.size(); i++) { + for (unsigned i = 0; i < m_lits.size(); ++i) { m_params.push_back(parameter(m_lit_coeffs[i].to_rational())); } - for (unsigned i = 0; i < m_eqs.size(); i++) { + for (unsigned i = 0; i < m_eqs.size(); ++i) { m_params.push_back(parameter(m_eq_coeffs[i].to_rational())); } m_init = true; @@ -571,7 +571,7 @@ namespace smt { return; TRACE(move_unconstrained_to_base, tout << "before...\n"; display(tout);); int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (m_var_occs[v].empty() && is_free(v)) { switch (get_var_kind(v)) { case QUASI_BASE: @@ -611,7 +611,7 @@ namespace smt { template void theory_arith::elim_quasi_base_rows() { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_quasi_base(v)) { quasi_base_row2base_row(get_var_row(v)); } @@ -624,7 +624,7 @@ namespace smt { template void theory_arith::remove_fixed_vars_from_base() { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_base(v) && is_fixed(v)) { row const & r = m_rows[get_var_row(v)]; typename vector::const_iterator it = r.begin_entries(); @@ -659,7 +659,7 @@ namespace smt { template void theory_arith::try_to_minimize_rational_coeffs() { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (!is_base(v) || !is_int(v)) continue; numeral max_den; @@ -1511,7 +1511,7 @@ namespace smt { bool theory_arith::has_interface_equality(theory_var x) { theory_var num = get_num_vars(); enode* r = get_enode(x)->get_root(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (v == x) continue; enode* n = get_enode(v); if (ctx.is_shared(n) && n->get_root() == r) { @@ -2120,7 +2120,7 @@ namespace smt { m_var_value_table.reset(); m_tmp_var_set.reset(); sbuffer candidates; - for (theory_var v = 0; v < num_vars; v++) { + for (theory_var v = 0; v < num_vars; ++v) { enode * n1 = get_enode(v); if (!is_relevant_and_shared(n1)) continue; @@ -2206,7 +2206,7 @@ namespace smt { m_var_value_table.reset(); bool result = false; int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { enode * n = get_enode(v); if (!is_relevant_and_shared(n)) continue; diff --git a/src/smt/theory_arith_core.h b/src/smt/theory_arith_core.h index 44e373764..680cb04e8 100644 --- a/src/smt/theory_arith_core.h +++ b/src/smt/theory_arith_core.h @@ -954,7 +954,7 @@ namespace smt { collect_vars(r_id, BASE, to_add); TRACE(quasi_base_bug_detail, display_row_info(tout, r_id); - for (unsigned i = 0; i < to_add.size(); i++) { + for (unsigned i = 0; i < to_add.size(); ++i) { theory_var v = to_add[i].m_var; SASSERT(is_base(v)); SASSERT(!has_var_kind(get_var_row(v), BASE)); @@ -1845,7 +1845,7 @@ namespace smt { void theory_arith::add_rows(unsigned r1, unsigned sz, linear_monomial * a_xs) { if (sz == 0) return; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { linear_monomial & m = a_xs[i]; numeral c = m.m_coeff; theory_var v = m.m_var; @@ -3081,7 +3081,7 @@ namespace smt { if (proof_rule) tout << proof_rule << "\n"; tout << "@" << ctx.get_scope_level() << "\n"; - for (unsigned i = 0; i < num_literals; i++) { + for (unsigned i = 0; i < num_literals; ++i) { ctx.display_detailed_literal(tout, lits[i]); tout << " "; if (coeffs_enabled()) { @@ -3089,7 +3089,7 @@ namespace smt { } tout << "\n"; } - for (unsigned i = 0; i < num_eqs; i++) { + for (unsigned i = 0; i < num_eqs; ++i) { tout << "#" << eqs[i].first->get_owner_id() << "=#" << eqs[i].second->get_owner_id() << " "; if (coeffs_enabled()) { tout << "bound: " << bounds.eq_coeffs()[i] << "\n"; @@ -3177,7 +3177,7 @@ namespace smt { auto eps = ctx.get_fparams().m_arith_epsilon; m_epsilon = numeral(eps); theory_var num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { bound * l = lower(v); bound * u = upper(v); if (l != nullptr) @@ -3213,7 +3213,7 @@ namespace smt { rational2var mapping; theory_var num = get_num_vars(); bool refine = false; - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int_src(v)) continue; if (!ctx.is_shared(get_enode(v))) diff --git a/src/smt/theory_arith_int.h b/src/smt/theory_arith_int.h index 19658b0f4..8c70ac66f 100644 --- a/src/smt/theory_arith_int.h +++ b/src/smt/theory_arith_int.h @@ -44,7 +44,7 @@ namespace smt { template void theory_arith::move_non_base_vars_to_bounds() { theory_var num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_non_base(v)) { bound * l = lower(v); bound * u = upper(v); @@ -78,7 +78,7 @@ namespace smt { template bool theory_arith::has_infeasible_int_var() { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int(v) && !get_value(v).is_int()) return true; } @@ -457,7 +457,7 @@ namespace smt { ast_manager & m = get_manager(); expr_ref_vector _args(m); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { rational _k = args[i].m_coeff.to_rational(); expr * x = get_enode(args[i].m_var)->get_expr(); if (m_util.is_int(x) && !all_int) @@ -637,7 +637,7 @@ namespace smt { if (num_ints > 0) { lcm_den = lcm(lcm_den, denominator(k)); TRACE(gomory_cut_detail, tout << "k: " << k << " lcm_den: " << lcm_den << "\n"; - for (unsigned i = 0; i < pol.size(); i++) { + for (unsigned i = 0; i < pol.size(); ++i) { tout << pol[i].m_coeff << " " << pol[i].m_var << "\n"; } tout << "k: " << k << "\n";); @@ -645,14 +645,14 @@ namespace smt { if (!lcm_den.is_one()) { // normalize coefficients of integer parameters to be integers. unsigned n = pol.size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { pol[i].m_coeff *= lcm_den; SASSERT(!is_int(pol[i].m_var) || pol[i].m_coeff.is_int()); } k *= lcm_den; } TRACE(gomory_cut_detail, tout << "after *lcm\n"; - for (unsigned i = 0; i < pol.size(); i++) { + for (unsigned i = 0; i < pol.size(); ++i) { tout << pol[i].m_coeff << " * v" << pol[i].m_var << "\n"; } tout << "k: " << k << "\n";); @@ -893,7 +893,7 @@ namespace smt { bool inf_l, inf_u; inf_numeral l, u; numeral m; - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (!is_non_base(v)) continue; get_freedom_interval(v, inf_l, l, inf_u, u, m); @@ -937,7 +937,7 @@ namespace smt { template void theory_arith::fix_non_base_vars() { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (!is_non_base(v)) continue; if (!is_int(v)) @@ -965,7 +965,7 @@ namespace smt { TRACE(arith, int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int(v) && !get_value(v).is_int()) { numeral f1 = get_value(v).get_rational() - floor(get_value(v).get_rational()); numeral f2 = ceil(get_value(v).get_rational()) - get_value(v).get_rational(); @@ -980,7 +980,7 @@ namespace smt { numeral max(0); numeral min(1); int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int(v) && !get_value(v).is_int()) { numeral f1 = get_value(v).get_rational() - floor(get_value(v).get_rational()); numeral f2 = ceil(get_value(v).get_rational()) - get_value(v).get_rational(); @@ -1010,7 +1010,7 @@ namespace smt { bool inf_l; bool inf_u; inf_numeral l; inf_numeral u; numeral m; - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_non_base(v)) { get_freedom_interval(v, inf_l, l, inf_u, u, m); if ((!m.is_one() /* && !l.is_zero() */) || !get_value(v).is_int()) { @@ -1032,7 +1032,7 @@ namespace smt { TRACE(arith_int_inf, int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int(v) && !get_value(v).is_int()) { display_var(tout, v); } diff --git a/src/smt/theory_arith_inv.h b/src/smt/theory_arith_inv.h index 0fbc41b5e..f69d69d2f 100644 --- a/src/smt/theory_arith_inv.h +++ b/src/smt/theory_arith_inv.h @@ -108,7 +108,7 @@ namespace smt { template bool theory_arith::wf_rows() const { unsigned num = m_rows.size(); - for (unsigned r_id = 0; r_id < num; r_id++) { + for (unsigned r_id = 0; r_id < num; ++r_id) { SASSERT(wf_row(r_id)); if (m_rows[r_id].m_base_var == null_theory_var) { SASSERT(std::find(m_dead_rows.begin(), m_dead_rows.end(), r_id) != m_dead_rows.end()); @@ -145,7 +145,7 @@ namespace smt { template bool theory_arith::wf_columns() const { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { SASSERT(wf_column(v)); } return true; @@ -193,7 +193,7 @@ namespace smt { if (get_manager().limit().is_canceled()) return true; int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { CTRACE(bound_bug, below_lower(v) || above_upper(v), display_var(tout, v); display(tout);); SASSERT(!below_lower(v)); SASSERT(!above_upper(v)); @@ -205,7 +205,7 @@ namespace smt { template bool theory_arith::satisfy_integrality() const { int num = get_num_vars(); - for (theory_var v = 0; v < num; v++) { + for (theory_var v = 0; v < num; ++v) { if (is_int(v) && !get_value(v).is_int()) { TRACE(bound_bug, display_var(tout, v); display(tout);); return false; diff --git a/src/smt/theory_arith_nl.h b/src/smt/theory_arith_nl.h index 51c7f4499..1fd80c365 100644 --- a/src/smt/theory_arith_nl.h +++ b/src/smt/theory_arith_nl.h @@ -532,7 +532,7 @@ template bool theory_arith::propagate_nl_bounds() { m_dep_manager.reset(); bool propagated = false; - for (unsigned i = 0; i < m_nl_monomials.size(); i++) { + for (unsigned i = 0; i < m_nl_monomials.size(); ++i) { theory_var v = m_nl_monomials[i]; expr * m = var2expr(v); if (!ctx.is_relevant(m)) @@ -851,7 +851,7 @@ bool theory_arith::propagate_linear_monomial(theory_var v) { SASSERT(is_pure_monomial(m)); bool found_zero = false; - for (unsigned i = 0; !found_zero && i < to_app(m)->get_num_args(); i++) { + for (unsigned i = 0; !found_zero && i < to_app(m)->get_num_args(); ++i) { expr * arg = to_app(m)->get_arg(i); theory_var _var = expr2var(arg); if (is_fixed(_var)) { @@ -913,7 +913,7 @@ bool theory_arith::propagate_linear_monomials() { bool p = false; // CMW: m_nl_monomials can grow during this loop, so // don't use iterators. - for (unsigned i = 0; i < m_nl_monomials.size(); i++) { + for (unsigned i = 0; i < m_nl_monomials.size(); ++i) { if (propagate_linear_monomial(m_nl_monomials[i])) p = true; } @@ -1195,7 +1195,7 @@ template expr * theory_arith::power(expr * var, unsigned power) { SASSERT(power > 0); expr * r = var; - for (unsigned i = 1; i < power; i++) + for (unsigned i = 1; i < power; ++i) r = m_util.mk_mul(var, r); m_nl_new_exprs.push_back(r); return r; @@ -1275,7 +1275,7 @@ void theory_arith::display_nested_form(std::ostream & out, expr * p) { else if (m_util.is_add(p)) { SASSERT(!has_var(p)); out << "("; - for (unsigned i = 0; i < to_app(p)->get_num_args(); i++) { + for (unsigned i = 0; i < to_app(p)->get_num_args(); ++i) { if (i > 0) out << " + "; display_nested_form(out, to_app(p)->get_arg(i)); } @@ -1376,7 +1376,7 @@ expr * theory_arith::factor(expr * m, expr * var, unsigned d) { } insert(m); SASSERT(idx == d); - TRACE(factor_bug, tout << "new_args:\n"; for(unsigned i = 0; i < new_args.size(); i++) tout << mk_pp(new_args[i], get_manager()) << "\n";); + TRACE(factor_bug, tout << "new_args:\n"; for(unsigned i = 0; i < new_args.size(); ++i) tout << mk_pp(new_args[i], get_manager()) << "\n";); expr * result = mk_nary_mul(new_args.size(), new_args.data(), m_util.is_int(var)); m_nl_new_exprs.push_back(result); TRACE(factor, tout << "result: " << mk_pp(result, get_manager()) << "\n";); @@ -1392,7 +1392,7 @@ expr_ref theory_arith::horner(unsigned depth, buffer & p, expr SASSERT(var != 0); unsigned d = get_min_degree(p, var); TRACE(horner_bug, tout << "poly:\n"; - for (unsigned i = 0; i < p.size(); i++) { if (i > 0) tout << " + "; tout << p[i].first << "*" << mk_pp(p[i].second, get_manager()); } tout << "\n"; + for (unsigned i = 0; i < p.size(); ++i) { if (i > 0) tout << " + "; tout << p[i].first << "*" << mk_pp(p[i].second, get_manager()); } tout << "\n"; tout << "var: " << mk_pp(var, get_manager()) << "\n"; tout << "min_degree: " << d << "\n";); buffer e; // monomials/x^d where var occurs with degree d @@ -1460,7 +1460,7 @@ expr_ref theory_arith::cross_nested(unsigned depth, buffer & p, unsigned nm = UINT_MAX; if (in_monovariate_monomials(p, var, i1, a, n, i2, b, nm)) { CTRACE(in_monovariate_monomials, n == nm, - for (unsigned i = 0; i < p.size(); i++) { + for (unsigned i = 0; i < p.size(); ++i) { if (i > 0) tout << " + "; tout << p[i].first << "*" << mk_pp(p[i].second, get_manager()); } tout << "\n"; @@ -1503,7 +1503,7 @@ expr_ref theory_arith::cross_nested(unsigned depth, buffer & p, TRACE(non_linear, tout << "new_expr:\n"; display_nested_form(tout, new_expr); tout << "\n";); buffer rest; unsigned sz = p.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (i != i1 && i != i2) rest.push_back(p[i]); } @@ -1815,7 +1815,7 @@ interval theory_arith::mk_interval_for(grobner::monomial const * m) { expr * var = nullptr; unsigned power = 0; unsigned num_vars = m->get_degree(); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { expr * curr = m->get_var(i); if (var == nullptr) { var = curr; @@ -1855,7 +1855,7 @@ void theory_arith::set_conflict(v_dependency * d) { template bool theory_arith::is_inconsistent(interval const & I, unsigned num_monomials, grobner::monomial * const * monomials, v_dependency * dep) { interval r(I); - for (unsigned i = 0; i < num_monomials; i++) { + for (unsigned i = 0; i < num_monomials; ++i) { grobner::monomial const * m = monomials[i]; r += mk_interval_for(m); if (r.minus_infinity() && r.plus_infinity()) @@ -1909,7 +1909,7 @@ bool is_perfect_square(grobner::monomial const * m, rational & r) { return false; expr * var = nullptr; unsigned power = 0; - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { expr * curr = m->get_var(i); if (var == nullptr) { var = curr; @@ -2001,7 +2001,7 @@ bool theory_arith::is_inconsistent2(grobner::equation const * eq, grobner & // since a new row must be created. buffer intervals; unsigned num = eq->get_num_monomials(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { grobner::monomial const * m = eq->get_monomial(i); intervals.push_back(mk_interval_for(m)); } @@ -2009,7 +2009,7 @@ bool theory_arith::is_inconsistent2(grobner::equation const * eq, grobner & deleted.resize(num, false); ptr_buffer monomials; // try to eliminate monomials that form perfect squares of the form (M1 - M2)^2 - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { grobner::monomial const * m1 = eq->get_monomial(i); rational a; if (deleted[i]) @@ -2021,7 +2021,7 @@ bool theory_arith::is_inconsistent2(grobner::equation const * eq, grobner & TRACE(non_linear, tout << "found perfect square monomial m1: "; gb.display_monomial(tout, *m1); tout << "\n";); // try to find another perfect square unsigned j = i + 1; - for (; j < num; j++) { + for (; j < num; ++j) { if (deleted[j]) continue; grobner::monomial const * m2 = eq->get_monomial(j); @@ -2032,7 +2032,7 @@ bool theory_arith::is_inconsistent2(grobner::equation const * eq, grobner & // try to find -2*root(m1)*root(m2) // This monomial must be smaller than m1, since m2 is smaller than m1. unsigned k = i + 1; - for (; k < num; k++) { + for (; k < num; ++k) { if (deleted[k]) continue; grobner::monomial const * m1m2 = eq->get_monomial(k); @@ -2081,7 +2081,7 @@ expr * theory_arith::monomial2expr(grobner::monomial const * m, bool is_int ptr_buffer args; if (!m->get_coeff().is_one()) args.push_back(m_util.mk_numeral(m->get_coeff(), is_int)); - for (unsigned j = 0; j < num_vars; j++) + for (unsigned j = 0; j < num_vars; ++j) args.push_back(m->get_var(j)); return mk_nary_mul(args.size(), args.data(), is_int); } @@ -2093,7 +2093,7 @@ template bool theory_arith::internalize_gb_eq(grobner::equation const * eq) { bool is_int = false; unsigned num_monomials = eq->get_num_monomials(); - for (unsigned i = 0; i < num_monomials; i++) { + for (unsigned i = 0; i < num_monomials; ++i) { grobner::monomial const * m = eq->get_monomial(i); unsigned degree = m->get_degree(); if (degree > m_params.m_nl_arith_max_degree) @@ -2103,7 +2103,7 @@ bool theory_arith::internalize_gb_eq(grobner::equation const * eq) { } rational k; ptr_buffer args; - for (unsigned i = 0; i < num_monomials; i++) { + for (unsigned i = 0; i < num_monomials; ++i) { grobner::monomial const * m = eq->get_monomial(i); if (m->get_degree() == 0) k -= m->get_coeff(); @@ -2185,7 +2185,7 @@ bool theory_arith::try_to_modify_eqs(ptr_vector& eqs, gr continue; // HACK: the equation 0 = 0, should have been discarded by the GB module. if (eq->get_monomial(0)->get_degree() != 1) continue; - for (unsigned j = 1; j < num_monomials; j++) { + for (unsigned j = 1; j < num_monomials; ++j) { grobner::monomial const * m = eq->get_monomial(j); if (m->get_degree() != 1) continue; diff --git a/src/smt/theory_arith_pp.h b/src/smt/theory_arith_pp.h index edc640d86..7448f6db8 100644 --- a/src/smt/theory_arith_pp.h +++ b/src/smt/theory_arith_pp.h @@ -120,7 +120,7 @@ namespace smt { else out << "rows (expanded view):\n"; unsigned num = m_rows.size(); - for (unsigned r_id = 0; r_id < num; r_id++) + for (unsigned r_id = 0; r_id < num; ++r_id) if (m_rows[r_id].m_base_var != null_theory_var) display_row(out, r_id, compact); } @@ -163,7 +163,7 @@ namespace smt { void theory_arith::display_rows_shape(std::ostream & out) const { unsigned num = m_rows.size(); unsigned num_trivial = 0; - for (unsigned r_id = 0; r_id < num; r_id++) { + for (unsigned r_id = 0; r_id < num; ++r_id) { row const & r = m_rows[r_id]; if (r.m_base_var != null_theory_var) { if (is_one_minus_one_row(r)) @@ -178,7 +178,7 @@ namespace smt { template void theory_arith::display_rows_bignums(std::ostream & out) const { unsigned num = m_rows.size(); - for (unsigned r_id = 0; r_id < num; r_id++) { + for (unsigned r_id = 0; r_id < num; ++r_id) { row const & r = m_rows[r_id]; if (r.m_base_var != null_theory_var) { for (auto const& e : r) { @@ -206,7 +206,7 @@ namespace smt { unsigned num_big_ints = 0; unsigned num_small_rats = 0; unsigned num_big_rats = 0; - for (unsigned r_id = 0; r_id < m_rows.size(); r_id++) { + for (unsigned r_id = 0; r_id < m_rows.size(); ++r_id) { row const & r = m_rows[r_id]; if (r.m_base_var != null_theory_var) { num_rows++; @@ -383,7 +383,7 @@ namespace smt { int n = get_num_vars(); int inf_vars = 0; int int_inf_vars = 0; - for (theory_var v = 0; v < n; v++) { + for (theory_var v = 0; v < n; ++v) { if ((lower(v) && lower(v)->get_value() > get_value(v)) || (upper(v) && upper(v)->get_value() < get_value(v))) inf_vars++; @@ -391,14 +391,14 @@ namespace smt { int_inf_vars++; } out << "infeasibles = " << inf_vars << " int_inf = " << int_inf_vars << std::endl; - for (theory_var v = 0; v < n; v++) { + for (theory_var v = 0; v < n; ++v) { display_var(out, v); } } template void theory_arith::display_bound(std::ostream & out, bound * b, unsigned indent) const { - for (unsigned i = 0; i < indent; i++) out << " "; + for (unsigned i = 0; i < indent; ++i) out << " "; b->display(*this, out); out << "\n"; } @@ -444,14 +444,14 @@ namespace smt { template void theory_arith::display_asserted_atoms(std::ostream & out) const { out << "asserted atoms:\n"; - for (unsigned i = 0; i < m_asserted_qhead; i++) { + for (unsigned i = 0; i < m_asserted_qhead; ++i) { bound * b = m_asserted_bounds[i]; if (b->is_atom()) display_atom(out, static_cast(b), true); } if (m_asserted_qhead < m_asserted_bounds.size()) { out << "delayed atoms:\n"; - for (unsigned i = m_asserted_qhead; i < m_asserted_bounds.size(); i++) { + for (unsigned i = m_asserted_qhead; i < m_asserted_bounds.size(); ++i) { bound * b = m_asserted_bounds[i]; if (b->is_atom()) display_atom(out, static_cast(b), true); @@ -483,7 +483,7 @@ namespace smt { ast_smt_pp pp(m); pp.set_benchmark_name("lemma"); int n = get_num_vars(); - for (theory_var v = 0; v < n; v++) { + for (theory_var v = 0; v < n; ++v) { expr * n = get_enode(v)->get_expr(); if (is_fixed(v)) { inf_numeral k_inf = lower_bound(v); diff --git a/src/smt/theory_array.cpp b/src/smt/theory_array.cpp index 816e542e0..5c9ac3a80 100644 --- a/src/smt/theory_array.cpp +++ b/src/smt/theory_array.cpp @@ -403,7 +403,7 @@ namespace smt { return FC_DONE; final_check_status r = FC_DONE; unsigned num_vars = get_num_vars(); - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { var_data * d = m_var_data[v]; if (d->m_prop_upward && instantiate_axiom2b_for(v)) r = FC_CONTINUE; @@ -465,14 +465,14 @@ namespace smt { unsigned num_vars = get_num_vars(); if (num_vars == 0) return; out << "Theory array:\n"; - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { display_var(out, v); } } // TODO: move to another file void theory_array::display_ids(std::ostream & out, unsigned n, enode * const * v) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (i > 0) out << " "; out << "#" << v[i]->get_owner_id(); } diff --git a/src/smt/theory_array_base.cpp b/src/smt/theory_array_base.cpp index 6e04c0290..d30d2013b 100644 --- a/src/smt/theory_array_base.cpp +++ b/src/smt/theory_array_base.cpp @@ -49,7 +49,7 @@ namespace smt { app * theory_array_base::mk_select(unsigned num_args, expr * const * args) { app * r = m.mk_app(get_family_id(), OP_SELECT, 0, nullptr, num_args, args); TRACE(mk_var_bug, tout << "mk_select: " << r->get_id() << " num_args: " << num_args; - for (unsigned i = 0; i < num_args; i++) tout << " " << args[i]->get_id(); + for (unsigned i = 0; i < num_args; ++i) tout << " " << args[i]->get_id(); tout << "\n";); return r; } @@ -161,7 +161,7 @@ namespace smt { sel1_args.push_back(store->get_expr()); sel2_args.push_back(a->get_expr()); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { sel1_args.push_back(is[i]->get_expr()); sel2_args.push_back(is[i]->get_expr()); } @@ -171,7 +171,7 @@ namespace smt { literal conseq = null_literal; expr * conseq_expr = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * idx1 = js[i]; enode * idx2 = is[i]; @@ -221,7 +221,7 @@ namespace smt { bool theory_array_base::assert_store_axiom2(enode * store, enode * select) { unsigned num_args = select->get_num_args(); unsigned i = 1; - for (; i < num_args; i++) + for (; i < num_args; ++i) if (store->get_arg(i)->get_root() != select->get_arg(i)->get_root()) break; if (i == num_args) @@ -259,7 +259,7 @@ namespace smt { SASSERT(n1->get_num_args() == n2->get_num_args()); unsigned n = n1->get_num_args(); // skipping first argument of the select. - for(unsigned i = 1; i < n; i++) { + for(unsigned i = 1; i < n; ++i) { if (n1->get_arg(i)->get_root() != n2->get_arg(i)->get_root()) { return false; } @@ -346,7 +346,7 @@ namespace smt { expr_ref_vector args1(m), args2(m); args1.push_back(e1); args2.push_back(e2); - for (unsigned i = 0; i < dimension; i++) { + for (unsigned i = 0; i < dimension; ++i) { expr * k = m.mk_app(funcs->get(i), e1, e2); args1.push_back(k); args2.push_back(k); @@ -382,7 +382,7 @@ namespace smt { args2.push_back(instantiate_lambda(e2)); svector names; sort_ref_vector sorts(m); - for (unsigned i = 0; i < dimension; i++) { + for (unsigned i = 0; i < dimension; ++i) { sort * srt = get_array_domain(s, i); sorts.push_back(srt); names.push_back(symbol(i)); @@ -425,15 +425,15 @@ namespace smt { void theory_array_base::propagate() { while (can_propagate()) { - for (unsigned i = 0; i < m_axiom1_todo.size(); i++) + for (unsigned i = 0; i < m_axiom1_todo.size(); ++i) assert_store_axiom1_core(m_axiom1_todo[i]); m_axiom1_todo.reset(); - for (unsigned i = 0; i < m_axiom2_todo.size(); i++) + for (unsigned i = 0; i < m_axiom2_todo.size(); ++i) assert_store_axiom2_core(m_axiom2_todo[i].first, m_axiom2_todo[i].second); m_axiom2_todo.reset(); - for (unsigned i = 0; i < m_extensionality_todo.size(); i++) + for (unsigned i = 0; i < m_extensionality_todo.size(); ++i) assert_extensionality_core(m_extensionality_todo[i].first, m_extensionality_todo[i].second); - for (unsigned i = 0; i < m_congruent_todo.size(); i++) + for (unsigned i = 0; i < m_congruent_todo.size(); ++i) assert_congruent_core(m_congruent_todo[i].first, m_congruent_todo[i].second); m_extensionality_todo.reset(); m_congruent_todo.reset(); @@ -475,14 +475,14 @@ namespace smt { unsigned num_args = parent->get_num_args(); if (is_store(parent)) { SET_ARRAY(parent->get_arg(0)); - for (unsigned i = 1; i < num_args - 1; i++) { + for (unsigned i = 1; i < num_args - 1; ++i) { SET_INDEX(parent->get_arg(i)); } SET_VALUE(parent->get_arg(num_args - 1)); } else if (is_select(parent)) { SET_ARRAY(parent->get_arg(0)); - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { SET_INDEX(parent->get_arg(i)); } } @@ -516,7 +516,7 @@ namespace smt { void theory_array_base::collect_shared_vars(sbuffer & result) { ptr_buffer to_unmark; unsigned num_vars = get_num_vars(); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { enode * n = get_enode(i); if (!ctx.is_relevant(n) || !is_array_sort(n)) { continue; @@ -758,7 +758,7 @@ namespace smt { bool theory_array_base::sel_eq::operator()(enode * n1, enode * n2) const { SASSERT(n1->get_num_args() == n2->get_num_args()); unsigned num_args = n1->get_num_args(); - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { if (n1->get_arg(i)->get_root() != n2->get_arg(i)->get_root()) return false; } @@ -824,7 +824,7 @@ namespace smt { // check whether the sel idx was overwritten by the store unsigned num_args = sel->get_num_args(); unsigned i = 1; - for (; i < num_args; i++) { + for (; i < num_args; ++i) { if (sel->get_arg(i)->get_root() != parent->get_arg(i)->get_root()) break; } @@ -851,7 +851,7 @@ namespace smt { for (enode * r : m_selects_domain) { propagate_selects_to_store_parents(r, todo); } - for (unsigned qhead = 0; qhead < todo.size(); qhead++) { + for (unsigned qhead = 0; qhead < todo.size(); ++qhead) { enode_pair & pair = todo[qhead]; enode * r = pair.first; enode * sel = pair.second; @@ -916,7 +916,7 @@ namespace smt { SASSERT(m_dim == 0 || m_dim == num_args); m_dim = num_args; m_num_entries ++; - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) m_dependencies.push_back(model_value_dependency(args[i])); m_dependencies.push_back(model_value_dependency(value)); } @@ -948,10 +948,10 @@ namespace smt { } ptr_buffer args; - for (unsigned i = 0; i < m_num_entries; i++) { + for (unsigned i = 0; i < m_num_entries; ++i) { args.reset(); // copy indices - for (unsigned j = 0; j < m_dim; j++, idx++) + for (unsigned j = 0; j < m_dim; ++j, ++idx) args.push_back(values[idx]); expr * result = values[idx]; idx++; diff --git a/src/smt/theory_array_full.cpp b/src/smt/theory_array_full.cpp index 530a13524..5b316249e 100644 --- a/src/smt/theory_array_full.cpp +++ b/src/smt/theory_array_full.cpp @@ -755,7 +755,7 @@ namespace smt { else { r = theory_array::assert_delayed_axioms(); unsigned num_vars = get_num_vars(); - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { var_data * d = m_var_data[v]; if (d->m_prop_upward && instantiate_axiom_map_for(v)) r = FC_CONTINUE; diff --git a/src/smt/theory_bv.cpp b/src/smt/theory_bv.cpp index 63eb671e5..14cfc943f 100644 --- a/src/smt/theory_bv.cpp +++ b/src/smt/theory_bv.cpp @@ -53,11 +53,11 @@ namespace smt { bits.reset(); m_bits_expr.reset(); - for (unsigned i = 0; i < bv_size; i++) + for (unsigned i = 0; i < bv_size; ++i) m_bits_expr.push_back(mk_bit2bool(owner, i)); ctx.internalize(m_bits_expr.data(), bv_size, true); - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { bool_var b = ctx.get_bool_var(m_bits_expr[i]); bits.push_back(literal(b)); if (is_relevant && !ctx.is_relevant(b)) { @@ -66,7 +66,7 @@ namespace smt { } TRACE(bv, tout << "v" << v << " #" << owner->get_id() << "\n"; - for (unsigned i = 0; i < bv_size; i++) + for (unsigned i = 0; i < bv_size; ++i) tout << mk_bounded_pp(m_bits_expr[i], m) << "\n"; ); @@ -324,7 +324,7 @@ namespace smt { ctx.internalize(bits.data(), sz, true); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * bit = bits.get(i); literal l = ctx.get_literal(bit); TRACE(init_bits, tout << "bit " << i << " of #" << n->get_owner_id() << "\n" << mk_bounded_pp(bit, m) << "\n";); @@ -341,7 +341,7 @@ namespace smt { unsigned sz = bits.size(); unsigned & wpos = m_wpos[v]; unsigned init = wpos; - for (; wpos < sz; wpos++) { + for (; wpos < sz; ++wpos) { TRACE(find_wpos, tout << "curr bit: " << bits[wpos] << "\n";); if (ctx.get_assignment(bits[wpos]) == l_undef) { TRACE(find_wpos, tout << "moved wpos of v" << v << " to " << wpos << "\n";); @@ -349,7 +349,7 @@ namespace smt { } } wpos = 0; - for (; wpos < init; wpos++) { + for (; wpos < init; ++wpos) { if (ctx.get_assignment(bits[wpos]) == l_undef) { TRACE(find_wpos, tout << "moved wpos of v" << v << " to " << wpos << "\n";); return; @@ -572,7 +572,7 @@ namespace smt { m_bb.num2bits(val, sz, bits); SASSERT(bits.size() == sz); literal_vector & c_bits = m_bits[v]; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * l = bits.get(i); if (m.is_true(l)) { c_bits.push_back(true_literal); @@ -1129,7 +1129,7 @@ namespace smt { return false; } unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i <= num_args; i++) { + for (unsigned i = 0; i <= num_args; ++i) { expr* arg = (i == num_args)?n:n->get_arg(i); sort* s = arg->get_sort(); if (m_util.is_bv_sort(s) && m_util.get_bv_size(arg) > params().m_bv_blast_max_size) { @@ -1267,7 +1267,7 @@ namespace smt { } void theory_bv::propagate_bits() { - for (unsigned i = 0; i < m_prop_queue.size(); i++) { + for (unsigned i = 0; i < m_prop_queue.size(); ++i) { var_pos const & entry = m_prop_queue[i]; theory_var v = entry.first; unsigned idx = entry.second; @@ -1564,7 +1564,7 @@ namespace smt { // Remark: the assignment to b2 is marked as a bv theory propagation, // then it is not notified to the bv theory. changed = false; - for (unsigned idx = 0; idx < sz; idx++) { + for (unsigned idx = 0; idx < sz; ++idx) { literal bit1 = m_bits[v1][idx]; literal bit2 = m_bits[v2][idx]; if (bit1 == ~bit2) { @@ -1627,7 +1627,7 @@ namespace smt { auto reset_merge_aux = [&]() { for (auto & zo : bits1) m_merge_aux[zo.m_is_true][zo.m_idx] = null_theory_var; }; - DEBUG_CODE(for (unsigned i = 0; i < bv_size; i++) { + DEBUG_CODE(for (unsigned i = 0; i < bv_size; ++i) { SASSERT(m_merge_aux[0][i] == null_theory_var || m_merge_aux[1][i] == null_theory_var); } ); // save info about bits1 @@ -1651,7 +1651,7 @@ namespace smt { } // reset m_merge_aux vector reset_merge_aux(); - DEBUG_CODE(for (unsigned i = 0; i < bv_size; i++) { SASSERT(m_merge_aux[0][i] == null_theory_var || m_merge_aux[1][i] == null_theory_var); }); + DEBUG_CODE(for (unsigned i = 0; i < bv_size; ++i) { SASSERT(m_merge_aux[0][i] == null_theory_var || m_merge_aux[1][i] == null_theory_var); }); return true; } @@ -1867,7 +1867,7 @@ namespace smt { void theory_bv::display_atoms(std::ostream & out) const { out << "atoms:\n"; unsigned num = ctx.get_num_bool_vars(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { atom * a = get_bv2a(v); if (a && a->is_bit()) display_bit_atom(out, v, static_cast(a)); @@ -1878,7 +1878,7 @@ namespace smt { unsigned num_vars = get_num_vars(); if (num_vars == 0) return; out << "Theory bv:\n"; - for (unsigned v = 0; v < num_vars; v++) { + for (unsigned v = 0; v < num_vars; ++v) { display_var(out, v); } display_atoms(out); @@ -1936,7 +1936,7 @@ namespace smt { SASSERT(bits1.size() == bits2.size()); unsigned sz = bits1.size(); VERIFY(ctx.is_relevant(get_enode(v1))); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { literal bit1 = bits1[i]; literal bit2 = bits2[i]; lbool val1 = ctx.get_assignment(bit1); @@ -1977,7 +1977,7 @@ namespace smt { theory_var curr = v; do { literal_vector const & lits = m_bits[curr]; - for (unsigned i = 0; i < lits.size(); i++) { + for (unsigned i = 0; i < lits.size(); ++i) { literal l = lits[i]; if (l.var() == true_bool_var) { unsigned is_true = (l == true_literal); @@ -2016,7 +2016,7 @@ namespace smt { if (ctx.inconsistent()) return true; unsigned num = get_num_vars(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { check_assignment(v); check_zero_one_bits(v); } diff --git a/src/smt/theory_datatype.cpp b/src/smt/theory_datatype.cpp index c2ccbc061..81f57862b 100644 --- a/src/smt/theory_datatype.cpp +++ b/src/smt/theory_datatype.cpp @@ -316,7 +316,7 @@ namespace smt { force_push(); TRACE(datatype, tout << "internalizing term:\n" << mk_pp(term, m) << "\n";); unsigned num_args = term->get_num_args(); - for (unsigned i = 0; i < num_args; i++) + for (unsigned i = 0; i < num_args; ++i) ctx.internalize(term->get_arg(i), m.is_bool(term) && has_quantifiers(term)); // the internalization of the arguments may trigger the internalization of term. if (ctx.e_internalized(term)) @@ -351,7 +351,7 @@ namespace smt { // interpretation for x2. So, x2 cannot be a fresh value, // since it would have to be created after x1. // - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { enode * arg = e->get_arg(i); sort * s = arg->get_sort(); if (m_autil.is_array(s) && m_util.is_datatype(get_array_range(s))) { @@ -748,7 +748,7 @@ namespace smt { int num_vars = get_num_vars(); final_check_status r = FC_DONE; final_check_st _guard(this); - for (int v = 0; v < num_vars; v++) { + for (int v = 0; v < num_vars; ++v) { if (v == static_cast(m_find.find(v))) { enode * node = get_enode(v); sort* s = node->get_sort(); @@ -1041,7 +1041,7 @@ namespace smt { unsigned num_vars = get_num_vars(); if (num_vars == 0) return; out << "Theory datatype:\n"; - for (unsigned v = 0; v < num_vars; v++) + for (unsigned v = 0; v < num_vars; ++v) display_var(out, v); } diff --git a/src/smt/theory_dense_diff_logic_def.h b/src/smt/theory_dense_diff_logic_def.h index 5c351528e..ee8044e4c 100644 --- a/src/smt/theory_dense_diff_logic_def.h +++ b/src/smt/theory_dense_diff_logic_def.h @@ -621,8 +621,8 @@ namespace smt { template bool theory_dense_diff_logic::check_matrix() const { int sz = m_matrix.size(); - for (theory_var i = 0; i < sz; i++) { - for (theory_var j = 0; j < sz; j++) { + for (theory_var i = 0; i < sz; ++i) { + for (theory_var j = 0; j < sz; ++j) { cell const & c = m_matrix[i][j]; if (c.m_edge_id == self_edge_id) { SASSERT(i == j); @@ -704,10 +704,10 @@ namespace smt { int num_vars = get_num_vars(); m_assignment.reset(); m_assignment.resize(num_vars); - for (int i = 0; i < num_vars; i++) { + for (int i = 0; i < num_vars; ++i) { row & r = m_matrix[i]; numeral & d = m_assignment[i]; - for (int j = 0; j < num_vars; j++) { + for (int j = 0; j < num_vars; ++j) { if (i != j) { cell & c = r[j]; if (c.m_edge_id != null_edge_id && c.m_distance < d) { @@ -716,11 +716,11 @@ namespace smt { } } } - for (int i = 0; i < num_vars; i++) + for (int i = 0; i < num_vars; ++i) m_assignment[i].neg(); TRACE(ddl_model, tout << "ddl model\n"; - for (theory_var v = 0; v < num_vars; v++) { + for (theory_var v = 0; v < num_vars; ++v) { tout << "#" << mk_pp(get_enode(v)->get_expr(), m) << " = " << m_assignment[v] << "\n"; }); } @@ -812,7 +812,7 @@ namespace smt { } TRACE(ddl_model, tout << "ddl model\n"; - for (theory_var v = 0; v < num_vars; v++) { + for (theory_var v = 0; v < num_vars; ++v) { tout << "#" << mk_pp(get_enode(v)->get_expr(), m) << " = " << m_assignment[v] << "\n"; }); } diff --git a/src/smt/theory_dl.cpp b/src/smt/theory_dl.cpp index 822f7b0e7..d94c9595a 100644 --- a/src/smt/theory_dl.cpp +++ b/src/smt/theory_dl.cpp @@ -217,7 +217,7 @@ namespace smt { bool mk_rep(app* n) { unsigned num_args = n->get_num_args(); enode * e = nullptr; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { ctx.internalize(n->get_arg(i), false); } if (ctx.e_internalized(n)) { diff --git a/src/smt/theory_fpa.cpp b/src/smt/theory_fpa.cpp index 48885d80c..3b768b3f6 100644 --- a/src/smt/theory_fpa.cpp +++ b/src/smt/theory_fpa.cpp @@ -63,7 +63,7 @@ namespace smt { app * theory_fpa::fpa_value_proc::mk_value(model_generator & mg, expr_ref_vector const & values) { TRACE(t_fpa_detail, ast_manager & m = m_th.get_manager(); - for (unsigned i = 0; i < values.size(); i++) + for (unsigned i = 0; i < values.size(); ++i) tout << "value[" << i << "] = " << mk_ismt2_pp(values[i], m) << std::endl;); mpf_manager & mpfm = m_fu.fm(); @@ -140,7 +140,7 @@ namespace smt { TRACE(t_fpa_detail, ast_manager & m = m_th.get_manager(); - for (unsigned i = 0; i < values.size(); i++) + for (unsigned i = 0; i < values.size(); ++i) tout << "value[" << i << "] = " << mk_ismt2_pp(values[i], m) << std::endl;); app * result = nullptr; @@ -630,12 +630,12 @@ namespace smt { for (func_decl* f : seen) mdl.unregister_decl(f); - for (unsigned i = 0; i < new_model.get_num_constants(); i++) { + for (unsigned i = 0; i < new_model.get_num_constants(); ++i) { func_decl * f = new_model.get_constant(i); mdl.register_decl(f, new_model.get_const_interp(f)); } - for (unsigned i = 0; i < new_model.get_num_functions(); i++) { + for (unsigned i = 0; i < new_model.get_num_functions(); ++i) { func_decl * f = new_model.get_function(i); func_interp * fi = new_model.get_func_interp(f)->copy(); mdl.register_decl(f, fi); diff --git a/src/smt/theory_seq.cpp b/src/smt/theory_seq.cpp index 36caebf0a..7794c35c0 100644 --- a/src/smt/theory_seq.cpp +++ b/src/smt/theory_seq.cpp @@ -1132,7 +1132,7 @@ bool theory_seq::reduce_length(unsigned i, unsigned j, bool front, expr_ref_vect } } deps = mk_join(deps, lit); - m_eqs.push_back(depeq(m_eq_id++, lhs, rhs, deps)); + m_eqs.push_back(depeq(++m_eq_id, lhs, rhs, deps)); propagate_eq(deps, l, r, true); TRACE(seq, tout << "propagate eq\n" << m_eqs.size() << "\nlhs: " << lhs << "\nrhs: " << rhs << "\n";); return true; diff --git a/src/smt/theory_seq.h b/src/smt/theory_seq.h index 093cd04b4..7b2aa8801 100644 --- a/src/smt/theory_seq.h +++ b/src/smt/theory_seq.h @@ -168,7 +168,7 @@ namespace smt { m_util.str.get_concat_units(e, ls); for (expr* e : r) m_util.str.get_concat_units(e, rs); - return depeq(m_eq_id++, ls, rs, dep); + return depeq(++m_eq_id, ls, rs, dep); } // equalities that are decomposed by conacatenations diff --git a/src/solver/assertions/asserted_formulas.cpp b/src/solver/assertions/asserted_formulas.cpp index f07d1be0a..32b8bb9b6 100644 --- a/src/solver/assertions/asserted_formulas.cpp +++ b/src/solver/assertions/asserted_formulas.cpp @@ -345,7 +345,7 @@ bool asserted_formulas::invoke(simplify_fmls& s) { void asserted_formulas::display(std::ostream & out) const { out << "asserted formulas:\n"; - for (unsigned i = 0; i < m_formulas.size(); i++) { + for (unsigned i = 0; i < m_formulas.size(); ++i) { if (i == m_qhead) out << "[HEAD] ==>\n"; out << mk_pp(m_formulas[i].fml(), m) << "\n"; @@ -453,7 +453,7 @@ void asserted_formulas::nnf_cnf() { unsigned i = m_qhead; unsigned sz = m_formulas.size(); TRACE(nnf_bug, tout << "i: " << i << " sz: " << sz << "\n";); - for (; i < sz; i++) { + for (; i < sz; ++i) { expr * n = m_formulas[i].fml(); TRACE(nnf_bug, tout << "processing:\n" << mk_pp(n, m) << "\n";); proof_ref pr(m_formulas[i].pr(), m); @@ -472,7 +472,7 @@ void asserted_formulas::nnf_cnf() { return; } unsigned sz2 = push_todo.size(); - for (unsigned k = 0; k < sz2; k++) { + for (unsigned k = 0; k < sz2; ++k) { expr * n = push_todo.get(k); pr = nullptr; m_rewriter(n, r1, pr1); @@ -491,7 +491,7 @@ void asserted_formulas::nnf_cnf() { void asserted_formulas::simplify_fmls::operator()() { vector new_fmls; unsigned sz = af.m_formulas.size(); - for (unsigned i = af.m_qhead; i < sz; i++) { + for (unsigned i = af.m_qhead; i < sz; ++i) { auto& j = af.m_formulas[i]; expr_ref result(m); proof_ref result_pr(m); @@ -548,7 +548,7 @@ void asserted_formulas::propagate_values() { unsigned prop = num_prop; TRACE(propagate_values, display(tout << "before:\n");); unsigned i = m_qhead; - for (; i < sz; i++) { + for (; i < sz; ++i) { prop += propagate_values(i); } flush_cache(); diff --git a/src/solver/check_logic.cpp b/src/solver/check_logic.cpp index a03de7c4a..bc92c8a30 100644 --- a/src/solver/check_logic.cpp +++ b/src/solver/check_logic.cpp @@ -303,7 +303,7 @@ struct check_logic::imp { return; // nothing to check unsigned num_args = n->get_num_args(); bool found_non_numeral = false; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!is_numeral(n->get_arg(i))) { if (found_non_numeral) fail("logic does not support nonlinear arithmetic"); @@ -337,7 +337,7 @@ struct check_logic::imp { if (num_args == 0) return false; expr * arg = t->get_arg(0); - for (unsigned i = 1; i < num_args; i++) { + for (unsigned i = 1; i < num_args; ++i) { if (t->get_arg(i) != arg) return false; } @@ -352,7 +352,7 @@ struct check_logic::imp { while (true) { expr * non_numeral = nullptr; unsigned num_args = t->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = t->get_arg(i); if (is_numeral(arg)) continue; @@ -418,7 +418,7 @@ struct check_logic::imp { // Check if the arith args of n are of the form (t + k) where k is a numeral. void check_diff_args(app * n) { unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (is_arith(n)) check_diff_arg(n); } @@ -510,7 +510,7 @@ struct check_logic::imp { if (arity > 0) { if (!m_uf && f->get_family_id() == null_family_id) fail("logic does not support uninterpreted functions"); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) check_sort(f->get_domain(i)); } check_sort(f->get_range()); diff --git a/src/solver/combined_solver.cpp b/src/solver/combined_solver.cpp index 9f489124f..44bda3ddf 100644 --- a/src/solver/combined_solver.cpp +++ b/src/solver/combined_solver.cpp @@ -96,7 +96,7 @@ private: bool has_quantifiers() const { unsigned sz = get_num_assertions(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (::has_quantifiers(get_assertion(i))) return true; } diff --git a/src/solver/solver2tactic.cpp b/src/solver/solver2tactic.cpp index 516932a3f..04d70d6f1 100644 --- a/src/solver/solver2tactic.cpp +++ b/src/solver/solver2tactic.cpp @@ -31,7 +31,7 @@ void extract_clauses_and_dependencies(goal_ref const& g, expr_ref_vector& clause ast_manager& m = g->m(); expr_ref_vector clause(m); unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g->form(i); expr_dependency * d = g->dep(i); if (d == nullptr || !g->unsat_core_enabled()) { diff --git a/src/solver/tactic2solver.cpp b/src/solver/tactic2solver.cpp index af5442b77..7fd5fec56 100644 --- a/src/solver/tactic2solver.cpp +++ b/src/solver/tactic2solver.cpp @@ -233,7 +233,7 @@ lbool tactic2solver::check_sat_core2(unsigned num_assumptions, expr * const * as for (expr* e : m_assertions) { g->assert_expr(e); } - for (unsigned i = 0; i < num_assumptions; i++) { + for (unsigned i = 0; i < num_assumptions; ++i) { proof_ref pr(m.mk_asserted(assumptions[i]), m); expr_dependency_ref ans(m.mk_leaf(assumptions[i]), m); g->assert_expr(assumptions[i], pr, ans); diff --git a/src/tactic/aig/aig.cpp b/src/tactic/aig/aig.cpp index fe66fcbfd..fc165b009 100644 --- a/src/tactic/aig/aig.cpp +++ b/src/tactic/aig/aig.cpp @@ -69,7 +69,7 @@ inline unsigned to_idx(aig * p) { SASSERT(!is_var(p)); return p->m_id - FIRST_NO static void unmark(unsigned sz, aig * const * ns) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ns[i]->m_mark = false; } } @@ -507,7 +507,7 @@ struct aig_manager::imp { void restore_result_stack(unsigned old_sz) { unsigned sz = m_result_stack.size(); SASSERT(old_sz <= sz); - for (unsigned i = old_sz; i < sz; i++) + for (unsigned i = old_sz; i < sz; ++i) m.dec_ref(m_result_stack[i]); m_result_stack.shrink(old_sz); } @@ -972,7 +972,7 @@ struct aig_manager::imp { continue; } bool ok = true; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { aig * c = t->m_children[i].ptr(); if (!is_var(c) && cache.get(to_idx(c), nullptr) == nullptr) { todo.push_back(c); @@ -982,7 +982,7 @@ struct aig_manager::imp { if (!ok) continue; expr * args[2]; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { aig_lit l = t->m_children[i]; aig * c = l.ptr(); if (is_var(c)) @@ -1341,7 +1341,7 @@ public: void dec_ref(aig_lit const & r) { dec_ref(r.ptr()); } void dec_array_ref(unsigned sz, aig * const * ns) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (ns[i]) dec_ref(ns[i]); } @@ -1371,7 +1371,7 @@ public: std::sort(args, args+num, aig_lit_lt()); aig_lit r = mk_and(args[0], args[1]); inc_ref(r); - for (unsigned i = 2; i < num; i++) { + for (unsigned i = 2; i < num; ++i) { aig_lit new_r = mk_and(r, args[i]); inc_ref(new_r); dec_ref(r); @@ -1402,7 +1402,7 @@ public: std::sort(args, args+num, aig_lit_lt()); aig_lit r = mk_or(args[0], args[1]); inc_ref(r); - for (unsigned i = 2; i < num; i++) { + for (unsigned i = 2; i < num; ++i) { aig_lit new_r = mk_or(r, args[i]); inc_ref(new_r); dec_ref(r); @@ -1515,7 +1515,7 @@ public: try { expr2aig proc(*this); unsigned sz = s.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { SASSERT(ref_count(r) >= 1); expr * t = s.form(i); aig_lit n = proc(t); @@ -1625,7 +1625,7 @@ public: continue; } bool visited = true; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { aig_lit c = t->m_children[i]; aig * data = c.ptr(); if (!data->m_mark) { @@ -1638,7 +1638,7 @@ public: to_unmark.push_back(t); t->m_mark = true; out << "(define-fun aig" << to_idx(t) << " () Bool (and"; - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { out << " "; display_smt2_ref(out, t->m_children[i]); } diff --git a/src/tactic/aig/aig_tactic.cpp b/src/tactic/aig/aig_tactic.cpp index 8027e6484..b5251a1f0 100644 --- a/src/tactic/aig/aig_tactic.cpp +++ b/src/tactic/aig/aig_tactic.cpp @@ -72,7 +72,7 @@ public: expr_ref_vector nodeps(m); - for (unsigned i = 0; i < g->size(); i++) { + for (unsigned i = 0; i < g->size(); ++i) { expr_dependency * ed = g->dep(i); if (!ed) { nodeps.push_back(g->form(i)); diff --git a/src/tactic/arith/add_bounds_tactic.cpp b/src/tactic/arith/add_bounds_tactic.cpp index 4304c3f18..8dff8c279 100644 --- a/src/tactic/arith/add_bounds_tactic.cpp +++ b/src/tactic/arith/add_bounds_tactic.cpp @@ -117,7 +117,7 @@ class add_bounds_tactic : public tactic { expr_fast_mark1 visited; add_bound_proc proc(bm, *(g.get()), m_lower, m_upper); unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) quick_for_each_expr(proc, visited, g->form(i)); visited.reset(); g->inc_depth(); diff --git a/src/tactic/arith/diff_neq_tactic.cpp b/src/tactic/arith/diff_neq_tactic.cpp index 1e8943d13..a4670816a 100644 --- a/src/tactic/arith/diff_neq_tactic.cpp +++ b/src/tactic/arith/diff_neq_tactic.cpp @@ -153,7 +153,7 @@ class diff_neq_tactic : public tactic { // throws exception if contains unbounded variable void check_unbounded() { unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (m_lower[x] == INT_MIN || m_upper[x] == INT_MAX) throw_not_supported(); // possible extension: support bound normalization here @@ -166,7 +166,7 @@ class diff_neq_tactic : public tactic { expr * lhs; expr * rhs; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); TRACE(diff_neq_tactic, tout << "processing: " << mk_ismt2_pp(f, m) << "\n";); if (u.is_le(f, lhs, rhs)) @@ -183,10 +183,10 @@ class diff_neq_tactic : public tactic { void display(std::ostream & out) { unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { out << m_lower[x] << " <= " << mk_ismt2_pp(m_var2expr.get(x), m) << " <= " << m_upper[x] << "\n"; } - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { diseqs::iterator it = m_var_diseqs[x].begin(); diseqs::iterator end = m_var_diseqs[x].end(); for (; it != end; ++it) { @@ -197,7 +197,7 @@ class diff_neq_tactic : public tactic { void display_model(std::ostream & out) { unsigned num = m_stack.size(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { out << mk_ismt2_pp(m_var2expr.get(x), m) << " := " << m_stack[x] << "\n"; } } @@ -208,7 +208,7 @@ class diff_neq_tactic : public tactic { void init_forbidden() { int max = 0; unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (m_upper[x] > max) max = m_upper[x]; } @@ -250,10 +250,10 @@ class diff_neq_tactic : public tactic { max = bad_v; } // reset forbidden - for (int i = starting_at + 1; i <= max; i++) + for (int i = starting_at + 1; i <= max; ++i) m_forbidden[i] = false; DEBUG_CODE({ - for (unsigned i = 0; i < m_forbidden.size(); i++) { + for (unsigned i = 0; i < m_forbidden.size(); ++i) { SASSERT(!m_forbidden[i]); } }); @@ -305,7 +305,7 @@ class diff_neq_tactic : public tactic { model * md = alloc(model, m); unsigned num = num_vars(); SASSERT(m_stack.size() == num); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { func_decl * d = to_app(m_var2expr.get(x))->get_decl(); md->register_decl(d, u.mk_numeral(rational(m_stack[x]), true)); } diff --git a/src/tactic/arith/eq2bv_tactic.cpp b/src/tactic/arith/eq2bv_tactic.cpp index 0b2630236..e97306dc5 100644 --- a/src/tactic/arith/eq2bv_tactic.cpp +++ b/src/tactic/arith/eq2bv_tactic.cpp @@ -188,7 +188,7 @@ public: return; } - for (unsigned i = 0; i < g->size(); i++) { + for (unsigned i = 0; i < g->size(); ++i) { collect_fd(g->form(i)); } cleanup_fd(mc1); @@ -198,7 +198,7 @@ public: return; } - for (unsigned i = 0; !g->inconsistent() && i < g->size(); i++) { + for (unsigned i = 0; !g->inconsistent() && i < g->size(); ++i) { expr_ref new_curr(m); proof_ref new_pr(m); app_ref var(m); diff --git a/src/tactic/arith/factor_tactic.cpp b/src/tactic/arith/factor_tactic.cpp index 9438ccd09..a603a2d4d 100644 --- a/src/tactic/arith/factor_tactic.cpp +++ b/src/tactic/arith/factor_tactic.cpp @@ -59,7 +59,7 @@ class factor_tactic : public tactic { void mk_eq(polynomial::factors const & fs, expr_ref & result) { expr_ref_buffer args(m); expr_ref arg(m); - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { m_expr2poly.to_expr(fs[i], true, arg); args.push_back(arg); } @@ -70,7 +70,7 @@ class factor_tactic : public tactic { void mk_split_eq(polynomial::factors const & fs, expr_ref & result) { expr_ref_buffer args(m); expr_ref arg(m); - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { m_expr2poly.to_expr(fs[i], true, arg); args.push_back(m.mk_eq(arg, mk_zero_for(arg))); } @@ -100,7 +100,7 @@ class factor_tactic : public tactic { SASSERT(k == OP_LT || k == OP_GT || k == OP_LE || k == OP_GE); expr_ref_buffer args(m); expr_ref arg(m); - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { m_expr2poly.to_expr(fs[i], true, arg); if (fs.get_degree(i) % 2 == 0) arg = m_util.mk_power(arg, m_util.mk_numeral(rational(2), m_util.is_int(arg))); @@ -113,7 +113,7 @@ class factor_tactic : public tactic { // See mk_split_strict_comp and mk_split_nonstrict_comp void split_even_odd(bool strict, polynomial::factors const & fs, expr_ref_buffer & even_eqs, expr_ref_buffer & odd_factors) { expr_ref arg(m); - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { m_expr2poly.to_expr(fs[i], true, arg); if (fs.get_degree(i) % 2 == 0) { expr * eq = m.mk_eq(arg, mk_zero_for(arg)); @@ -264,7 +264,7 @@ class factor_tactic : public tactic { expr_ref new_curr(m); proof_ref new_pr(m); unsigned size = g->size(); - for (unsigned idx = 0; !g->inconsistent() && idx < size; idx++) { + for (unsigned idx = 0; !g->inconsistent() && idx < size; ++idx) { expr * curr = g->form(idx); m_rw(curr, new_curr, new_pr); if (produce_proofs) { diff --git a/src/tactic/arith/fm_tactic.cpp b/src/tactic/arith/fm_tactic.cpp index ed2bcce8b..98da1062c 100644 --- a/src/tactic/arith/fm_tactic.cpp +++ b/src/tactic/arith/fm_tactic.cpp @@ -76,7 +76,7 @@ class fm_tactic : public tactic { bool is_lower = false; bool found = false; - for (unsigned i = 0; i < num_lits; i++) { + for (unsigned i = 0; i < num_lits; ++i) { expr * l = lits[i]; expr * atom; if (is_uninterp_const(l) || (m.is_not(l, atom) && is_uninterp_const(atom))) { @@ -109,7 +109,7 @@ class fm_tactic : public tactic { num_mons = 1; mons = &lhs; } - for (unsigned j = 0; j < num_mons; j++) { + for (unsigned j = 0; j < num_mons; ++j) { expr * monomial = mons[j]; expr * ai; expr * xi; @@ -296,7 +296,7 @@ class fm_tactic : public tactic { out << "(fm-model-converter"; SASSERT(m_xs.size() == m_clauses.size()); unsigned sz = m_xs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n(" << m_xs[i]->get_name(); clauses const & cs = m_clauses[i]; for (auto& c : cs) @@ -310,7 +310,7 @@ class fm_tactic : public tactic { ast_manager & to_m = translator.to(); fm_model_converter * res = alloc(fm_model_converter, to_m); unsigned sz = m_xs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * new_x = translator(m_xs[i]); to_m.inc_ref(new_x); res->m_xs.push_back(new_x); @@ -503,7 +503,7 @@ class fm_tactic : public tactic { expr_fast_mark2 visited; bool all_forbidden = true; - for (unsigned i = 0; i < num_mons; i++) { + for (unsigned i = 0; i < num_mons; ++i) { expr * x; if (!is_linear_mon_core(mons[i], x)) return false; @@ -532,7 +532,7 @@ class fm_tactic : public tactic { if (m_fm_occ && m.is_or(t)) { unsigned num = to_app(t)->get_num_args(); bool found = false; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * l = to_app(t)->get_arg(i); if (is_literal(l)) { continue; @@ -566,7 +566,7 @@ class fm_tactic : public tactic { } void del_constraints(unsigned sz, constraint * const * cs) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) del_constraint(cs[i]); } @@ -590,18 +590,18 @@ class fm_tactic : public tactic { cnstr->m_strict = strict; cnstr->m_num_vars = num_vars; cnstr->m_lits = reinterpret_cast(mem_lits); - for (unsigned i = 0; i < num_lits; i++) + for (unsigned i = 0; i < num_lits; ++i) cnstr->m_lits[i] = lits[i]; cnstr->m_xs = reinterpret_cast(mem_xs); cnstr->m_as = reinterpret_cast(mem_as); - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { TRACE(mk_constraint_bug, tout << "xs[" << i << "]: " << xs[i] << "\n";); cnstr->m_xs[i] = xs[i]; new (cnstr->m_as + i) rational(as[i]); } cnstr->m_c = c; DEBUG_CODE({ - for (unsigned i = 0; i < num_vars; i++) { + for (unsigned i = 0; i < num_vars; ++i) { SASSERT(cnstr->m_xs[i] == xs[i]); SASSERT(cnstr->m_as[i] == as[i]); } @@ -622,13 +622,13 @@ class fm_tactic : public tactic { // multiply as and c, by the lcm of their denominators void mk_int(unsigned num, rational * as, rational & c) { rational l = denominator(c); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) l = lcm(l, denominator(as[i])); if (l.is_one()) return; c *= l; SASSERT(c.is_int()); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { as[i] *= l; SASSERT(as[i].is_int()); } @@ -641,7 +641,7 @@ class fm_tactic : public tactic { rational g = c.m_c; if (g.is_neg()) g.neg(); - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (g.is_one()) break; if (c.m_as[i].is_pos()) @@ -652,12 +652,12 @@ class fm_tactic : public tactic { if (g.is_one()) return; c.m_c /= g; - for (unsigned i = 0; i < c.m_num_vars; i++) + for (unsigned i = 0; i < c.m_num_vars; ++i) c.m_as[i] /= g; } void display(std::ostream & out, constraint const & c) const { - for (unsigned i = 0; i < c.m_num_lits; i++) { + for (unsigned i = 0; i < c.m_num_lits; ++i) { literal l = c.m_lits[i]; if (sign(l)) out << "~"; @@ -668,7 +668,7 @@ class fm_tactic : public tactic { out << "("; if (c.m_num_vars == 0) out << "0"; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (i > 0) out << " + "; if (!c.m_as[i].is_one()) @@ -706,12 +706,12 @@ class fm_tactic : public tactic { m_counter += c1.m_num_lits + c2.m_num_lits; - for (unsigned i = 0; i < c1.m_num_vars; i++) { + for (unsigned i = 0; i < c1.m_num_vars; ++i) { m_var2pos[c1.m_xs[i]] = i; } bool failed = false; - for (unsigned i = 0; i < c2.m_num_vars; i++) { + for (unsigned i = 0; i < c2.m_num_vars; ++i) { unsigned pos1 = m_var2pos[c2.m_xs[i]]; if (pos1 == UINT_MAX || c1.m_as[pos1] != c2.m_as[i]) { failed = true; @@ -719,21 +719,21 @@ class fm_tactic : public tactic { } } - for (unsigned i = 0; i < c1.m_num_vars; i++) { + for (unsigned i = 0; i < c1.m_num_vars; ++i) { m_var2pos[c1.m_xs[i]] = UINT_MAX; } if (failed) return false; - for (unsigned i = 0; i < c2.m_num_lits; i++) { + for (unsigned i = 0; i < c2.m_num_lits; ++i) { literal l = c2.m_lits[i]; bvar b = lit2bvar(l); SASSERT(m_bvar2sign[b] == 0); m_bvar2sign[b] = sign(l) ? -1 : 1; } - for (unsigned i = 0; i < c1.m_num_lits; i++) { + for (unsigned i = 0; i < c1.m_num_lits; ++i) { literal l = c1.m_lits[i]; bvar b = lit2bvar(l); char s = sign(l) ? -1 : 1; @@ -743,7 +743,7 @@ class fm_tactic : public tactic { } } - for (unsigned i = 0; i < c2.m_num_lits; i++) { + for (unsigned i = 0; i < c2.m_num_lits; ++i) { literal l = c2.m_lits[i]; bvar b = lit2bvar(l); m_bvar2sign[b] = 0; @@ -761,7 +761,7 @@ class fm_tactic : public tactic { var best = UINT_MAX; unsigned best_sz = UINT_MAX; bool best_lower = false; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { var xi = c.m_xs[i]; if (is_forbidden(xi)) continue; // variable is not in the index @@ -854,7 +854,7 @@ class fm_tactic : public tactic { expr_fast_mark1 visited; forbidden_proc proc(*this); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); if (is_occ(f)) continue; @@ -905,7 +905,7 @@ class fm_tactic : public tactic { } bool all_int(constraint const & c) const { - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (!is_int(c.m_xs[i])) return false; } @@ -924,7 +924,7 @@ class fm_tactic : public tactic { else { bool int_cnstr = all_int(c); ptr_buffer ms; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { expr * x = m_var2expr.get(c.m_xs[i]); if (!int_cnstr && is_int(c.m_xs[i])) x = m_util.mk_to_real(x); @@ -955,7 +955,7 @@ class fm_tactic : public tactic { } ptr_buffer lits; - for (unsigned i = 0; i < c.m_num_lits; i++) { + for (unsigned i = 0; i < c.m_num_lits; ++i) { literal l = c.m_lits[i]; if (sign(l)) lits.push_back(m.mk_not(m_bvar2expr.get(lit2bvar(l)))); @@ -1049,7 +1049,7 @@ class fm_tactic : public tactic { #if Z3DEBUG bool found_ineq = false; #endif - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * l = args[i]; if (is_literal(l)) { lits.push_back(to_literal(l)); @@ -1080,7 +1080,7 @@ class fm_tactic : public tactic { } bool all_int = true; - for (unsigned j = 0; j < num_mons; j++) { + for (unsigned j = 0; j < num_mons; ++j) { expr * monomial = mons[j]; expr * a; rational a_val; @@ -1108,7 +1108,7 @@ class fm_tactic : public tactic { } } - TRACE(to_var_bug, tout << "before mk_constraint: "; for (unsigned i = 0; i < xs.size(); i++) tout << " " << xs[i]; tout << "\n";); + TRACE(to_var_bug, tout << "before mk_constraint: "; for (unsigned i = 0; i < xs.size(); ++i) tout << " " << xs[i]; tout << "\n";); constraint * new_c = mk_constraint(lits.size(), lits.data(), @@ -1138,7 +1138,7 @@ class fm_tactic : public tactic { bool r = false; - for (unsigned i = 0; i < c->m_num_vars; i++) { + for (unsigned i = 0; i < c->m_num_vars; ++i) { var x = c->m_xs[i]; if (!is_forbidden(x)) { r = true; @@ -1164,7 +1164,7 @@ class fm_tactic : public tactic { void init_use_list(goal const & g) { unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_inconsistent) return; expr * f = g.form(i); @@ -1204,7 +1204,7 @@ class fm_tactic : public tactic { void sort_candidates(var_vector & xs) { svector x_cost_vector; unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (!is_forbidden(x)) { x_cost_vector.push_back(x_cost(x, get_cost(x))); } @@ -1222,7 +1222,7 @@ class fm_tactic : public tactic { void cleanup_constraints(constraints & cs) { unsigned j = 0; unsigned sz = cs.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { constraint * c = cs[i]; if (c->m_dead) continue; @@ -1238,7 +1238,7 @@ class fm_tactic : public tactic { void analyze(constraint const & c, var x, bool & all_int, bool & unit_coeff) const { all_int = true; unit_coeff = true; - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (!is_int(c.m_xs[i])) { all_int = false; return; @@ -1304,7 +1304,7 @@ class fm_tactic : public tactic { } void get_coeff(constraint const & c, var x, rational & a) { - for (unsigned i = 0; i < c.m_num_vars; i++) { + for (unsigned i = 0; i < c.m_num_vars; ++i) { if (c.m_xs[i] == x) { a = c.m_as[i]; return; @@ -1333,7 +1333,7 @@ class fm_tactic : public tactic { rational new_c = l.m_c*b + u.m_c*a; bool new_strict = l.m_strict || u.m_strict; - for (unsigned i = 0; i < l.m_num_vars; i++) { + for (unsigned i = 0; i < l.m_num_vars; ++i) { var xi = l.m_xs[i]; if (xi == x) continue; @@ -1346,7 +1346,7 @@ class fm_tactic : public tactic { SASSERT(new_xs.size() == new_as.size()); } - for (unsigned i = 0; i < u.m_num_vars; i++) { + for (unsigned i = 0; i < u.m_num_vars; ++i) { var xi = u.m_xs[i]; if (xi == x) continue; @@ -1364,7 +1364,7 @@ class fm_tactic : public tactic { bool all_int = true; unsigned sz = new_xs.size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (new_as[i].is_zero()) continue; if (!is_int(new_xs[i])) @@ -1384,7 +1384,7 @@ class fm_tactic : public tactic { } // reset m_var2pos - for (unsigned i = 0; i < l.m_num_vars; i++) { + for (unsigned i = 0; i < l.m_num_vars; ++i) { m_var2pos[l.m_xs[i]] = UINT_MAX; } @@ -1398,7 +1398,7 @@ class fm_tactic : public tactic { } new_lits.reset(); - for (unsigned i = 0; i < l.m_num_lits; i++) { + for (unsigned i = 0; i < l.m_num_lits; ++i) { literal lit = l.m_lits[i]; bvar p = lit2bvar(lit); m_bvar2sign[p] = sign(lit) ? -1 : 1; @@ -1406,7 +1406,7 @@ class fm_tactic : public tactic { } bool tautology = false; - for (unsigned i = 0; i < u.m_num_lits && !tautology; i++) { + for (unsigned i = 0; i < u.m_num_lits && !tautology; ++i) { literal lit = u.m_lits[i]; bvar p = lit2bvar(lit); switch (m_bvar2sign[p]) { @@ -1427,7 +1427,7 @@ class fm_tactic : public tactic { } // reset m_bvar2sign - for (unsigned i = 0; i < l.m_num_lits; i++) { + for (unsigned i = 0; i < l.m_num_lits; ++i) { literal lit = l.m_lits[i]; bvar p = lit2bvar(lit); m_bvar2sign[p] = 0; @@ -1510,8 +1510,8 @@ class fm_tactic : public tactic { unsigned limit = num_old_cnstrs + m_fm_extra; unsigned num_new_cnstrs = 0; new_constraints.reset(); - for (unsigned i = 0; i < num_lowers; i++) { - for (unsigned j = 0; j < num_uppers; j++) { + for (unsigned i = 0; i < num_lowers; ++i) { + for (unsigned j = 0; j < num_uppers; ++j) { if (m_inconsistent || num_new_cnstrs > limit) { TRACE(fm, tout << "too many new constraints: " << num_new_cnstrs << "\n";); del_constraints(new_constraints.size(), new_constraints.data()); @@ -1533,7 +1533,7 @@ class fm_tactic : public tactic { m_counter += sz; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { constraint * c = new_constraints[i]; backward_subsumption(*c); register_constraint(c); @@ -1601,7 +1601,7 @@ class fm_tactic : public tactic { m_mc = alloc(fm_model_converter, m); unsigned num = candidates.size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { checkpoint(); if (m_counter > m_fm_limit) break; @@ -1636,7 +1636,7 @@ class fm_tactic : public tactic { void display(std::ostream & out) const { unsigned num = num_vars(); - for (var x = 0; x < num; x++) { + for (var x = 0; x < num; ++x) { if (is_forbidden(x)) continue; out << mk_ismt2_pp(m_var2expr.get(x), m) << "\n"; diff --git a/src/tactic/arith/lia2card_tactic.cpp b/src/tactic/arith/lia2card_tactic.cpp index d1133cccc..893f80903 100644 --- a/src/tactic/arith/lia2card_tactic.cpp +++ b/src/tactic/arith/lia2card_tactic.cpp @@ -205,7 +205,7 @@ public: TRACE(pb, tout << "add bound " << lo << " " << hi << ": " << mk_pp(x, m) << "\n";); } } - for (unsigned i = 0; !g->inconsistent() && i < g->size(); i++) { + for (unsigned i = 0; !g->inconsistent() && i < g->size(); ++i) { checkpoint(); expr_ref new_curr(m), tmp(m); diff --git a/src/tactic/arith/lia2pb_tactic.cpp b/src/tactic/arith/lia2pb_tactic.cpp index b20e94ef4..76ffda753 100644 --- a/src/tactic/arith/lia2pb_tactic.cpp +++ b/src/tactic/arith/lia2pb_tactic.cpp @@ -151,7 +151,7 @@ class lia2pb_tactic : public tactic { expr_fast_mark1 visited; visitor proc(*this); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); for_each_expr_core(proc, visited, f); } @@ -236,7 +236,7 @@ class lia2pb_tactic : public tactic { def_args.reset(); rational a(1); unsigned num_bits = u.get_num_bits(); - for (unsigned i = 0; i < num_bits; i++) { + for (unsigned i = 0; i < num_bits; ++i) { app * x_prime = m.mk_fresh_const(nullptr, m_util.mk_int()); g->assert_expr(m_util.mk_le(zero, x_prime)); g->assert_expr(m_util.mk_le(x_prime, one)); @@ -271,7 +271,7 @@ class lia2pb_tactic : public tactic { expr_ref new_curr(m); proof_ref new_pr(m); unsigned size = g->size(); - for (unsigned idx = 0; !g->inconsistent() && idx < size; idx++) { + for (unsigned idx = 0; !g->inconsistent() && idx < size; ++idx) { expr * curr = g->form(idx); expr_dependency * dep = nullptr; m_rw(curr, new_curr, new_pr); diff --git a/src/tactic/arith/normalize_bounds_tactic.cpp b/src/tactic/arith/normalize_bounds_tactic.cpp index d987417da..461f9019c 100644 --- a/src/tactic/arith/normalize_bounds_tactic.cpp +++ b/src/tactic/arith/normalize_bounds_tactic.cpp @@ -119,7 +119,7 @@ class normalize_bounds_tactic : public tactic { m_rw.set_substitution(&subst); expr_ref new_curr(m); - for (unsigned idx = 0; !in->inconsistent() && idx < in->size(); idx++) { + for (unsigned idx = 0; !in->inconsistent() && idx < in->size(); ++idx) { expr * curr = in->form(idx); proof_ref new_pr(m); m_rw(curr, new_curr, new_pr); diff --git a/src/tactic/arith/pb2bv_tactic.cpp b/src/tactic/arith/pb2bv_tactic.cpp index de4eaea25..84e60f95c 100644 --- a/src/tactic/arith/pb2bv_tactic.cpp +++ b/src/tactic/arith/pb2bv_tactic.cpp @@ -199,7 +199,7 @@ private: expr_fast_mark1 visited; only_01_visitor proc(m_arith_util, m_pb, m_bm); unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g->form(i); for_each_expr_core(proc, visited, f); } @@ -360,7 +360,7 @@ private: } static bool is_cardinality(polynomial const & m_p, numeral const & m_c) { - for (unsigned i = 0; i < m_p.size(); i++) { + for (unsigned i = 0; i < m_p.size(); ++i) { if (!m_p[i].m_a.is_one()) return false; } @@ -377,7 +377,7 @@ private: if (is_card && m_c.is_one()) { ptr_buffer args; - for (unsigned i = 0; i < m_p.size(); i++) { + for (unsigned i = 0; i < m_p.size(); ++i) { args.push_back(mon_lit2lit(m_p[i])); } r = m.mk_or(args.size(), args.data()); @@ -386,7 +386,7 @@ private: if (is_card && m_c == numeral(m_p.size())) { ptr_buffer args; - for (unsigned i = 0; i < m_p.size(); i++) { + for (unsigned i = 0; i < m_p.size(); ++i) { args.push_back(mon_lit2lit(m_p[i])); } m_b_rw.mk_and(args.size(), args.data(), r); @@ -414,8 +414,8 @@ private: expr_ref_vector tmp(m); tmp.resize(rowsz, m.mk_true()); - for (unsigned i = 0; i < k; i++) { - for (unsigned j = 0; j < rowsz; j++) { + for (unsigned i = 0; i < k; ++i) { + for (unsigned j = 0; j < rowsz; ++j) { expr_ref new_ite(m); m_b_rw.mk_ite(mon_lit2lit(m_p[i + j]), tmp.get(j), @@ -435,7 +435,7 @@ private: // [Leo] improving number of bits needed. // using (sum-of-coeffs).get_num_bits() numeral sum; - for (unsigned i = 0; i < m_p.size(); i++) { + for (unsigned i = 0; i < m_p.size(); ++i) { monomial const & mo = m_p[i]; SASSERT(mo.m_a.is_pos()); sum += mo.m_a; @@ -458,7 +458,7 @@ private: ptr_buffer lhs_args; - for (unsigned i = 0; i < m_p.size(); i++) { + for (unsigned i = 0; i < m_p.size(); ++i) { monomial const & mo = m_p[i]; // encode using if-then-else expr * bv_monom = @@ -483,7 +483,7 @@ private: unsigned sz = m_p.size(); unsigned i; - for (i = 2; i < sz; i++) { + for (i = 2; i < sz; ++i) { if (m_p[i].m_a != m_c) break; } @@ -494,7 +494,7 @@ private: } // copy lits [0, i) to m_clause - for (unsigned j = 0; j < i; j++) + for (unsigned j = 0; j < i; ++j) m_clause.push_back(monomial(numeral(1), m_p[j].m_lit)); app * new_var = m.mk_fresh_const(nullptr, m_arith_util.mk_int()); @@ -503,7 +503,7 @@ private: m_clause.push_back(monomial(numeral(1), lit(new_var, true))); // remove monomials [0, i) from m_p and add new_var in the beginning - for (unsigned j = i; j < sz; j++) { + for (unsigned j = i; j < sz; ++j) { m_p[j - i + 1] = m_p[j]; } m_p.shrink(sz - i + 1); @@ -598,7 +598,7 @@ private: unsigned n = sz/2; if (c != rational::power_of_two(n) - numeral(1)) return false; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { monomial const & m1 = p[i*2]; monomial const & m2 = p[i*2+1]; if (m1.m_lit.sign() == m2.m_lit.sign()) @@ -745,7 +745,7 @@ private: unsigned sz = to_app(lhs)->get_num_args(); expr * const * ms = to_app(lhs)->get_args(); expr * a, * x; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * m = ms[i]; if (is_uninterp_const(m)) continue; @@ -759,7 +759,7 @@ private: polynomial m_p; numeral m_c; m_c = c; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * m = ms[i]; if (is_uninterp_const(m)) { add_bounds_dependencies(m); @@ -789,7 +789,7 @@ private: } else if (k == LE) { m_c.neg(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial & m = m_p[i]; SASSERT(m.m_a.is_nonneg()); m_c += m.m_a; @@ -818,7 +818,7 @@ private: polynomial m_p2; numeral m_c2 = m_c; m_c2.neg(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { monomial m = m_p[i]; SASSERT(m.m_a.is_nonneg()); m_c2 += m.m_a; @@ -914,7 +914,7 @@ private: } unsigned size = g->size(); - for (unsigned i = 0; i < size; i++) + for (unsigned i = 0; i < size; ++i) m_bm(g->form(i), g->dep(i), g->pr(i)); TRACE(pb2bv, m_bm.display(tout);); @@ -933,7 +933,7 @@ private: expr_ref new_curr(m); proof_ref new_pr(m); expr_ref new_f(m); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { expr * curr = g->form(idx); expr * atom; bool pos; @@ -957,7 +957,7 @@ private: throw_tactic(p.e); } - for (unsigned idx = 0; idx < size; idx++) + for (unsigned idx = 0; idx < size; ++idx) g->update(idx, new_exprs.get(idx), nullptr, (m_produce_unsat_cores) ? new_deps.get(idx) : g->dep(idx)); expr_ref_vector fmls(m); @@ -974,7 +974,7 @@ private: mc1->hide(f); // store temp int constants in the filter unsigned num_temps = m_temporary_ints.size(); - for (unsigned i = 0; i < num_temps; i++) + for (unsigned i = 0; i < num_temps; ++i) mc1->hide(m_temporary_ints.get(i)); pb2bv_model_converter * mc2 = alloc(pb2bv_model_converter, m, m_const2bit, m_bm); mc = concat(mc1, mc2); @@ -1043,7 +1043,7 @@ struct is_pb_probe : public probe { try { ast_manager & m = g.m(); bound_manager bm(m); - for (unsigned i = 0; i < g.size(); i++) + for (unsigned i = 0; i < g.size(); ++i) bm(g.form(i), g.dep(i), g.pr(i)); arith_util a_util(m); pb_util pb(m); @@ -1051,7 +1051,7 @@ struct is_pb_probe : public probe { pb2bv_tactic::only_01_visitor proc(a_util, pb, bm); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); for_each_expr_core(proc, visited, f); } diff --git a/src/tactic/arith/probe_arith.cpp b/src/tactic/arith/probe_arith.cpp index 177f64890..85d9acd9a 100644 --- a/src/tactic/arith/probe_arith.cpp +++ b/src/tactic/arith/probe_arith.cpp @@ -350,7 +350,7 @@ static bool is_lp(goal const & g) { ast_manager & m = g.m(); arith_util u(m); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); bool sign = false; while (m.is_not(f, f)) diff --git a/src/tactic/arith/purify_arith_tactic.cpp b/src/tactic/arith/purify_arith_tactic.cpp index 86352510e..d1590f363 100644 --- a/src/tactic/arith/purify_arith_tactic.cpp +++ b/src/tactic/arith/purify_arith_tactic.cpp @@ -153,7 +153,7 @@ struct purify_arith_proc { find_unsafe_proc proc(*this); expr_fast_mark1 visited; unsigned sz = m_goal.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * curr = m_goal.form(i); for_each_expr_core(proc, visited, curr); } @@ -243,7 +243,7 @@ struct purify_arith_proc { expr_fast_mark1 visited; proc p(*this); unsigned sz = m_owner.m_goal.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr* f = m_owner.m_goal.form(i); for_each_expr_core(p, visited, f); } @@ -523,7 +523,7 @@ struct purify_arith_proc { unsigned sz = p.size(); SASSERT(sz > 2); ptr_buffer args; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (am.qm().is_zero(p[i])) continue; rational coeff = rational(p[i]); @@ -780,7 +780,7 @@ struct purify_arith_proc { expr_ref new_curr(m()); proof_ref new_pr(m()); unsigned sz = m_goal.size(); - for (unsigned i = 0; !m_goal.inconsistent() && i < sz; i++) { + for (unsigned i = 0; !m_goal.inconsistent() && i < sz; ++i) { expr * curr = m_goal.form(i); r(curr, new_curr, new_pr); if (m_produce_proofs) { @@ -794,7 +794,7 @@ struct purify_arith_proc { sz = r.cfg().m_new_cnstrs.size(); TRACE(purify_arith, tout << r.cfg().m_new_cnstrs << "\n";); TRACE(purify_arith, tout << r.cfg().m_new_cnstr_prs << "\n";); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_goal.assert_expr(r.cfg().m_new_cnstrs.get(i), m_produce_proofs ? r.cfg().m_new_cnstr_prs.get(i) : nullptr, nullptr); } auto const& divs = r.cfg().m_divs; diff --git a/src/tactic/arith/recover_01_tactic.cpp b/src/tactic/arith/recover_01_tactic.cpp index 7feea562c..c144ba6c5 100644 --- a/src/tactic/arith/recover_01_tactic.cpp +++ b/src/tactic/arith/recover_01_tactic.cpp @@ -169,13 +169,13 @@ class recover_01_tactic : public tactic { return false; idx = 0; unsigned val = 1; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * lit = zero_cls->get_arg(i); if (m.is_eq(lit)) continue; // search for lit or ~lit in cls unsigned j; - for (j = 0; j < num; j++) { + for (j = 0; j < num; ++j) { expr * lit2 = cls->get_arg(j); if (m.is_eq(lit2)) continue; @@ -193,7 +193,7 @@ class recover_01_tactic : public tactic { // find k unsigned i; - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { expr * lhs, * rhs; if (m.is_eq(cls->get_arg(i), lhs, rhs) && (m_util.is_numeral(lhs, k) || m_util.is_numeral(rhs, k))) break; @@ -264,13 +264,13 @@ class recover_01_tactic : public tactic { unsigned num_bits = cls_size - 1; // check if idxs are consistent - for (unsigned idx = 0; idx < expected_num_clauses; idx++) { + for (unsigned idx = 0; idx < expected_num_clauses; ++idx) { if (!found[idx]) return false; // case is missing rational expected_k; unsigned idx_aux = idx; unsigned idx_bit = 1; - for (unsigned j = 0; j < num_bits; j++) { + for (unsigned j = 0; j < num_bits; ++j) { if (idx_aux % 2 == 1) { expected_k += idx2coeff[idx_bit]; } @@ -285,7 +285,7 @@ class recover_01_tactic : public tactic { expr_ref def(m); bool real_ctx = m_util.is_real(x->get_range()); unsigned idx_bit = 1; - for (unsigned i = 0; i < cls_size; i++) { + for (unsigned i = 0; i < cls_size; ++i) { expr * lit = zero_cls->get_arg(i); if (m.is_eq(lit)) continue; @@ -322,7 +322,7 @@ class recover_01_tactic : public tactic { SASSERT(new_goal->prec() == g->prec()); new_goal->inc_depth(); - for (unsigned i = 0; i < g->size(); i++) { + for (unsigned i = 0; i < g->size(); ++i) { expr * f = g->form(i); if (save_clause(f)) saved = true; @@ -367,7 +367,7 @@ class recover_01_tactic : public tactic { m_rw.set_substitution(subst); expr_ref new_curr(m); proof_ref new_pr(m); - for (unsigned idx = 0; idx < new_goal->size(); idx++) { + for (unsigned idx = 0; idx < new_goal->size(); ++idx) { expr * curr = new_goal->form(idx); m_rw(curr, new_curr); new_goal->update(idx, new_curr); diff --git a/src/tactic/bv/bit_blaster_model_converter.cpp b/src/tactic/bv/bit_blaster_model_converter.cpp index 50cb63465..76741fd2d 100644 --- a/src/tactic/bv/bit_blaster_model_converter.cpp +++ b/src/tactic/bv/bit_blaster_model_converter.cpp @@ -53,12 +53,12 @@ struct bit_blaster_model_converter : public model_converter { void collect_bits(obj_hashtable & bits) { unsigned sz = m_bits.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * bs = m_bits.get(i); SASSERT(!TO_BOOL || is_app_of(bs, m().get_family_id("bv"), OP_MKBV)); SASSERT(TO_BOOL || is_app_of(bs, m().get_family_id("bv"), OP_CONCAT)); unsigned num_args = to_app(bs)->get_num_args(); - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { expr * bit = to_app(bs)->get_arg(j); SASSERT(!TO_BOOL || m().is_bool(bit)); SASSERT(TO_BOOL || is_sort_of(bit->get_sort(), m().get_family_id("bv"), BV_SORT)); @@ -77,7 +77,7 @@ struct bit_blaster_model_converter : public model_converter { void copy_non_bits(obj_hashtable & bits, model * old_model, model * new_model) { unsigned num = old_model->get_num_constants(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { func_decl * f = old_model->get_constant(i); if (bits.contains(f)) continue; @@ -97,7 +97,7 @@ struct bit_blaster_model_converter : public model_converter { rational two(2); SASSERT(m_vars.size() == m_bits.size()); unsigned sz = m_vars.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr* new_val = old_model->get_const_interp(m_vars.get(i)); if (new_val) { new_model->register_decl(m_vars.get(i), new_val); @@ -125,7 +125,7 @@ struct bit_blaster_model_converter : public model_converter { } else { SASSERT(is_app_of(bs, m().get_family_id("bv"), OP_CONCAT)); - for (unsigned j = 0; j < bv_sz; j++) { + for (unsigned j = 0; j < bv_sz; ++j) { val *= two; expr * bit = to_app(bs)->get_arg(j); SASSERT(util.is_bv(bit)); @@ -196,7 +196,7 @@ struct bit_blaster_model_converter : public model_converter { for (func_decl * f : m_newbits) display_del(out, f); unsigned sz = m_vars.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) display_add(out, m(), m_vars.get(i), m_bits.get(i)); } @@ -216,7 +216,7 @@ struct bit_blaster_model_converter : public model_converter { if (!util.is_numeral(value, r)) continue; unsigned sz = m_vars.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (m_vars.get(i) != to_app(var)->get_decl()) continue; unsigned k = 0; diff --git a/src/tactic/bv/bit_blaster_tactic.cpp b/src/tactic/bv/bit_blaster_tactic.cpp index 1937c9eb4..4447efa24 100644 --- a/src/tactic/bv/bit_blaster_tactic.cpp +++ b/src/tactic/bv/bit_blaster_tactic.cpp @@ -67,7 +67,7 @@ class bit_blaster_tactic : public tactic { proof_ref new_pr(m()); unsigned size = g->size(); bool change = false; - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g->inconsistent()) break; expr * curr = g->form(idx); diff --git a/src/tactic/bv/bv1_blaster_tactic.cpp b/src/tactic/bv/bv1_blaster_tactic.cpp index 090bd3e48..264a01a1a 100644 --- a/src/tactic/bv/bv1_blaster_tactic.cpp +++ b/src/tactic/bv/bv1_blaster_tactic.cpp @@ -105,7 +105,7 @@ class bv1_blaster_tactic : public tactic { } sort * b = butil().mk_sort(1); ptr_buffer bits; - for (unsigned i = 0; i < bv_size; i++) { + for (unsigned i = 0; i < bv_size; ++i) { bits.push_back(m().mk_fresh_const(nullptr, b)); m_newbits.push_back(to_app(bits.back())->get_decl()); m_saved.push_back(m_newbits.back()); @@ -155,7 +155,7 @@ class bv1_blaster_tactic : public tactic { SASSERT(t_bits.size() == e_bits.size()); bit_buffer new_ites; unsigned num = t_bits.size(); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) new_ites.push_back(t_bits[i] == e_bits[i] ? t_bits[i] : m().mk_ite(c, t_bits[i], e_bits[i])); result = butil().mk_concat(new_ites.size(), new_ites.data()); } @@ -168,7 +168,7 @@ class bv1_blaster_tactic : public tactic { rational v = f->get_parameter(0).get_rational(); rational two(2); unsigned sz = f->get_parameter(1).get_int(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if ((v % two).is_zero()) bits.push_back(m_bit0); else @@ -189,7 +189,7 @@ class bv1_blaster_tactic : public tactic { unsigned start = sz - 1 - high; unsigned end = sz - 1 - low; bit_buffer bits; - for (unsigned i = start; i <= end; i++) { + for (unsigned i = start; i <= end; ++i) { bits.push_back(arg_bits[i]); } result = butil().mk_concat(bits.size(), bits.data()); @@ -198,7 +198,7 @@ class bv1_blaster_tactic : public tactic { void reduce_concat(unsigned num, expr * const * args, expr_ref & result) { bit_buffer bits; bit_buffer arg_bits; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = args[i]; arg_bits.reset(); get_bits(arg, arg_bits); @@ -215,7 +215,7 @@ class bv1_blaster_tactic : public tactic { SASSERT(bits1.size() == bits2.size()); bit_buffer new_bits; unsigned num = bits1.size(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { new_bits.push_back(m().mk_ite(m().mk_eq(bits1[i], bits2[i]), m_bit0, m_bit1)); } result = butil().mk_concat(new_bits.size(), new_bits.data()); @@ -229,21 +229,21 @@ class bv1_blaster_tactic : public tactic { return; } reduce_bin_xor(args[0], args[1], result); - for (unsigned i = 2; i < num_args; i++) { + for (unsigned i = 2; i < num_args; ++i) { reduce_bin_xor(result, args[i], result); } #else ptr_buffer args_bits; - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { bit_buffer * buff_i = alloc(bit_buffer); get_bits(args[i], *buff_i); args_bits.push_back(buff_i); } bit_buffer new_bits; unsigned sz = butil().get_bv_size(args[0]); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ptr_buffer eqs; - for (unsigned j = 0; j < num_args; j++) { + for (unsigned j = 0; j < num_args; ++j) { bit_buffer * buff_j = args_bits[j]; eqs.push_back(m().mk_eq(buff_j->get(i), m_bit1)); } @@ -367,7 +367,7 @@ class bv1_blaster_tactic : public tactic { unsigned sz = g.size(); visitor proc(m_rw.cfg().butil().get_family_id()); try { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = g.form(i); for_each_expr_core(proc, visited, f); } @@ -394,7 +394,7 @@ class bv1_blaster_tactic : public tactic { expr_ref new_curr(m()); proof_ref new_pr(m()); unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g->inconsistent()) break; expr * curr = g->form(idx); diff --git a/src/tactic/bv/bv_bound_chk_tactic.cpp b/src/tactic/bv/bv_bound_chk_tactic.cpp index 72c62c7ed..4835eacd9 100644 --- a/src/tactic/bv/bv_bound_chk_tactic.cpp +++ b/src/tactic/bv/bv_bound_chk_tactic.cpp @@ -58,7 +58,7 @@ struct bv_bound_chk_rewriter_cfg : public default_rewriter_cfg { const br_status st = reduce_app_core(f, num, args, result, result_pr); CTRACE(bv_bound_chk_step, st != BR_FAILED, tout << f->get_name() << "\n"; - for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << "\n"; + for (unsigned i = 0; i < num; ++i) tout << mk_ismt2_pp(args[i], m()) << "\n"; tout << "---------->\n" << mk_ismt2_pp(result, m()) << "\n";); return st; } @@ -151,7 +151,7 @@ public: ast_manager& m(g->m()); expr_ref new_curr(m); const unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g->inconsistent()) break; expr * curr = g->form(idx); m_rw(curr, new_curr); diff --git a/src/tactic/bv/bv_size_reduction_tactic.cpp b/src/tactic/bv/bv_size_reduction_tactic.cpp index 335efcd68..850d1c8dd 100644 --- a/src/tactic/bv/bv_size_reduction_tactic.cpp +++ b/src/tactic/bv/bv_size_reduction_tactic.cpp @@ -134,7 +134,7 @@ public: }; #endif - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { bool negated = false; f = g.form(i); if (m.is_not(f)) { @@ -327,10 +327,10 @@ public: if (!(m_unsigned_lowers.empty() && m_unsigned_uppers.empty())) { TRACE(bv_size_reduction, tout << "m_unsigned_lowers: " << std::endl; - for (obj_map::iterator it = m_unsigned_lowers.begin(); it != m_unsigned_lowers.end(); it++) + for (obj_map::iterator it = m_unsigned_lowers.begin(); it != m_unsigned_lowers.end(); ++it) tout << mk_ismt2_pp(it->m_key, m) << " >= " << it->m_value.to_string() << std::endl; tout << "m_unsigned_uppers: " << std::endl; - for (obj_map::iterator it = m_unsigned_uppers.begin(); it != m_unsigned_uppers.end(); it++) + for (obj_map::iterator it = m_unsigned_uppers.begin(); it != m_unsigned_uppers.end(); ++it) tout << mk_ismt2_pp(it->m_key, m) << " <= " << it->m_value.to_string() << std::endl; ); @@ -398,7 +398,7 @@ public: unsigned sz = g.size(); expr * f; expr_ref new_f(m); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (g.inconsistent()) return; f = g.form(i); diff --git a/src/tactic/bv/bvarray2uf_rewriter.cpp b/src/tactic/bv/bvarray2uf_rewriter.cpp index 5d5797dfa..782a15f11 100644 --- a/src/tactic/bv/bvarray2uf_rewriter.cpp +++ b/src/tactic/bv/bvarray2uf_rewriter.cpp @@ -61,7 +61,7 @@ sort * bvarray2uf_rewriter_cfg::get_index_sort(expr * e) { sort * bvarray2uf_rewriter_cfg::get_index_sort(sort * s) { SASSERT(s->get_num_parameters() >= 2); unsigned total_width = 0; - for (unsigned i = 0; i < s->get_num_parameters() - 1; i++) { + for (unsigned i = 0; i < s->get_num_parameters() - 1; ++i) { parameter const & p = s->get_parameter(i); SASSERT(p.is_ast() && is_sort(to_sort(p.get_ast()))); SASSERT(m_bv_util.is_bv_sort(to_sort(p.get_ast()))); @@ -90,7 +90,7 @@ bool bvarray2uf_rewriter_cfg::is_bv_array(sort * s) { return false; SASSERT(s->get_num_parameters() >= 2); - for (unsigned i = 0; i < s->get_num_parameters(); i++) { + for (unsigned i = 0; i < s->get_num_parameters(); ++i) { parameter const & p = s->get_parameter(i); if (!p.is_ast() || !is_sort(to_sort(p.get_ast())) || !m_bv_util.is_bv_sort(to_sort(p.get_ast()))) @@ -201,7 +201,7 @@ br_status bvarray2uf_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr bool has_bv_arrays = false; func_decl_ref f_t(m_manager); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (is_bv_array(args[i])) { SASSERT(m_array_util.is_as_array(args[i])); has_bv_arrays = true; @@ -279,7 +279,7 @@ br_status bvarray2uf_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr func_decl_ref map_f(to_func_decl(f->get_parameter(0).get_ast()), m_manager); func_decl_ref_vector ss(m_manager); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { SASSERT(m_array_util.is_array(args[i])); func_decl_ref fd(mk_uf_for_array(args[i]), m_manager); ss.push_back(fd); @@ -291,7 +291,7 @@ br_status bvarray2uf_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr var_ref x(m_manager.mk_var(0, sorts[0]), m_manager); expr_ref_vector new_args(m_manager); - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) new_args.push_back(m_manager.mk_app(ss[i].get(), x.get())); expr_ref body(m_manager); @@ -362,7 +362,7 @@ bool bvarray2uf_rewriter_cfg::pre_visit(expr * t) quantifier * q = to_quantifier(t); TRACE(bvarray2uf_rw_q, tout << "pre_visit quantifier [" << q->get_id() << "]: " << mk_ismt2_pp(q->get_expr(), m()) << std::endl;); sort_ref_vector new_bindings(m_manager); - for (unsigned i = 0; i < q->get_num_decls(); i++) + for (unsigned i = 0; i < q->get_num_decls(); ++i) new_bindings.push_back(q->get_decl_sort(i)); SASSERT(new_bindings.size() == q->get_num_decls()); m_bindings.append(new_bindings); diff --git a/src/tactic/bv/bvarray2uf_tactic.cpp b/src/tactic/bv/bvarray2uf_tactic.cpp index 3a4971e04..58a1e6238 100644 --- a/src/tactic/bv/bvarray2uf_tactic.cpp +++ b/src/tactic/bv/bvarray2uf_tactic.cpp @@ -72,7 +72,7 @@ class bvarray2uf_tactic : public tactic { expr_ref new_curr(m_manager); proof_ref new_pr(m_manager); unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g->inconsistent()) break; expr* curr = g->form(idx); diff --git a/src/tactic/bv/dt2bv_tactic.cpp b/src/tactic/bv/dt2bv_tactic.cpp index 190403349..a272bb0a9 100644 --- a/src/tactic/bv/dt2bv_tactic.cpp +++ b/src/tactic/bv/dt2bv_tactic.cpp @@ -133,7 +133,7 @@ public: rw.set_is_fd(&m_is_fd); expr_ref new_curr(m); proof_ref new_pr(m); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { rw(g->form(idx), new_curr, new_pr); if (produce_proofs) { proof * pr = g->pr(idx); diff --git a/src/tactic/bv/elim_small_bv_tactic.cpp b/src/tactic/bv/elim_small_bv_tactic.cpp index 8bcdd7153..a6120cf60 100644 --- a/src/tactic/bv/elim_small_bv_tactic.cpp +++ b/src/tactic/bv/elim_small_bv_tactic.cpp @@ -79,7 +79,7 @@ class elim_small_bv_tactic : public tactic { // (VAR 0) is in the first position of substitution; (VAR num_decls-1) is in the last position. - for (unsigned i = 0; i < max_var_idx_p1; i++) + for (unsigned i = 0; i < max_var_idx_p1; ++i) substitution.push_back(nullptr); // (VAR num_decls) ... (VAR num_decls+sz-1); are in positions num_decls .. num_decls+sz-1 @@ -89,7 +89,7 @@ class elim_small_bv_tactic : public tactic { // (VAR 0) should be in the last position of substitution. TRACE(elim_small_bv, tout << "substitution: " << std::endl; - for (unsigned k = 0; k < substitution.size(); k++) { + for (unsigned k = 0; k < substitution.size(); ++k) { expr * se = substitution[k]; tout << k << " = "; if (se == 0) tout << "0"; @@ -151,7 +151,7 @@ class elim_small_bv_tactic : public tactic { if (max_num > m_max_steps || max_num + num_steps > m_max_steps) return false; - for (unsigned j = 0; j < max_num && !max_steps_exceeded(num_steps); j++) { + for (unsigned j = 0; j < max_num && !max_steps_exceeded(num_steps); ++j) { expr_ref n(m_util.mk_numeral(j, bv_sz), m); new_bodies.push_back(replace_var(uv, num_decls, max_var_idx_p1, i, s, body, n)); num_steps++; @@ -170,7 +170,7 @@ class elim_small_bv_tactic : public tactic { } TRACE(elim_small_bv, tout << "new bodies: " << std::endl; - for (unsigned k = 0; k < new_bodies.size(); k++) + for (unsigned k = 0; k < new_bodies.size(); ++k) tout << mk_ismt2_pp(new_bodies[k].get(), m) << std::endl; ); body = is_forall(q) ? m.mk_and(new_bodies.size(), new_bodies.data()) : @@ -200,7 +200,7 @@ class elim_small_bv_tactic : public tactic { quantifier * q = to_quantifier(t); TRACE(elim_small_bv, tout << "pre_visit quantifier [" << q->get_id() << "]: " << mk_ismt2_pp(q->get_expr(), m) << std::endl;); sort_ref_vector new_bindings(m); - for (unsigned i = 0; i < q->get_num_decls(); i++) + for (unsigned i = 0; i < q->get_num_decls(); ++i) new_bindings.push_back(q->get_decl_sort(i)); SASSERT(new_bindings.size() == q->get_num_decls()); m_bindings.append(new_bindings); diff --git a/src/tactic/core/cofactor_elim_term_ite.cpp b/src/tactic/core/cofactor_elim_term_ite.cpp index aa6f25dd9..f4994f638 100644 --- a/src/tactic/core/cofactor_elim_term_ite.cpp +++ b/src/tactic/core/cofactor_elim_term_ite.cpp @@ -591,7 +591,7 @@ struct cofactor_elim_term_ite::imp { bool has_new_args = false; bool has_term_ite = false; unsigned num = to_app(t)->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * arg = to_app(t)->get_arg(i); expr * new_arg = nullptr; TRACE(cofactor_bug, tout << "collecting child: " << arg->get_id() << "\n";); diff --git a/src/tactic/core/collect_occs.cpp b/src/tactic/core/collect_occs.cpp index 97bd969e2..b8ea5d7f0 100644 --- a/src/tactic/core/collect_occs.cpp +++ b/src/tactic/core/collect_occs.cpp @@ -80,7 +80,7 @@ void collect_occs::process(expr * t) { void collect_occs::operator()(goal const & g, obj_hashtable & r) { unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * t = g.form(i); process(t); } diff --git a/src/tactic/core/collect_statistics_tactic.cpp b/src/tactic/core/collect_statistics_tactic.cpp index b2c46cae6..5e8af0b43 100644 --- a/src/tactic/core/collect_statistics_tactic.cpp +++ b/src/tactic/core/collect_statistics_tactic.cpp @@ -70,7 +70,7 @@ public: collect_proc cp(m, m_stats); expr_mark visited; const unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) for_each_expr(cp, visited, g->form(i)); std::cout << "(\n"; @@ -157,7 +157,7 @@ protected: } void operator()(func_decl * f) { - for (unsigned i = 0; i < f->get_arity(); i++) + for (unsigned i = 0; i < f->get_arity(); ++i) this->operator()(f->get_domain()[i]); this->operator()(f->get_range()); diff --git a/src/tactic/core/ctx_simplify_tactic.cpp b/src/tactic/core/ctx_simplify_tactic.cpp index 8752c4dfc..6533b428d 100644 --- a/src/tactic/core/ctx_simplify_tactic.cpp +++ b/src/tactic/core/ctx_simplify_tactic.cpp @@ -179,7 +179,7 @@ struct ctx_simplify_tactic::imp { restore_cache(0); dealloc(m_simp); DEBUG_CODE({ - for (unsigned i = 0; i < m_cache.size(); i++) { + for (unsigned i = 0; i < m_cache.size(); ++i) { CTRACE(ctx_simplify_tactic_bug, m_cache[i].m_from, tout << "i: " << i << "\n" << mk_ismt2_pp(m_cache[i].m_from, m) << "\n"; tout << "m_result: " << m_cache[i].m_result << "\n"; @@ -210,7 +210,7 @@ struct ctx_simplify_tactic::imp { } bool check_cache() { - for (unsigned i = 0; i < m_cache.size(); i++) { + for (unsigned i = 0; i < m_cache.size(); ++i) { cache_cell & cell = m_cache[i]; if (cell.m_from != nullptr) { SASSERT(cell.m_result != 0); @@ -294,7 +294,7 @@ struct ctx_simplify_tactic::imp { m_simp->pop(num_scopes); // restore cache - for (unsigned i = 0; i < num_scopes; i++) { + for (unsigned i = 0; i < num_scopes; ++i) { restore_cache(lvl); lvl--; } @@ -354,7 +354,7 @@ struct ctx_simplify_tactic::imp { unsigned old_lvl = scope_level(); bool modified = false; unsigned num_args = t->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = t->get_arg(i); expr_ref new_arg(m); simplify(arg, new_arg); @@ -479,7 +479,7 @@ struct ctx_simplify_tactic::imp { expr_ref_buffer new_args(m); bool modified = false; unsigned num_args = t->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { expr * arg = t->get_arg(i); expr_ref new_arg(m); simplify(arg, new_arg); diff --git a/src/tactic/core/elim_term_ite_tactic.cpp b/src/tactic/core/elim_term_ite_tactic.cpp index c67443862..4ea7c4f46 100644 --- a/src/tactic/core/elim_term_ite_tactic.cpp +++ b/src/tactic/core/elim_term_ite_tactic.cpp @@ -108,7 +108,7 @@ class elim_term_ite_tactic : public tactic { expr_ref new_curr(m); proof_ref new_pr(m); unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { expr * curr = g->form(idx); m_rw(curr, new_curr, new_pr); if (produce_proofs) { diff --git a/src/tactic/core/elim_uncnstr_tactic.cpp b/src/tactic/core/elim_uncnstr_tactic.cpp index 79cf8252f..432f0e9e1 100644 --- a/src/tactic/core/elim_uncnstr_tactic.cpp +++ b/src/tactic/core/elim_uncnstr_tactic.cpp @@ -82,7 +82,7 @@ class elim_uncnstr_tactic : public tactic { } bool uncnstr(unsigned num, expr * const * args) const { - for (unsigned i = 0; i < num; i++) + for (unsigned i = 0; i < num; ++i) if (!uncnstr(args[i])) return false; return true; @@ -130,7 +130,7 @@ class elim_uncnstr_tactic : public tactic { void add_defs(unsigned num, expr * const * args, expr * u, expr * identity) { if (m_mc) { add_def(args[0], u); - for (unsigned i = 1; i < num; i++) + for (unsigned i = 1; i < num; ++i) add_def(args[i], identity); } } @@ -155,7 +155,7 @@ class elim_uncnstr_tactic : public tactic { if (m().is_uninterp(get_array_range(s))) return false; unsigned arity = get_array_arity(s); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) if (m().is_uninterp(get_array_domain(s, i))) return false; // building @@ -164,7 +164,7 @@ class elim_uncnstr_tactic : public tactic { // and d is a term different from (select t i1 ... in) ptr_buffer new_args; new_args.push_back(t); - for (unsigned i = 0; i < arity; i++) + for (unsigned i = 0; i < arity; ++i) new_args.push_back(m().get_some_value(get_array_domain(s, i))); expr_ref sel(m()); sel = m().mk_app(fid, OP_SELECT, new_args.size(), new_args.data()); @@ -182,7 +182,7 @@ class elim_uncnstr_tactic : public tactic { for (func_decl * constructor : constructors) { unsigned num = constructor->get_arity(); unsigned target = UINT_MAX; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sort * s_arg = constructor->get_domain(i); if (s == s_arg) { target = i; @@ -195,7 +195,7 @@ class elim_uncnstr_tactic : public tactic { continue; // use the constructor the distinct term constructor(...,t,...) ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (i == target) { new_args.push_back(t); } @@ -403,7 +403,7 @@ class elim_uncnstr_tactic : public tactic { return nullptr; unsigned i; expr * v = nullptr; - for (i = 0; i < num; i++) { + for (i = 0; i < num; ++i) { expr * arg = args[i]; if (uncnstr(arg)) { v = arg; @@ -418,7 +418,7 @@ class elim_uncnstr_tactic : public tactic { if (!m_mc) return u; ptr_buffer new_args; - for (unsigned j = 0; j < num; j++) { + for (unsigned j = 0; j < num; ++j) { if (j == i) continue; new_args.push_back(args[j]); @@ -775,7 +775,7 @@ class elim_uncnstr_tactic : public tactic { return r; } func_decl * c = m_dt_util.get_accessor_constructor(f); - for (unsigned i = 0; i < c->get_arity(); i++) + for (unsigned i = 0; i < c->get_arity(); ++i) if (!m().is_fully_interp(c->get_domain(i))) return nullptr; app * u; @@ -783,7 +783,7 @@ class elim_uncnstr_tactic : public tactic { return u; ptr_vector const & accs = *m_dt_util.get_constructor_accessors(c); ptr_buffer new_args; - for (unsigned i = 0; i < accs.size(); i++) { + for (unsigned i = 0; i < accs.size(); ++i) { if (accs[i] == f) new_args.push_back(u); else @@ -841,7 +841,7 @@ class elim_uncnstr_tactic : public tactic { if (fid == null_family_id) return BR_FAILED; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (!is_ground(args[i])) return BR_FAILED; // non-ground terms are not handled. } @@ -932,7 +932,7 @@ class elim_uncnstr_tactic : public tactic { unsigned size = g->size(); unsigned idx = 0; while (true) { - for (; idx < size; idx++) { + for (; idx < size; ++idx) { expr * f = g->form(idx); m_rw->operator()(f, new_f, new_pr); if (f == new_f) diff --git a/src/tactic/core/nnf_tactic.cpp b/src/tactic/core/nnf_tactic.cpp index 89be52c07..b7d5a92a4 100644 --- a/src/tactic/core/nnf_tactic.cpp +++ b/src/tactic/core/nnf_tactic.cpp @@ -70,7 +70,7 @@ public: proof_ref new_pr(m); unsigned sz = g->size(); - for (unsigned i = 0; !g->inconsistent() && i < sz; i++) { + for (unsigned i = 0; !g->inconsistent() && i < sz; ++i) { expr * curr = g->form(i); local_nnf(curr, defs, def_prs, new_curr, new_pr); if (produce_proofs) { @@ -81,7 +81,7 @@ public: } sz = defs.size(); - for (unsigned i = 0; !g->inconsistent() && i < sz; i++) { + for (unsigned i = 0; !g->inconsistent() && i < sz; ++i) { if (produce_proofs) g->assert_expr(defs.get(i), def_prs.get(i), nullptr); else @@ -93,7 +93,7 @@ public: if (num_extra_names > 0 && !g->inconsistent()) { generic_model_converter * fmc = alloc(generic_model_converter, m, "nnf"); g->add(fmc); - for (unsigned i = 0; i < num_extra_names; i++) + for (unsigned i = 0; i < num_extra_names; ++i) fmc->hide(dnames.get_name_decl(i)); } } diff --git a/src/tactic/core/occf_tactic.cpp b/src/tactic/core/occf_tactic.cpp index 1784a434d..7ad3fd3fe 100644 --- a/src/tactic/core/occf_tactic.cpp +++ b/src/tactic/core/occf_tactic.cpp @@ -51,7 +51,7 @@ class occf_tactic : public tactic { SASSERT(m.is_or(cls)); bool found = false; unsigned num = cls->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (is_constraint(cls->get_arg(i))) { if (found) return true; @@ -138,7 +138,7 @@ class occf_tactic : public tactic { cnstr2bvar c2b; unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); expr * f = g->form(i); expr_dependency * d = g->dep(i); @@ -154,7 +154,7 @@ class occf_tactic : public tactic { expr * keep = nullptr; new_lits.reset(); unsigned num = cls->get_num_args(); - for (unsigned j = 0; j < num; j++) { + for (unsigned j = 0; j < num; ++j) { expr * l = cls->get_arg(j); if (is_constraint(l)) { expr * new_l = get_aux_lit(c2b, l, g); diff --git a/src/tactic/core/propagate_values_tactic.cpp b/src/tactic/core/propagate_values_tactic.cpp index aa7d94013..cebd38fd6 100644 --- a/src/tactic/core/propagate_values_tactic.cpp +++ b/src/tactic/core/propagate_values_tactic.cpp @@ -159,7 +159,7 @@ class propagate_values_tactic : public tactic { while (true) { TRACE(propagate_values, tout << "while(true) loop\n"; m_goal->display_with_dependencies(tout);); if (forward) { - for (; m_idx < size; m_idx++) { + for (; m_idx < size; ++m_idx) { process_current(); if (m_goal->inconsistent()) goto end; diff --git a/src/tactic/core/reduce_args_tactic.cpp b/src/tactic/core/reduce_args_tactic.cpp index 2c82e7bfb..7a4c6abc1 100644 --- a/src/tactic/core/reduce_args_tactic.cpp +++ b/src/tactic/core/reduce_args_tactic.cpp @@ -146,7 +146,7 @@ class reduce_args_tactic : public tactic { find_non_candidates_proc proc(m, m_bv, m_ar, non_candidates); expr_fast_mark1 visited; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); quick_for_each_expr(proc, visited, g.form(i)); } @@ -210,7 +210,7 @@ class reduce_args_tactic : public tactic { decl2args.reset(); populate_decl2args_proc proc(m, m_bv, non_candidates, decl2args); unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { checkpoint(); quick_for_each_expr(proc, visited, g.form(i)); } @@ -219,7 +219,7 @@ class reduce_args_tactic : public tactic { ptr_buffer bad_decls; for (auto const& [k, v] : decl2args) { bool is_zero = true; - for (unsigned i = 0; i < v.size() && is_zero; i++) { + for (unsigned i = 0; i < v.size() && is_zero; ++i) { if (v.get(i)) is_zero = false; } @@ -247,7 +247,7 @@ class reduce_args_tactic : public tactic { // compute the hash-code using only the arguments where m_bv is true. unsigned a = 0x9e3779b9; unsigned num_args = n->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!m_bv.get(i)) continue; // ignore argument a = hash_u_u(a, n->get_arg(i)->get_id()); @@ -264,7 +264,7 @@ class reduce_args_tactic : public tactic { // compare only the arguments where m_bv is true SASSERT(n1->get_num_args() == n2->get_num_args()); unsigned num_args = n1->get_num_args(); - for (unsigned i = 0; i < num_args; i++) { + for (unsigned i = 0; i < num_args; ++i) { if (!m_bv.get(i)) continue; // ignore argument if (n1->get_arg(i) != n2->get_arg(i)) @@ -348,7 +348,7 @@ class reduce_args_tactic : public tactic { } ptr_buffer new_args; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (!bv.get(i)) new_args.push_back(args[i]); } @@ -381,7 +381,7 @@ class reduce_args_tactic : public tactic { bit_vector & bv = decl2args.find(f); new_vars.reset(); new_args.reset(); - for (unsigned i = 0; i < f->get_arity(); i++) { + for (unsigned i = 0; i < f->get_arity(); ++i) { new_vars.push_back(m.mk_var(i, f->get_domain(i))); if (!bv.get(i)) new_args.push_back(new_vars.back()); @@ -394,7 +394,7 @@ class reduce_args_tactic : public tactic { } else { new_eqs.reset(); - for (unsigned i = 0; i < f->get_arity(); i++) { + for (unsigned i = 0; i < f->get_arity(); ++i) { if (bv.get(i)) new_eqs.push_back(m.mk_eq(new_vars.get(i), t->get_arg(i))); } diff --git a/src/tactic/core/simplify_tactic.cpp b/src/tactic/core/simplify_tactic.cpp index 410e00db5..36be7a311 100644 --- a/src/tactic/core/simplify_tactic.cpp +++ b/src/tactic/core/simplify_tactic.cpp @@ -51,7 +51,7 @@ struct simplify_tactic::imp { expr_ref new_curr(m()); proof_ref new_pr(m()); unsigned size = g.size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g.inconsistent()) break; expr * curr = g.form(idx); diff --git a/src/tactic/core/special_relations_tactic.cpp b/src/tactic/core/special_relations_tactic.cpp index ec63543f2..b13aebbd4 100644 --- a/src/tactic/core/special_relations_tactic.cpp +++ b/src/tactic/core/special_relations_tactic.cpp @@ -128,7 +128,7 @@ void special_relations_tactic::operator()(goal_ref const & g, goal_ref_buffer & initialize(); obj_map goal_features; unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { collect_feature(*g, idx, goal_features); } special_relations_util u(m); @@ -159,7 +159,7 @@ void special_relations_tactic::operator()(goal_ref const & g, goal_ref_buffer & } } if (!replace.empty()) { - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (to_delete.contains(idx)) { g->update(idx, m.mk_true()); } diff --git a/src/tactic/core/split_clause_tactic.cpp b/src/tactic/core/split_clause_tactic.cpp index bd9e2d183..8c780575a 100644 --- a/src/tactic/core/split_clause_tactic.cpp +++ b/src/tactic/core/split_clause_tactic.cpp @@ -28,7 +28,7 @@ class split_clause_tactic : public tactic { unsigned result_idx = UINT_MAX; unsigned len = 0; unsigned sz = in->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = in->form(i); if (m.is_or(f)) { unsigned curr_len = to_app(f)->get_num_args(); @@ -61,7 +61,7 @@ class split_clause_tactic : public tactic { SASSERT(num_source == m_clause->get_num_args()); proof_ref_buffer prs(m); prs.push_back(m_clause_pr); - for (unsigned i = 0; i < num_source; i++) { + for (unsigned i = 0; i < num_source; ++i) { proof * pr_i = source[i]; expr * not_li = m.mk_not(m_clause->get_arg(i)); prs.push_back(m.mk_lemma(pr_i, not_li)); diff --git a/src/tactic/core/tseitin_cnf_tactic.cpp b/src/tactic/core/tseitin_cnf_tactic.cpp index 5f8866ed3..ba396a756 100644 --- a/src/tactic/core/tseitin_cnf_tactic.cpp +++ b/src/tactic/core/tseitin_cnf_tactic.cpp @@ -664,14 +664,14 @@ class tseitin_cnf_tactic : public tactic { bool visited = true; unsigned num = t->get_num_args(); unsigned blowup = 1; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * a = t->get_arg(i); expr * a0; if (m_distributivity && m.is_not(a, a0) && m.is_or(a0) && !is_shared(a0)) { unsigned num2 = to_app(a0)->get_num_args(); if (num2 < m_distributivity_blowup && blowup * num2 < m_distributivity_blowup && blowup < blowup * num2) { blowup *= num2; - for (unsigned j = 0; j < num2; j++) + for (unsigned j = 0; j < num2; ++j) visit(to_app(a0)->get_arg(j), visited); continue; } @@ -693,7 +693,7 @@ class tseitin_cnf_tactic : public tactic { bool distributivity = false; if (m_distributivity) { // check if need to apply distributivity - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr * a = t->get_arg(i); expr * a0; if (m.is_not(a, a0) && m.is_or(a0) && !is_shared(a0) && to_app(a0)->get_num_args() < m_distributivity_blowup) { @@ -706,7 +706,7 @@ class tseitin_cnf_tactic : public tactic { if (!distributivity) { // easy case expr_ref_buffer lits(m); expr_ref l(m); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { get_lit(t->get_arg(i), false, l); lits.push_back(l); } @@ -714,7 +714,7 @@ class tseitin_cnf_tactic : public tactic { mk_clause(lits.size(), lits.data()); } else { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { inv(lits[i], l); mk_clause(l, k); } @@ -728,7 +728,7 @@ class tseitin_cnf_tactic : public tactic { sbuffer it; sbuffer offsets; unsigned blowup = 1; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { it.push_back(0); offsets.push_back(buffer.size()); expr * a = t->get_arg(i); @@ -739,7 +739,7 @@ class tseitin_cnf_tactic : public tactic { szs.push_back(num2); blowup *= num2; expr_ref_buffer lits(m); - for (unsigned j = 0; j < num2; j++) { + for (unsigned j = 0; j < num2; ++j) { get_lit(to_app(a0)->get_arg(j), true, nl); buffer.push_back(nl); if (!root) { @@ -766,12 +766,12 @@ class tseitin_cnf_tactic : public tactic { sbuffer arg_lits; ptr_buffer lits; expr ** buffer_ptr = buffer.data(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { arg_lits.push_back(buffer_ptr + offsets[i]); } do { lits.reset(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { lits.push_back(arg_lits[i][it[i]]); } if (!root) @@ -863,7 +863,7 @@ class tseitin_cnf_tactic : public tactic { g->reset(); unsigned sz = m_clauses.size(); expr_fast_mark1 added; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * cls = m_clauses.get(i); if (added.is_marked(cls)) continue; diff --git a/src/tactic/fpa/fpa2bv_model_converter.cpp b/src/tactic/fpa/fpa2bv_model_converter.cpp index 9852a427a..bc4cd288c 100644 --- a/src/tactic/fpa/fpa2bv_model_converter.cpp +++ b/src/tactic/fpa/fpa2bv_model_converter.cpp @@ -34,16 +34,16 @@ model_converter * fpa2bv_model_converter::translate(ast_translation & translator void fpa2bv_model_converter::convert(model_core * mc, model * float_mdl) { TRACE(fpa2bv_mc, tout << "BV Model: " << std::endl; - for (unsigned i = 0; i < mc->get_num_constants(); i++) + for (unsigned i = 0; i < mc->get_num_constants(); ++i) tout << mc->get_constant(i)->get_name() << " --> " << mk_ismt2_pp(mc->get_const_interp(mc->get_constant(i)), m) << std::endl; - for (unsigned i = 0; i < mc->get_num_functions(); i++) { + for (unsigned i = 0; i < mc->get_num_functions(); ++i) { func_decl * f = mc->get_function(i); tout << f->get_name() << "(...) := " << std::endl; func_interp * fi = mc->get_func_interp(f); - for (unsigned j = 0; j < fi->num_entries(); j++) { + for (unsigned j = 0; j < fi->num_entries(); ++j) { func_entry const * fe = fi->get_entry(j); - for (unsigned k = 0; k < f->get_arity(); k++) + for (unsigned k = 0; k < f->get_arity(); ++k) tout << mk_ismt2_pp(fe->get_arg(k), m) << " "; tout << "--> " << mk_ismt2_pp(fe->get_result(), m) << std::endl; } @@ -58,7 +58,7 @@ void fpa2bv_model_converter::convert(model_core * mc, model * float_mdl) { // Keep all the non-float constants. unsigned sz = mc->get_num_constants(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * c = mc->get_constant(i); if (!seen.contains(c)) float_mdl->register_decl(c, mc->get_const_interp(c)); @@ -66,7 +66,7 @@ void fpa2bv_model_converter::convert(model_core * mc, model * float_mdl) { // And keep everything else sz = mc->get_num_functions(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { func_decl * f = mc->get_function(i); if (!seen.contains(f)) { TRACE(fpa2bv_mc, tout << "Keeping: " << mk_ismt2_pp(f, m) << std::endl;); @@ -76,7 +76,7 @@ void fpa2bv_model_converter::convert(model_core * mc, model * float_mdl) { } sz = mc->get_num_uninterpreted_sorts(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { sort * s = mc->get_uninterpreted_sort(i); ptr_vector u = mc->get_universe(s); float_mdl->register_usort(s, u.size(), u.data()); diff --git a/src/tactic/fpa/fpa2bv_tactic.cpp b/src/tactic/fpa/fpa2bv_tactic.cpp index 07bc41635..d778d3a68 100644 --- a/src/tactic/fpa/fpa2bv_tactic.cpp +++ b/src/tactic/fpa/fpa2bv_tactic.cpp @@ -57,7 +57,7 @@ class fpa2bv_tactic : public tactic { expr_ref new_curr(m); proof_ref new_pr(m); unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { if (g->inconsistent()) break; expr * curr = g->form(idx); diff --git a/src/tactic/goal.cpp b/src/tactic/goal.cpp index cb7bc3326..c8a6c18d3 100644 --- a/src/tactic/goal.cpp +++ b/src/tactic/goal.cpp @@ -197,7 +197,7 @@ void goal::quick_process(bool save_first, expr_ref& f, expr_dependency * d) { void goal::process_and(bool save_first, app * f, proof * pr, expr_dependency * d, expr_ref & out_f, proof_ref & out_pr) { unsigned num = f->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (m_inconsistent) return; slow_process(save_first && i == 0, f->get_arg(i), m().mk_and_elim(pr, i), d, out_f, out_pr); @@ -206,7 +206,7 @@ void goal::process_and(bool save_first, app * f, proof * pr, expr_dependency * d void goal::process_not_or(bool save_first, app * f, proof * pr, expr_dependency * d, expr_ref & out_f, proof_ref & out_pr) { unsigned num = f->get_num_args(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { if (m_inconsistent) return; expr * child = f->get_arg(i); @@ -269,14 +269,14 @@ void goal::assert_expr(expr * f, expr_dependency * d) { void goal::get_formulas(ptr_vector & result) const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { result.push_back(form(i)); } } void goal::get_formulas(expr_ref_vector & result) const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { result.push_back(form(i)); } } @@ -342,7 +342,7 @@ void goal::reset() { void goal::display(ast_printer & prn, std::ostream & out) const { out << "(goal"; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n "; prn.display(out, form(i), 2); } @@ -354,7 +354,7 @@ void goal::display_with_dependencies(ast_printer & prn, std::ostream & out) cons obj_hashtable to_pp; out << "(goal"; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n |-"; deps.reset(); m().linearize(dep(i), deps); @@ -386,7 +386,7 @@ void goal::display_with_dependencies(std::ostream & out) const { ptr_vector deps; out << "(goal"; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n |-"; deps.reset(); m().linearize(dep(i), deps); @@ -407,7 +407,7 @@ void goal::display_with_dependencies(std::ostream & out) const { void goal::display_with_proofs(std::ostream& out) const { out << "(goal"; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n |-"; if (pr(i)) { out << mk_ismt2_pp(pr(i), m(), 4); @@ -428,7 +428,7 @@ void goal::display_with_dependencies(ast_printer_context & ctx) const { void goal::display(std::ostream & out) const { out << "(goal"; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << "\n "; out << mk_ismt2_pp(form(i), m(), 2); } @@ -438,7 +438,7 @@ void goal::display(std::ostream & out) const { void goal::display_as_and(std::ostream & out) const { ptr_buffer args; unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) args.push_back(form(i)); expr_ref tmp(m()); tmp = m().mk_and(args.size(), args.data()); @@ -447,7 +447,7 @@ void goal::display_as_and(std::ostream & out) const { void goal::display_ll(std::ostream & out) const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { out << mk_ll_pp(form(i), m()) << "\n"; } } @@ -465,7 +465,7 @@ unsigned goal::num_exprs() const { expr_fast_mark1 visited; unsigned sz = size(); unsigned r = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { r += get_num_exprs(form(i), visited); } return r; @@ -474,12 +474,12 @@ unsigned goal::num_exprs() const { void goal::shrink(unsigned j) { SASSERT(j <= size()); unsigned sz = size(); - for (unsigned i = j; i < sz; i++) + for (unsigned i = j; i < sz; ++i) m().pop_back(m_forms); - for (unsigned i = j; i < sz; i++) + for (unsigned i = j; i < sz; ++i) m().pop_back(m_proofs); if (unsat_core_enabled()) - for (unsigned i = j; i < sz; i++) + for (unsigned i = j; i < sz; ++i) m().pop_back(m_dependencies); } @@ -511,7 +511,7 @@ void goal::elim_true() { */ unsigned goal::get_idx(expr * f) const { unsigned sz = size(); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { if (form(j) == f) return j; } @@ -525,7 +525,7 @@ unsigned goal::get_idx(expr * f) const { unsigned goal::get_not_idx(expr * f) const { expr * atom; unsigned sz = size(); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { if (m().is_not(form(j), atom) && atom == f) return j; } @@ -539,7 +539,7 @@ void goal::elim_redundancies() { expr_ref_fast_mark2 pos_lits(m()); unsigned sz = size(); unsigned j = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f = form(i); if (m().is_true(f)) continue; @@ -593,7 +593,7 @@ void goal::elim_redundancies() { bool goal::is_well_formed() const { unsigned sz = size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * t = form(i); if (!::is_well_sorted(m(), t)) return false; @@ -618,7 +618,7 @@ goal * goal::translate(ast_translation & translator) const { goal * res = alloc(goal, m_to, m_to.proofs_enabled() && proofs_enabled(), models_enabled(), unsat_core_enabled()); unsigned sz = m().size(m_forms); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { res->m().push_back(res->m_forms, translator(m().get(m_forms, i))); res->m().push_back(res->m_proofs, translator(m().get(m_proofs, i))); if (res->unsat_core_enabled()) @@ -663,7 +663,7 @@ bool is_equal(goal const & s1, goal const & s2) { expr_fast_mark1 visited1; expr_fast_mark2 visited2; unsigned sz = s1.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f1 = s1.form(i); if (visited1.is_marked(f1)) continue; @@ -672,7 +672,7 @@ bool is_equal(goal const & s1, goal const & s2) { } SASSERT(num1 <= sz); SASSERT(0 <= num1); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * f2 = s2.form(i); if (visited2.is_marked(f2)) continue; @@ -688,7 +688,7 @@ bool is_equal(goal const & s1, goal const & s2) { } bool goal::is_cnf() const { - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { expr * f = form(i); if (m_manager.is_or(f)) { for (expr* lit : *to_app(f)) diff --git a/src/tactic/goal.h b/src/tactic/goal.h index aabd1024b..11f4f965f 100644 --- a/src/tactic/goal.h +++ b/src/tactic/goal.h @@ -234,7 +234,7 @@ bool test(goal const & g, Predicate & proc) { expr_fast_mark1 visited; try { unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) quick_for_each_expr(proc, visited, g.form(i)); } catch (const typename Predicate::found &) { diff --git a/src/tactic/goal_num_occurs.cpp b/src/tactic/goal_num_occurs.cpp index 6817d527d..9af36a814 100644 --- a/src/tactic/goal_num_occurs.cpp +++ b/src/tactic/goal_num_occurs.cpp @@ -21,7 +21,7 @@ Revision History: void goal_num_occurs::operator()(goal const & g) { expr_fast_mark1 visited; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m_pinned.push_back(g.form(i)); process(g.form(i), visited); } diff --git a/src/tactic/goal_shared_occs.cpp b/src/tactic/goal_shared_occs.cpp index 0048e642a..7ec12b988 100644 --- a/src/tactic/goal_shared_occs.cpp +++ b/src/tactic/goal_shared_occs.cpp @@ -22,7 +22,7 @@ void goal_shared_occs::operator()(goal const & g) { m_occs.reset(); shared_occs_mark visited; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { expr * t = g.form(i); m_occs(t, visited); } diff --git a/src/tactic/portfolio/solver_subsumption_tactic.cpp b/src/tactic/portfolio/solver_subsumption_tactic.cpp index e28588f10..8c60d31f6 100644 --- a/src/tactic/portfolio/solver_subsumption_tactic.cpp +++ b/src/tactic/portfolio/solver_subsumption_tactic.cpp @@ -155,7 +155,7 @@ public: result.push_back(g.get()); return; } - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) fmls.push_back(std::make_pair(i, expr_ref(g->form(i), m))); if (!m_solver) { scoped_ptr f = mk_smt_strategic_solver_factory(); diff --git a/src/tactic/probe.cpp b/src/tactic/probe.cpp index 263e77813..82ac45540 100644 --- a/src/tactic/probe.cpp +++ b/src/tactic/probe.cpp @@ -446,7 +446,7 @@ public: proc p(g.m(), m_bool, m_family); unsigned sz = g.size(); expr_fast_mark1 visited; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { for_each_expr_core(p, visited, g.form(i)); } return result(p.m_counter); @@ -519,7 +519,7 @@ public: expr_fast_mark1 visited; proc p; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { quick_for_each_expr(p, visited, g.form(i)); } return false; @@ -549,7 +549,7 @@ public: expr_fast_mark1 visited; proc p; unsigned sz = g.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { quick_for_each_expr(p, visited, g.form(i)); } return false; diff --git a/src/tactic/sls/sls_tactic.cpp b/src/tactic/sls/sls_tactic.cpp index 4467d6d85..13f56a50f 100644 --- a/src/tactic/sls/sls_tactic.cpp +++ b/src/tactic/sls/sls_tactic.cpp @@ -69,7 +69,7 @@ public: return; } - for (unsigned i = 0; i < g->size(); i++) + for (unsigned i = 0; i < g->size(); ++i) m_sls->assert_expr(g->form(i)); @@ -169,7 +169,7 @@ public: return; } - for (unsigned i = 0; i < g->size(); i++) + for (unsigned i = 0; i < g->size(); ++i) m_engine->assert_expr(g->form(i)); lbool res = m_engine->operator()(); @@ -177,7 +177,7 @@ public: if (res == l_true) { report_tactic_progress("Number of flips:", stats.m_moves); - for (unsigned i = 0; i < g->size(); i++) + for (unsigned i = 0; i < g->size(); ++i) if (!m_engine->get_mpz_manager().is_one(m_engine->get_value(g->form(i)))) { verbose_stream() << "Terminated before all assertions were SAT!" << std::endl; NOT_IMPLEMENTED_YET(); diff --git a/src/tactic/smtlogics/qfufbv_tactic.cpp b/src/tactic/smtlogics/qfufbv_tactic.cpp index 160e56295..2a0d24345 100644 --- a/src/tactic/smtlogics/qfufbv_tactic.cpp +++ b/src/tactic/smtlogics/qfufbv_tactic.cpp @@ -63,7 +63,7 @@ public: // running implementation ptr_vector flas; const unsigned sz = g->size(); - for (unsigned i = 0; i < sz; i++) flas.push_back(g->form(i)); + for (unsigned i = 0; i < sz; ++i) flas.push_back(g->form(i)); scoped_ptr uffree_solver = setup_sat(); lackr imp(m, m_p, m_st, flas, uffree_solver.get()); const lbool o = imp.operator()(); diff --git a/src/tactic/tactic.cpp b/src/tactic/tactic.cpp index be19325ca..71faa912d 100644 --- a/src/tactic/tactic.cpp +++ b/src/tactic/tactic.cpp @@ -229,7 +229,7 @@ lbool check_sat(tactic & t, goal_ref & g, model_ref & md, labels_vec & labels, p } TRACE(tactic, tout << "r.size(): " << r.size() << "\n"; - for (unsigned i = 0; i < r.size(); i++) r[i]->display_with_dependencies(tout);); + for (unsigned i = 0; i < r.size(); ++i) r[i]->display_with_dependencies(tout);); if (r.size() > 0) { pr = r[0]->pr(0); diff --git a/src/tactic/tactical.cpp b/src/tactic/tactical.cpp index 71a260358..148873c03 100644 --- a/src/tactic/tactical.cpp +++ b/src/tactic/tactical.cpp @@ -128,7 +128,7 @@ public: } else { goal_ref_buffer r2; - for (unsigned i = 0; i < r1_size; i++) { + for (unsigned i = 0; i < r1_size; ++i) { goal_ref g = r1[i]; r2.reset(); m_t2->operator()(g, r2); @@ -285,7 +285,7 @@ protected: public: nary_tactical(unsigned num, tactic * const * ts) { - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { SASSERT(ts[i]); m_ts.push_back(ts[i]); } @@ -347,7 +347,7 @@ public: goal orig(*(in.get())); unsigned sz = m_ts.size(); unsigned i; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { tactic * t = m_ts[i]; SASSERT(sz > 0); if (i < sz - 1) { @@ -493,7 +493,7 @@ public: goal_ref_vector in_copies; tactic_ref_vector ts; unsigned sz = m_ts.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { ast_manager * new_m = alloc(ast_manager, m, !m.proof_mode()); managers.push_back(new_m); ast_translation translator(m, *new_m); @@ -523,7 +523,7 @@ public: } } if (first) { - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { if (i != j) { managers[j]->limit().cancel(); } @@ -648,7 +648,7 @@ public: tactic_ref_vector ts2; goal_ref_vector g_copies; - for (unsigned i = 0; i < r1_size; i++) { + for (unsigned i = 0; i < r1_size; ++i) { ast_manager * new_m = alloc(ast_manager, m, !m.proof_mode()); managers.push_back(new_m); ast_translation translator(m, *new_m); @@ -715,7 +715,7 @@ public: } if (curr_failed) { - for (unsigned j = 0; j < r1_size; j++) { + for (unsigned j = 0; j < r1_size; ++j) { if (static_cast(i) != j) { managers[j]->limit().cancel(); } @@ -736,7 +736,7 @@ public: } } if (first) { - for (unsigned j = 0; j < r1_size; j++) { + for (unsigned j = 0; j < r1_size; ++j) { if (static_cast(i) != j) { managers[j]->limit().cancel(); } @@ -794,12 +794,12 @@ public: return; expr_dependency_ref core(m); - for (unsigned i = 0; i < r1_size; i++) { + for (unsigned i = 0; i < r1_size; ++i) { ast_translation translator(*(managers[i]), m, false); goal_ref_buffer * r = goals_vect[i]; unsigned j = result.size(); if (r != nullptr) { - for (unsigned k = 0; k < r->size(); k++) { + for (unsigned k = 0; k < r->size(); ++k) { result.push_back((*r)[k]->translate(translator)); } } @@ -940,7 +940,7 @@ class repeat_tactical : public unary_tactical { } goal_ref_buffer r2; - for (unsigned i = 0; i < r1_size; i++) { + for (unsigned i = 0; i < r1_size; ++i) { goal_ref g = r1[i]; r2.reset(); operator()(depth + 1, g, r2); diff --git a/src/tactic/ufbv/macro_finder_tactic.cpp b/src/tactic/ufbv/macro_finder_tactic.cpp index 9d508b718..96703ecce 100644 --- a/src/tactic/ufbv/macro_finder_tactic.cpp +++ b/src/tactic/ufbv/macro_finder_tactic.cpp @@ -58,7 +58,7 @@ class macro_finder_tactic : public tactic { proof_ref_vector proofs(m_manager), new_proofs(m_manager); expr_dependency_ref_vector deps(m_manager), new_deps(m_manager); unsigned size = g->size(); - for (unsigned idx = 0; idx < size; idx++) { + for (unsigned idx = 0; idx < size; ++idx) { forms.push_back(g->form(idx)); proofs.push_back(g->pr(idx)); deps.push_back(g->dep(idx)); @@ -67,14 +67,14 @@ class macro_finder_tactic : public tactic { mf(forms, proofs, deps, new_forms, new_proofs, new_deps); g->reset(); - for (unsigned i = 0; i < new_forms.size(); i++) + for (unsigned i = 0; i < new_forms.size(); ++i) g->assert_expr(new_forms.get(i), produce_proofs ? new_proofs.get(i) : nullptr, unsat_core_enabled ? new_deps.get(i) : nullptr); generic_model_converter * evmc = alloc(generic_model_converter, mm.get_manager(), "macro_finder"); unsigned num = mm.get_num_macros(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr_ref f_interp(mm.get_manager()); func_decl * f = mm.get_macro_interpretation(i, f_interp); evmc->add(f, f_interp); diff --git a/src/tactic/ufbv/quasi_macros_tactic.cpp b/src/tactic/ufbv/quasi_macros_tactic.cpp index 12092cdc7..e3edc81d6 100644 --- a/src/tactic/ufbv/quasi_macros_tactic.cpp +++ b/src/tactic/ufbv/quasi_macros_tactic.cpp @@ -58,7 +58,7 @@ class quasi_macros_tactic : public tactic { expr_dependency_ref_vector deps(m_manager); unsigned size = g->size(); - for (unsigned i = 0; i < size; i++) { + for (unsigned i = 0; i < size; ++i) { forms.push_back(g->form(i)); proofs.push_back(g->pr(i)); deps.push_back(g->dep(i)); @@ -70,14 +70,14 @@ class quasi_macros_tactic : public tactic { while (qm(forms, proofs, deps)); g->reset(); - for (unsigned i = 0; i < forms.size(); i++) + for (unsigned i = 0; i < forms.size(); ++i) g->assert_expr(forms.get(i), produce_proofs ? proofs.get(i) : nullptr, produce_unsat_cores ? deps.get(i, nullptr) : nullptr); generic_model_converter * evmc = alloc(generic_model_converter, mm.get_manager(), "quasi_macros"); unsigned num = mm.get_num_macros(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { expr_ref f_interp(mm.get_manager()); func_decl * f = mm.get_macro_interpretation(i, f_interp); evmc->add(f, f_interp); diff --git a/src/tactic/ufbv/ufbv_rewriter_tactic.cpp b/src/tactic/ufbv/ufbv_rewriter_tactic.cpp index 66d377491..762b945b8 100644 --- a/src/tactic/ufbv/ufbv_rewriter_tactic.cpp +++ b/src/tactic/ufbv/ufbv_rewriter_tactic.cpp @@ -57,7 +57,7 @@ public: expr_ref_vector forms(m_manager), new_forms(m_manager); unsigned size = g->size(); - for (unsigned i = 0; i < size; i++) + for (unsigned i = 0; i < size; ++i) forms.push_back(g->form(i)); dem(forms, new_forms); diff --git a/src/test/algebraic.cpp b/src/test/algebraic.cpp index ba219ce9b..ac831a0e3 100644 --- a/src/test/algebraic.cpp +++ b/src/test/algebraic.cpp @@ -190,7 +190,7 @@ void tst_refine_mpbq(int n, int d) { bqm.to_mpbq(q1, l); bqm.set(u, l); bqm.mul2(u); - for (unsigned i = 0; i < 20; i++) { + for (unsigned i = 0; i < 20; ++i) { std::cout << l << " < " << q1 << " < " << u << "\n"; bqm.display_decimal(std::cout, l, 20); std::cout << " < "; qm.display_decimal(std::cout, q1, 20); std::cout << " < "; @@ -201,7 +201,7 @@ void tst_refine_mpbq(int n, int d) { bqm.to_mpbq(q1, l); bqm.set(u, l); bqm.mul2(u); - for (unsigned i = 0; i < 20; i++) { + for (unsigned i = 0; i < 20; ++i) { std::cout << l << " < " << q1 << " < " << u << "\n"; bqm.display_decimal(std::cout, l, 20); std::cout << " < "; qm.display_decimal(std::cout, q1, 20); std::cout << " < "; @@ -230,7 +230,7 @@ static void tst_wilkinson() { polynomial_ref x(m); x = m.mk_polynomial(m.mk_var()); polynomial_ref p(m); - for (int i = 1; i <= 20; i++) { + for (int i = 1; i <= 20; ++i) { if (i > 1) p = p*(x - i); else @@ -244,7 +244,7 @@ static void tst_wilkinson() { am.isolate_roots(p, rs1); display_anums(std::cout, rs1); ENSURE(rs1.size() == 20); - for (unsigned i = 0; i < rs1.size(); i++) { + for (unsigned i = 0; i < rs1.size(); ++i) { ENSURE(am.is_int(rs1[i])); } } @@ -402,11 +402,11 @@ static void tst_isolate_roots(polynomial_ref const & p, anum_manager & am, am.isolate_roots(p, x2v, roots, signs); ENSURE(roots.size() + 1 == signs.size()); std::cout << "roots:\n"; - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { am.display_root(std::cout, roots[i]); std::cout << " "; am.display_decimal(std::cout, roots[i]); std::cout << "\n"; } std::cout << "signs:\n"; - for (unsigned i = 0; i < signs.size(); i++) { + for (unsigned i = 0; i < signs.size(); ++i) { if (i > 0) std::cout << " 0 "; if (signs[i] < 0) std::cout << "-"; @@ -484,7 +484,7 @@ static void tst_isolate_roots() { static void pp(polynomial_ref const & p, polynomial::var x) { unsigned d = degree(p, x); - for (unsigned i = 0; i <= d; i++) { + for (unsigned i = 0; i <= d; ++i) { std::cout << "(" << coeff(p, x, i) << ") "; } std::cout << "\n"; diff --git a/src/test/api_ast_map.cpp b/src/test/api_ast_map.cpp index 1be7c3d19..6b3ae285b 100644 --- a/src/test/api_ast_map.cpp +++ b/src/test/api_ast_map.cpp @@ -173,7 +173,7 @@ void test_ast_map_keys() { // Verify all keys are present (order may vary) bool found_x = false, found_y = false, found_z = false; - for (unsigned i = 0; i < Z3_ast_vector_size(ctx, keys); i++) { + for (unsigned i = 0; i < Z3_ast_vector_size(ctx, keys); ++i) { Z3_ast key = Z3_ast_vector_get(ctx, keys, i); if (Z3_is_eq_ast(ctx, key, x)) found_x = true; if (Z3_is_eq_ast(ctx, key, y)) found_y = true; diff --git a/src/test/bit_blaster.cpp b/src/test/bit_blaster.cpp index 07dcbd4f9..034131eb3 100644 --- a/src/test/bit_blaster.cpp +++ b/src/test/bit_blaster.cpp @@ -35,7 +35,7 @@ void mk_bits(ast_manager & m, char const * prefix, unsigned sz, expr_ref_vector } void display(std::ostream & out, expr_ref_vector & r, bool ll=true) { - for (unsigned i = 0; i < r.size(); i++) { + for (unsigned i = 0; i < r.size(); ++i) { out << "bit " << i << ":\n"; if (ll) ast_ll_pp(out, r.get_manager(), r.get(i)); @@ -50,7 +50,7 @@ static unsigned to_int(model_core & mdl, expr_ref_vector & out) { model_evaluator eval(mdl); expr_ref bit(m); unsigned actual = 0; - for (unsigned i = 0; i < out.size(); i++) { + for (unsigned i = 0; i < out.size(); ++i) { eval(out.get(i), bit); if (m.is_true(bit)) actual |= 1 << i; diff --git a/src/test/bit_vector.cpp b/src/test/bit_vector.cpp index 9a29bf905..2ddcfd756 100644 --- a/src/test/bit_vector.cpp +++ b/src/test/bit_vector.cpp @@ -25,7 +25,7 @@ static void tst1() { bit_vector v1; bool_vector v2; unsigned n = rand()%10000; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { int op = rand()%6; if (op <= 1) { bool val = (rand()%2) != 0; @@ -53,7 +53,7 @@ static void tst1() { } else if (op <= 5) { ENSURE(v1.size() == v2.size()); - for (unsigned j = 0; j < v1.size(); j++) { + for (unsigned j = 0; j < v1.size(); ++j) { ENSURE(v1.get(j) == v2[j]); } } @@ -307,7 +307,7 @@ void tst_bit_vector() { tst_eq(); return; tst2(); - for (unsigned i = 0; i < 20; i++) { + for (unsigned i = 0; i < 20; ++i) { std::cerr << i << std::endl; tst1(); } diff --git a/src/test/bits.cpp b/src/test/bits.cpp index 2fc1efe0c..e80d67c53 100644 --- a/src/test/bits.cpp +++ b/src/test/bits.cpp @@ -16,7 +16,7 @@ static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, unsigned const * dst, bool trace = true) { if (trace) { std::cout << "shl({"; - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { if (i > 0) std::cout << ", "; std::cout << src[i]; } @@ -24,12 +24,12 @@ static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, } svector actual_dst; actual_dst.resize(dst_sz, 0xAAAAAAAA); - for (unsigned sz = 1; sz <= dst_sz; sz++) { + for (unsigned sz = 1; sz <= dst_sz; ++sz) { if (trace) std::cout << " for sz = " << sz << std::endl; shl(src_sz, src, k, sz, actual_dst.data()); ENSURE(!has_one_at_first_k_bits(sz, actual_dst.data(), k)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (trace && dst[i] != actual_dst[i]) std::cout << "UNEXPECTED RESULT at [" << i << "]: " << actual_dst[i] << ", expected: " << dst[i] << "\n"; ENSURE(dst[i] == actual_dst[i]); @@ -49,7 +49,7 @@ static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, svector new_src; new_src.resize(sz, 0xAAAAAAAA); shr(sz, actual_dst.data(), k, new_src.data()); - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { if (trace && src[i] != new_src[i]) { std::cout << "shr BUG, inverting shl, at bit[" << i << "], " << new_src[i] << ", expected: " << src[i] << std::endl; } @@ -60,10 +60,10 @@ static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, if (trace) std::cout << " shift by 1, k times" << std::endl; copy(src_sz, src, dst_sz, actual_dst.data()); - for (unsigned i = 0; i < k; i++) { + for (unsigned i = 0; i < k; ++i) { shl(dst_sz, actual_dst.data(), 1, dst_sz, actual_dst.data()); } - for (unsigned i = 0; i < dst_sz; i++) { + for (unsigned i = 0; i < dst_sz; ++i) { if (trace && dst[i] != actual_dst[i]) std::cout << "UNEXPECTED RESULT at [" << i << "]: " << actual_dst[i] << ", expected: " << dst[i] << "\n"; ENSURE(dst[i] == actual_dst[i]); @@ -72,7 +72,7 @@ static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, if (trace) std::cout << " self-shl" << std::endl; shl(src_sz, src, k, src_sz, const_cast(src)); - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { if (trace && src[i] != dst[i]) std::cout << "UNEXPECTED RESULT at [" << i << "]: " << src[i] << ", expected: " << dst[i] << "\n"; ENSURE(src[i] == actual_dst[i]); @@ -123,7 +123,7 @@ static void tst_shr(unsigned src_sz, unsigned const * src, unsigned k, unsigned const * dst, bool trace = true) { if (trace) { std::cout << "shr({"; - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { if (i > 0) std::cout << ", "; std::cout << src[i]; } @@ -132,7 +132,7 @@ static void tst_shr(unsigned src_sz, unsigned const * src, unsigned k, svector actual_dst; actual_dst.resize(src_sz, 0xAAAAAAAA); shr(src_sz, src, k, actual_dst.data()); - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { if (trace && dst[i] != actual_dst[i]) std::cout << "UNEXPECTED RESULT at [" << i << "]: " << actual_dst[i] << ", expected: " << dst[i] << "\n"; ENSURE(dst[i] == actual_dst[i]); @@ -149,7 +149,7 @@ static void tst_shr() { static void tst_shl_rand(unsynch_mpz_manager & m, unsigned sz, unsigned k, bool trace = true) { // create a random bitvector of of size sz svector src; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { src.push_back(rand()); } // convert src into a mpz number @@ -181,14 +181,14 @@ static void tst_shl_rand(unsynch_mpz_manager & m, unsigned sz, unsigned k, bool dst.push_back(0); dst.push_back(0); unsigned word_shift = (k / 32); - for (unsigned i = 0; i < word_shift; i++) + for (unsigned i = 0; i < word_shift; ++i) dst.push_back(0); tst_shl(src.size(), src.data(), k, dst.size(), dst.data(), trace); } static void tst_shl_rand(unsigned N, unsigned sz, unsigned k, bool trace = false) { unsynch_mpz_manager m; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { unsigned _sz = rand() % sz; if (_sz == 0) _sz = 1; diff --git a/src/test/chashtable.cpp b/src/test/chashtable.cpp index 3bb08f835..9675ee312 100644 --- a/src/test/chashtable.cpp +++ b/src/test/chashtable.cpp @@ -118,7 +118,7 @@ template static void tst4(unsigned num, unsigned N) { int_set s; T t; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { int v = rand() % N; if (rand() % 3 == 2) { TRACE(chashtable, tout << "erase " << v << "\n";); diff --git a/src/test/cnf_backbones.cpp b/src/test/cnf_backbones.cpp index a764ed9cf..c53f131e3 100644 --- a/src/test/cnf_backbones.cpp +++ b/src/test/cnf_backbones.cpp @@ -41,7 +41,7 @@ static void STD_CALL on_ctrl_c(int) { #if 0 static void display_model(sat::solver const & s) { sat::model const & m = s.get_model(); - for (unsigned i = 1; i < m.size(); i++) { + for (unsigned i = 1; i < m.size(); ++i) { switch (m[i]) { case l_false: std::cout << "-" << i << " "; break; case l_undef: break; @@ -158,7 +158,7 @@ static lbool core_chunking(sat::solver& s, sat::bool_var_vector& vars, sat::lite } sat::model const & m = s.get_model(); sat::literal_vector lambda, backbones; - for (unsigned i = 0; i < vars.size(); i++) { + for (unsigned i = 0; i < vars.size(); ++i) { lambda.push_back(sat::literal(vars[i], m[vars[i]] == l_false)); } while (!lambda.empty()) { diff --git a/src/test/dl_context.cpp b/src/test/dl_context.cpp index 1b9bed786..0bb5aab58 100644 --- a/src/test/dl_context.cpp +++ b/src/test/dl_context.cpp @@ -26,7 +26,7 @@ void tst_dl_context() { const char * test_file = "c:\\tvm\\src\\benchmarks\\datalog\\t0.datalog"; params_ref params; - for(unsigned rel_index=0; rel_index=0; eager_checking--) { params.set_bool("eager_emptiness_checking", eager_checking!=0); diff --git a/src/test/dl_query.cpp b/src/test/dl_query.cpp index 8adca3ed6..71caa3d78 100644 --- a/src/test/dl_query.cpp +++ b/src/test/dl_query.cpp @@ -92,10 +92,10 @@ void dl_query_test(ast_manager & m, smt_params & fparams, params_ref& params, std::cerr << "Queries on random facts...\n"; relation_fact f_b(m); relation_fact f_q(m); - for(unsigned attempt=0; attemptsaturate(); - for(unsigned use_restarts=0; use_restarts<=1; use_restarts++) { + for(unsigned use_restarts=0; use_restarts<=1; ++use_restarts) { params.set_uint("initial_restart_timeout", use_restarts ? 100 : 0); - for(unsigned use_similar=0; use_similar<=1; use_similar++) { + for(unsigned use_similar=0; use_similar<=1; ++use_similar) { params.set_uint("similarity_compressor", use_similar != 0); - for(unsigned use_magic_sets=0; use_magic_sets<=1; use_magic_sets++) { + for(unsigned use_magic_sets=0; use_magic_sets<=1; ++use_magic_sets) { stopwatch watch; if (!(use_restarts == 1 && use_similar == 0 && use_magic_sets == 1)) { continue; diff --git a/src/test/dl_util.cpp b/src/test/dl_util.cpp index d30b23e47..8c9af0790 100644 --- a/src/test/dl_util.cpp +++ b/src/test/dl_util.cpp @@ -14,14 +14,14 @@ void dl_util_two_array_sort() { unsigned a1[num]; unsigned a2[num]; - for(unsigned i=0; i int_heap2; static void init_values() { - for (unsigned i = 0; i < N; i++) + for (unsigned i = 0; i < N; ++i) g_value[i] = heap_rand(); } @@ -86,7 +86,7 @@ static void dump_heap(const int_heap2 & h, std::ostream & out) { static void tst2() { int_heap2 h(N); - for (int i = 0; i < N * 10; i++) { + for (int i = 0; i < N * 10; ++i) { // if (i % 1 == 0) std::cout << "i: " << i << std::endl; if (i % 1000 == 0) std::cout << "i: " << i << std::endl; diff --git a/src/test/horner.cpp b/src/test/horner.cpp index a953d84f2..f798a5843 100644 --- a/src/test/horner.cpp +++ b/src/test/horner.cpp @@ -150,7 +150,7 @@ void test_horner_high_degree() { // Test higher degree polynomial: p(x) = x^5 + x^4 + x^3 + x^2 + x + 1 vector coeffs; - for (int i = 0; i <= 5; i++) { + for (int i = 0; i <= 5; ++i) { coeffs.push_back(rational(1)); } diff --git a/src/test/interval.cpp b/src/test/interval.cpp index 289265949..42bc5e8b0 100644 --- a/src/test/interval.cpp +++ b/src/test/interval.cpp @@ -235,7 +235,7 @@ static void tst_ ## NAME(unsigned N, unsigned magnitude) { \ interval_manager im(rl, nm); \ interval a, b, r; \ \ - for (unsigned i = 0; i < N; i++) { \ + for (unsigned i = 0; i < N; ++i) { \ mk_random_interval(im, a, magnitude); \ mk_random_interval(im, b, magnitude); \ interval_deps_combine_rule deps; \ @@ -256,7 +256,7 @@ static void tst_neg(unsigned N, unsigned magnitude) { interval_manager im(rl, nm); interval a, b, r; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { mk_random_interval(im, a, magnitude); interval_deps_combine_rule deps; im.neg(a, r, deps); @@ -271,7 +271,7 @@ static void tst_pw_2(unsigned N, unsigned magnitude) { interval_manager im(rl, nm); interval a, b, r; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { mk_random_interval(im, a, magnitude); interval_deps_combine_rule deps; im.power(a, 2, r, deps); @@ -286,7 +286,7 @@ static void tst_pw_3(unsigned N, unsigned magnitude) { interval_manager im(rl, nm); interval a, b, r; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { mk_random_interval(im, a, magnitude); interval_deps_combine_rule deps; im.power(a, 3, r, deps); @@ -343,7 +343,7 @@ static void tst_inv(unsigned N, unsigned magnitude) { interval_manager im(rl, nm); interval a, b, r; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { while (true) { mk_random_interval(im, a, magnitude); if (!im.contains_zero(a)) @@ -362,7 +362,7 @@ static void tst_div(unsigned N, unsigned magnitude) { interval_manager im(rl, nm); interval a, b, r; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { mk_random_interval(im, a, magnitude); while (true) { mk_random_interval(im, b, magnitude); @@ -418,7 +418,7 @@ void tst_pi() { unsynch_mpq_manager nm; interval_manager im(rl, nm); interval r; - for (unsigned i = 0; i < 8; i++) { + for (unsigned i = 0; i < 8; ++i) { im.pi(i, r); nm.display_decimal(std::cout, im.lower(r), 32); std::cout << " "; nm.display_decimal(std::cout, im.upper(r), 32); std::cout << "\n"; @@ -437,7 +437,7 @@ static void tst_pi_float() { interval_manager > im(rl, ifc); scoped_mpq q(qm); im_float_config::interval r; - for (unsigned i = 0; i < 8; i++) { + for (unsigned i = 0; i < 8; ++i) { im.pi(i, r); fm.to_rational(im.lower(r), q); qm.display_decimal(std::cout, q, 32); std::cout << " "; diff --git a/src/test/lp/argument_parser.h b/src/test/lp/argument_parser.h index 12ab02831..323d5d874 100644 --- a/src/test/lp/argument_parser.h +++ b/src/test/lp/argument_parser.h @@ -37,7 +37,7 @@ class argument_parser { public: std::string m_error_message; argument_parser(unsigned argn, char * const* args) { - for (unsigned i = 0; i < argn; i++) { + for (unsigned i = 0; i < argn; ++i) { m_args.push_back(std::string(args[i])); } } @@ -61,7 +61,7 @@ public: bool parse() { bool status_is_ok = true; - for (unsigned i = 0; i < m_args.size(); i++) { + for (unsigned i = 0; i < m_args.size(); ++i) { std::string ar = m_args[i]; if (m_options.find(ar) != m_options.end() ) m_used_options.insert(ar); diff --git a/src/test/lp/gomory_test.h b/src/test/lp/gomory_test.h index 6d909b907..7d8ab6bfe 100644 --- a/src/test/lp/gomory_test.h +++ b/src/test/lp/gomory_test.h @@ -158,7 +158,7 @@ struct gomory_test { TRACE(gomory_cut_detail, tout << "pol.size() > 1" << std::endl;); lcm_den = lcm(lcm_den, denominator(k)); TRACE(gomory_cut_detail, tout << "k: " << k << " lcm_den: " << lcm_den << "\n"; - for (unsigned i = 0; i < pol.size(); i++) { + for (unsigned i = 0; i < pol.size(); ++i) { tout << pol[i].first << " " << pol[i].second << "\n"; } tout << "k: " << k << "\n";); @@ -172,7 +172,7 @@ struct gomory_test { k *= lcm_den; } TRACE(gomory_cut_detail, tout << "after *lcm\n"; - for (unsigned i = 0; i < pol.size(); i++) { + for (unsigned i = 0; i < pol.size(); ++i) { tout << pol[i].first << " * v" << pol[i].second << "\n"; } tout << "k: " << k << "\n";); diff --git a/src/test/lp/lp.cpp b/src/test/lp/lp.cpp index aa3941cb7..ef58d308a 100644 --- a/src/test/lp/lp.cpp +++ b/src/test/lp/lp.cpp @@ -61,7 +61,7 @@ void test_patching(); bool my_white_space(const char &a) { return a == ' ' || a == '\t'; } size_t number_of_whites(const std::string &s) { size_t i = 0; - for (; i < s.size(); i++) + for (; i < s.size(); ++i) if (!my_white_space(s[i])) return i; return i; @@ -144,7 +144,7 @@ void test_nex_order() { enable_trace("nla_test"); nex_creator r; r.set_number_of_vars(3); - for (unsigned j = 0; j < r.get_number_of_vars(); j++) + for (unsigned j = 0; j < r.get_number_of_vars(); ++j) r.set_var_weight(j, 10 - j); nex_var *a = r.mk_var(0); nex_var *b = r.mk_var(1); @@ -197,7 +197,7 @@ void test_simplify() { enable_trace("nla_test"); r.set_number_of_vars(3); - for (unsigned j = 0; j < r.get_number_of_vars(); j++) + for (unsigned j = 0; j < r.get_number_of_vars(); ++j) r.set_var_weight(j, j); nex_var *a = r.mk_var(0); nex_var *b = r.mk_var(1); @@ -277,7 +277,7 @@ void test_cn_shorter() { // // enable_trace("nla_cn_details_"); // enable_trace("nla_test_details"); // cr.set_number_of_vars(20); - // for (unsigned j = 0; j < cr.get_number_of_vars(); j++) + // for (unsigned j = 0; j < cr.get_number_of_vars(); ++j) // cr.set_var_weight(j,j); // nex_var* a = cr.mk_var(0); @@ -320,7 +320,7 @@ void test_cn() { // // enable_trace("nla_cn"); // // enable_trace("nla_test_details"); // cr.set_number_of_vars(20); - // for (unsigned j = 0; j < cr.get_number_of_vars(); j++) + // for (unsigned j = 0; j < cr.get_number_of_vars(); ++j) // cr.set_var_weight(j, j); // nex_var* a = cr.mk_var(0); @@ -389,7 +389,7 @@ void init_basic_part_of_basis_heading(vector &basis, vector &basis_heading) { SASSERT(basis_heading.size() >= basis.size()); unsigned m = basis.size(); - for (unsigned i = 0; i < m; i++) { + for (unsigned i = 0; i < m; ++i) { unsigned column = basis[i]; basis_heading[column] = i; } @@ -643,7 +643,7 @@ char *find_home_dir() { template void print_chunk(T *arr, unsigned len) { - for (unsigned i = 0; i < len; i++) { + for (unsigned i = 0; i < len; ++i) { std::cout << arr[i] << ", "; } std::cout << std::endl; @@ -1096,20 +1096,20 @@ void test_rationals_no_numeric_pairs() { stopwatch sw; vector c; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) c.push_back(mpq(my_random() % 100, 1 + my_random() % 100)); vector x; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) x.push_back(mpq(my_random() % 100, 1 + my_random() % 100)); unsigned k = 500000; mpq r = zero_of_type(); sw.start(); - for (unsigned j = 0; j < k; j++) { + for (unsigned j = 0; j < k; ++j) { mpq val = zero_of_type(); - for (unsigned j = 0; j < c.size(); j++) { + for (unsigned j = 0; j < c.size(); ++j) { val += c[j] * x[j]; } @@ -1126,20 +1126,20 @@ void test_rationals_no_numeric_pairs_plus() { stopwatch sw; vector c; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) c.push_back(mpq(my_random() % 100, 1 + my_random() % 100)); vector x; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) x.push_back(mpq(my_random() % 100, 1 + my_random() % 100)); unsigned k = 500000; mpq r = zero_of_type(); sw.start(); - for (unsigned j = 0; j < k; j++) { + for (unsigned j = 0; j < k; ++j) { mpq val = zero_of_type(); - for (unsigned j = 0; j < c.size(); j++) { + for (unsigned j = 0; j < c.size(); ++j) { val = val + c[j] * x[j]; } @@ -1156,11 +1156,11 @@ void test_rationals() { stopwatch sw; vector c; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) c.push_back(rational(my_random() % 100, 1 + my_random() % 100)); vector> x; - for (unsigned j = 0; j < 10; j++) + for (unsigned j = 0; j < 10; ++j) x.push_back(numeric_pair( rational(my_random() % 100, 1 + my_random() % 100))); @@ -1171,8 +1171,8 @@ void test_rationals() { numeric_pair r = zero_of_type>(); sw.start(); - for (unsigned j = 0; j < k; j++) { - for (unsigned i = 0; i < c.size(); i++) { + for (unsigned j = 0; j < k; ++j) { + for (unsigned i = 0; i < c.size(); ++i) { r += c[i] * x[i]; } } @@ -1427,8 +1427,8 @@ void cutting_the_mix_example_1() { void fill_general_matrix(general_matrix &M) { unsigned m = M.row_count(); unsigned n = M.column_count(); - for (unsigned i = 0; i < m; i++) - for (unsigned j = 0; j < n; j++) + for (unsigned i = 0; i < m; ++i) + for (unsigned j = 0; j < n; ++j) M[i][j] = mpq(static_cast(my_random() % 13) - 6); } @@ -1724,7 +1724,7 @@ void test_hnf() { test_hnf_5_5(); test_hnf_2_2(); for (unsigned k = 1000; k > 0; k--) - for (int i = 1; i < 8; i++) + for (int i = 1; i < 8; ++i) test_hnf_for_dim(i); cutting_the_mix_example_1(); // test_hnf_m_less_than_n(); @@ -2009,7 +2009,7 @@ void test_patching() { // repeat the test 100 times int range = 40; - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 100; ++i) { int a1; int a2 = std::max((int)rand() % range, (int)range / 3); diff --git a/src/test/lp/nla_solver_test.cpp b/src/test/lp/nla_solver_test.cpp index ab66bfb7b..1ec8fe8fa 100644 --- a/src/test/lp/nla_solver_test.cpp +++ b/src/test/lp/nla_solver_test.cpp @@ -22,7 +22,7 @@ namespace nla { svector get_monic(int monic_size, int var_bound, random_gen& rand) { svector v; - for (int i = 0; i < monic_size; i++) { + for (int i = 0; i < monic_size; ++i) { lpvar j = rand() % var_bound; v.push_back(j); } @@ -48,7 +48,7 @@ void test_monics_on_setup(int n_of_monics , var_eqs & var_eqs, emonics& ms, random_gen & rand) { int i; - for ( i = 0; i < n_of_monics; i++) { + for ( i = 0; i < n_of_monics; ++i) { int size = min_monic_size + rand() % (max_monic_size - min_monic_size); ms.add(n_of_vars + i, get_monic(size, n_of_vars, rand)); } @@ -56,7 +56,7 @@ void test_monics_on_setup(int n_of_monics , ms.add(n_of_vars + i, ms[n_of_vars + i - 1].vars()); int eqs_left = number_of_eqs; int add_max_var = 4; - for (int i = 0; i < number_of_pushes; i++) { + for (int i = 0; i < number_of_pushes; ++i) { ms.push(); if (eqs_left > 0) { if( i < number_of_pushes - 1) { @@ -620,7 +620,7 @@ void test_order_lemma_params(bool var_equiv, int sign) { lpvar lp_abef = s.add_named_var(abef, true, "abef"); lpvar lp_cdij = s.add_named_var(cdij, true, "cdij"); - for (unsigned j = 0; j < s.number_of_vars(); j++) { + for (unsigned j = 0; j < s.number_of_vars(); ++j) { s_set_column_value_test(s, j, rational(j + 2)); } @@ -752,7 +752,7 @@ void test_monotone_lemma() { lpvar lp_cd = s.add_named_var(cd, true, "cd"); lpvar lp_ef = s.add_named_var(ef, true, "ef"); lpvar lp_ij = s.add_named_var(ij, true, "ij"); - for (unsigned j = 0; j < s.number_of_vars(); j++) { + for (unsigned j = 0; j < s.number_of_vars(); ++j) { s_set_column_value_test(s, j, rational((j + 2)*(j + 2))); } @@ -871,7 +871,7 @@ void test_tangent_lemma_equiv() { // lpvar lp_j = s.add_named_var(j, true, "j"); lpvar lp_ab = s.add_named_var(ab, true, "ab"); int sign = 1; - for (unsigned j = 0; j < s.number_of_vars(); j++) { + for (unsigned j = 0; j < s.number_of_vars(); ++j) { sign *= -1; s_set_column_value_test(s, j, sign * rational((j + 2) * (j + 2))); } diff --git a/src/test/main.cpp b/src/test/main.cpp index 0af83844d..063ef31d3 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -23,7 +23,7 @@ void tst_##MODULE(); \ if (do_display_usage) \ std::cout << " " << #MODULE << "\n"; \ - for (int i = 0; i < argc; i++) \ + for (int i = 0; i < argc; ++i) \ if (test_all || strcmp(argv[i], #MODULE) == 0) { \ enable_debug(#MODULE); \ timeit timeit(true, s.c_str()); \ @@ -38,7 +38,7 @@ void tst_##MODULE(char** argv, int argc, int& i); \ if (do_display_usage) \ std::cout << " " << #MODULE << "(...)\n"; \ - for (int i = 0; i < argc; i++) \ + for (int i = 0; i < argc; ++i) \ if (strcmp(argv[i], #MODULE) == 0) { \ enable_trace(#MODULE); \ enable_debug(#MODULE); \ diff --git a/src/test/matcher.cpp b/src/test/matcher.cpp index 1d1c517fe..c1839b2ba 100644 --- a/src/test/matcher.cpp +++ b/src/test/matcher.cpp @@ -42,7 +42,7 @@ void tst_match(ast_manager & m, app * t, app * i) { std::cout << "Are the arguments of " << mk_pp(i, m) << " an instance of the arguments of " << mk_pp(t, m) << "\n"; unsigned num_args = t->get_num_args(); unsigned j; - for (j = 0; j < num_args; j++) { + for (j = 0; j < num_args; ++j) { if (!match(t->get_arg(j), i->get_arg(j), s)) break; } diff --git a/src/test/mpff.cpp b/src/test/mpff.cpp index 0fcdb27b3..cb4ae3930 100644 --- a/src/test/mpff.cpp +++ b/src/test/mpff.cpp @@ -32,7 +32,7 @@ static void tst1() { m.set(b, -33); std::cout << "a: " << a << ", b: " << b << "\n"; std::cout << "a*b: " << a*b << "\n"; - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { a = a*a; std::cout << i << ": " << a << "\n"; } @@ -155,7 +155,7 @@ MK_BIN_OP(div); #define MK_BIN_RANDOM_TST(OP) \ static void tst_ ## OP(unsigned N, unsigned max, unsigned prec = 2, bool is_div = false) { \ - for (unsigned i = 0; i < N; i++) { \ + for (unsigned i = 0; i < N; ++i) { \ int n1 = rand() % max; \ int d1 = rand() % max + 1; \ int n2 = rand() % max; \ @@ -250,7 +250,7 @@ static void tst_set64(unsigned N, unsigned prec) { ENSURE(fm.is_uint64(a)); ENSURE(!fm.is_int64(a)); - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { { uint64_t v = (static_cast(rand()) << 32) + static_cast(rand()); fm.set(a, v); @@ -281,14 +281,14 @@ static void tst_capacity(unsigned prec = 2) { mpff_manager m(prec); scoped_mpff_vector v(m); scoped_mpff a(m); - for (unsigned i = 0; i < 50000; i++) { + for (unsigned i = 0; i < 50000; ++i) { m.set(a, i); v.push_back(a); ENSURE(m.is_int(v.back())); ENSURE(m.is_int64(v.back())); ENSURE(m.is_uint64(v.back())); } - for (unsigned i = 0; i < 50000; i++) { + for (unsigned i = 0; i < 50000; ++i) { ENSURE(m.get_int64(v[i]) == i); } } @@ -486,7 +486,7 @@ static void tst_limits(unsigned prec) { ENSURE(!m.is_plus_epsilon(a)); ENSURE(m.is_minus_epsilon(a)); - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { m.set_rounding(i == 0); m.set_plus_epsilon(a); diff --git a/src/test/mpq.cpp b/src/test/mpq.cpp index 6c15c8556..dccd03ccb 100644 --- a/src/test/mpq.cpp +++ b/src/test/mpq.cpp @@ -70,7 +70,7 @@ static void mk_random_num_str(unsigned buffer_sz, char * buffer) { div_pos++; } ENSURE(sz < buffer_sz); - for (unsigned i = 0; i < sz-1; i++) { + for (unsigned i = 0; i < sz-1; ++i) { if (i == div_pos && i < sz-2) { buffer[i] = '/'; i++; diff --git a/src/test/mpz.cpp b/src/test/mpz.cpp index f628b884c..fc102c572 100644 --- a/src/test/mpz.cpp +++ b/src/test/mpz.cpp @@ -82,7 +82,7 @@ static void tst2b() { static void mk_random_num_str(unsigned buffer_sz, char * buffer) { unsigned sz = (rand() % (buffer_sz-2)) + 1; ENSURE(sz < buffer_sz); - for (unsigned i = 0; i < sz-1; i++) { + for (unsigned i = 0; i < sz-1; ++i) { buffer[i] = '0' + (rand() % 10); } if (rand() % 2 == 0) @@ -328,7 +328,7 @@ unsigned g_primes[NUM_PRIMES] = { 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41 void mk_big_num(unsynch_mpz_manager & m, unsigned ratio, unsigned max_pw, mpz & r) { scoped_mpz tmp(m); m.set(r, 1); - for (unsigned i = 0; i < NUM_PRIMES; i++) { + for (unsigned i = 0; i < NUM_PRIMES; ++i) { if ((rand() % ratio) == 0) { m.power(mpz(g_primes[i]), (rand() % max_pw) + 1, tmp); m.mul(r, tmp, r); @@ -370,7 +370,7 @@ void rand_tst_gcd(unsigned num, unsigned ratio, unsigned pw) { scoped_mpz g1(m); scoped_mpz g2(m); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { mk_big_num(m, ratio, pw, a); mk_big_num(m, ratio, pw, b); slow_gcd(m, a, b, g1); @@ -398,7 +398,7 @@ void tst_gcd() { std::cout << "g: " << m.to_string(g) << "\n"; m.set(a, "664877781119188360263909568610284290708591605105963082581413244598320881431041311468785283029437655134762231312337924555674674176"); m.set(b, "21691055098083293041646678174999125628463716392747356050705870375852789453851926624107939885328471215366825649627326658281728580399051770334114658498352848410853519374962852431831492868108719406669605254329669417322836882756478295264"); - for (unsigned i = 0; i < 50000; i++) { + for (unsigned i = 0; i < 50000; ++i) { m.del(g); m.gcd(a, b, g); // slow_gcd(m, a, b, g); @@ -428,13 +428,13 @@ void tst_log2(unsynch_mpz_manager & m, mpz const & a) { void tst_log2() { unsynch_mpz_manager m; - for (unsigned i = 0; i <= 64; i++) + for (unsigned i = 0; i <= 64; ++i) std::cout << "log2(" << i << "): " << m.log2(mpz(i)) << "\n"; - for (unsigned i = 0; i < 1000; i++) + for (unsigned i = 0; i < 1000; ++i) tst_log2(m, mpz(i)); scoped_mpz a(m); m.set(a, "1029489380487098723984579237"); - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { m.inc(a); tst_log2(m, a); } @@ -498,7 +498,7 @@ static void tst5() { static void tst_pw2() { unsynch_mpz_manager m; scoped_mpz a(m); - for (unsigned i = 0; i < 128; i++) { + for (unsigned i = 0; i < 128; ++i) { m.power(mpz(2), i, a); std::cout << "i: " << i << ", a: " << a << std::endl; } diff --git a/src/test/nlsat.cpp b/src/test/nlsat.cpp index 3715bf69d..35e9278ce 100644 --- a/src/test/nlsat.cpp +++ b/src/test/nlsat.cpp @@ -195,7 +195,7 @@ static nlsat::interval_set_ref mk_random(nlsat::interval_set_manager & ism, anum prev = next; } - for (int i = 0; i < tries; i++) { + for (int i = 0; i < tries; ++i) { int l = prev + (gen() % space); int u = l + (gen() % space); bool lower_open = gen() % 2 == 0; @@ -231,7 +231,7 @@ static void check_subset_result(nlsat::interval_set_ref const & s1, ptr_vector clauses; ism.get_justifications(r, lits, clauses); ENSURE(lits.size() <= 2); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { tmp = ism.get_interval(r, i); ism.get_justifications(tmp, lits, clauses); ENSURE(lits.size() == 1); @@ -257,14 +257,14 @@ static void tst4() { nlsat::literal l1(1, false); nlsat::literal l2(2, false); - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { s1 = mk_random(ism, am, 20, 3, 10, true, true, l1); s2 = mk_random(ism, am, 20, 3, 10, true, true, l2); r = tst_interval(s1, s2, 0, false); check_subset_result(s1, s2, r, l1, l2); } - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { s1 = mk_random(ism, am, 200, 100, 20, true, true, l1); s2 = mk_random(ism, am, 200, 100, 20, true, true, l2); r = tst_interval(s1, s2, 0, false); diff --git a/src/test/object_allocator.cpp b/src/test/object_allocator.cpp index 2ef3c4718..be07424e2 100644 --- a/src/test/object_allocator.cpp +++ b/src/test/object_allocator.cpp @@ -75,7 +75,7 @@ static void tst2() { vector > object_coeff_pairs; unsigned num_resets = 0; - for (unsigned i = 0; i < 100000; i++) { + for (unsigned i = 0; i < 100000; ++i) { unsigned idx = rand() % 6; if (idx < 4) { cell * c; diff --git a/src/test/parray.cpp b/src/test/parray.cpp index eca94cef7..a43a6b336 100644 --- a/src/test/parray.cpp +++ b/src/test/parray.cpp @@ -99,11 +99,11 @@ static void tst2() { int_array a1; int_array a2; - for (unsigned i = 0; i < 100; i++) + for (unsigned i = 0; i < 100; ++i) m.push_back(a1, i); ENSURE(m.size(a1) == 100); m.push_back(a1, 100, a2); - for (unsigned i = 0; i < 10; i++) + for (unsigned i = 0; i < 10; ++i) m.push_back(a2, i+101); TRACE(parray, m.display_info(tout, a1); tout << "\n"; @@ -112,10 +112,10 @@ static void tst2() { TRACE(parray, m.display_info(tout, a1); tout << "\n"; m.display_info(tout, a2); tout << "\n";); - for (unsigned i = 0; i < m.size(a1); i++) { + for (unsigned i = 0; i < m.size(a1); ++i) { ENSURE(static_cast(m.get(a1, i)) == i); } - for (unsigned i = 0; i < m.size(a2); i++) { + for (unsigned i = 0; i < m.size(a2); ++i) { ENSURE(static_cast(m.get(a2, i)) == i); } TRACE(parray, @@ -144,11 +144,11 @@ static void tst3() { int_array a3; int_array a4; - for (unsigned i = 0; i < 20; i++) + for (unsigned i = 0; i < 20; ++i) m.push_back(a1, i); ENSURE(m.size(a1) == 20); m.set(a1, 0, 1, a2); - for (unsigned i = 1; i < 20; i++) { + for (unsigned i = 1; i < 20; ++i) { if (i == 6) { m.copy(a2, a3); m.pop_back(a3); @@ -161,7 +161,7 @@ static void tst3() { m.pop_back(a4); m.push_back(a4, 30); - for (unsigned i = 0; i < 20; i++) { + for (unsigned i = 0; i < 20; ++i) { ENSURE(static_cast(m.get(a2, i)) == i+1); } TRACE(parray, @@ -182,7 +182,7 @@ static void tst3() { ENSURE(m.size(a2) == 20); ENSURE(m.size(a3) == 19); ENSURE(m.size(a4) == 19); - for (unsigned i = 0; i < 20; i++) { + for (unsigned i = 0; i < 20; ++i) { ENSURE(static_cast(m.get(a1, i)) == i); ENSURE(static_cast(m.get(a2, i)) == i+1); ENSURE(i >= 18 || static_cast(m.get(a4, i)) == i+1); @@ -282,7 +282,7 @@ static void tst5() { expr_array a2; m.mk(a1); - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { m.push_back(a1, m.mk_var(i, m.mk_bool_sort())); } @@ -291,7 +291,7 @@ static void tst5() { m.copy(a1, a2); - for (unsigned i = 0; i < 1000000; i++) { + for (unsigned i = 0; i < 1000000; ++i) { m.set(a1, i % 100, m.mk_var(rand() % 100, m.mk_bool_sort())); } diff --git a/src/test/pdd.cpp b/src/test/pdd.cpp index 740ae4f2b..fb31d44d5 100644 --- a/src/test/pdd.cpp +++ b/src/test/pdd.cpp @@ -95,7 +95,7 @@ public: pdd d = m.mk_var(3); pdd e = a + c; - for (unsigned i = 0; i < 5; i++) { + for (unsigned i = 0; i < 5; ++i) { e = e * e; } e = e * b; diff --git a/src/test/permutation.cpp b/src/test/permutation.cpp index aeaa5a235..9e6a2d671 100644 --- a/src/test/permutation.cpp +++ b/src/test/permutation.cpp @@ -44,7 +44,7 @@ static void test_move_after() { } void apply_permutation_copy(unsigned sz, unsigned const * src, unsigned const * p, unsigned * target) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { target[i] = src[p[i]]; } } @@ -57,16 +57,16 @@ static void test_apply_permutation(unsigned sz, unsigned num_tries, unsigned max p.resize(sz); new_data.resize(sz); random_gen g; - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) p[i] = i; // fill data with random numbers - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) data[i] = g() % max; for (unsigned k = 0; k < num_tries; k ++) { shuffle(p.size(), p.data(), g); apply_permutation_copy(sz, data.data(), p.data(), new_data.data()); apply_permutation(sz, data.data(), p.data()); - for (unsigned i = 0; i < 0; i++) + for (unsigned i = 0; i < 0; ++i) ENSURE(data[i] == new_data[i]); } } diff --git a/src/test/polynomial.cpp b/src/test/polynomial.cpp index 320c3e929..adea1521a 100644 --- a/src/test/polynomial.cpp +++ b/src/test/polynomial.cpp @@ -708,7 +708,7 @@ static void tst_psc(polynomial_ref const & p, polynomial_ref const & q, polynomi std::cout << "q: " << q << std::endl; m.psc_chain(p, q, x, S); unsigned sz = S.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { std::cout << "S_" << i << ": " << polynomial_ref(S.get(i), m) << std::endl; } if (sz > 0) { @@ -733,7 +733,7 @@ static void tst_psc_perf(polynomial_ref const & p, polynomial_ref const & q, pol std::cout << "q: " << q << std::endl; m.psc_chain(p, q, x, S); unsigned sz = S.size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { std::cout << "S_" << i << ": " << m.size(S.get(i)) << std::endl; // polynomial_ref(S.get(i), m) << std::endl; } } @@ -840,14 +840,14 @@ static void tst_vars(polynomial_ref const & p, unsigned sz, polynomial::var * xs p.m().vars(p, r); std::cout << "---------------\n"; std::cout << "p: " << p << "\nvars: "; - for (unsigned i = 0; i < r.size(); i++) { + for (unsigned i = 0; i < r.size(); ++i) { std::cout << r[i] << " "; } std::cout << std::endl; ENSURE(r.size() == sz); std::sort(r.begin(), r.end()); std::sort(xs, xs + sz); - for (unsigned i = 0; i < r.size(); i++) { + for (unsigned i = 0; i < r.size(); ++i) { ENSURE(r[i] == xs[i]); } } @@ -1022,7 +1022,7 @@ void tst_mfact(polynomial_ref const & p, unsigned num_distinct_factors) { factor(p, fs); std::cout << "factors:\n"; std::cout << p.m().m().to_string(fs.get_constant()) << "\n"; - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { std::cout << "*(" << fs[i] << ")^" << fs.get_degree(i) << std::endl; } ENSURE(fs.distinct_factors() == num_distinct_factors); @@ -1571,7 +1571,7 @@ static void tst_gcd2() { // polynomial_ref p1(m); // p1 = derivative(p, 0); // polynomial_ref g(m); - // for (unsigned i = 0; i < 50; i++) + // for (unsigned i = 0; i < 50; ++i) // g = gcd(p, p1); // return; diff --git a/src/test/polynomial_factorization.cpp b/src/test/polynomial_factorization.cpp index 5efab2cd9..273dc34d9 100644 --- a/src/test/polynomial_factorization.cpp +++ b/src/test/polynomial_factorization.cpp @@ -133,7 +133,7 @@ void test_factorization_repeated_factors() { // Check that factor has degree 3 (meaning (x-1)^3) unsigned total_degree = 0; - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { total_degree += m.degree(fs[i]) * fs.get_degree(i); } VERIFY(total_degree == 3); @@ -338,7 +338,7 @@ void test_factorization_large_multivariate_missing_factors() { factors fs(m); factor(p, fs); VERIFY(fs.distinct_factors() == 2); // indeed there are 3 factors, that is demonstrated by the loop - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { polynomial_ref f(m); f = fs[i]; if (degree(f, x1)<= 1) continue; diff --git a/src/test/prime_generator.cpp b/src/test/prime_generator.cpp index a60418777..554d2b644 100644 --- a/src/test/prime_generator.cpp +++ b/src/test/prime_generator.cpp @@ -26,7 +26,7 @@ void tst_prime_generator() { prime_generator gen; gen.initialize(); - for (unsigned i = 0; i < 10000; i++) { + for (unsigned i = 0; i < 10000; ++i) { uint64_t p = gen(i); std::cout << p << ", "; if (i % 11 == 0) std::cout << "\n"; @@ -36,7 +36,7 @@ void tst_prime_generator() { m.set(sqrt_p, p); m.root(sqrt_p, 2); uint64_t k = m.get_uint64(sqrt_p); - for (uint64_t i = 2; i <= k; i++) { + for (uint64_t i = 2; i <= k; ++i) { ENSURE(p % i != 0); } } diff --git a/src/test/random.cpp b/src/test/random.cpp index a1b7c35fa..ee235c4b5 100644 --- a/src/test/random.cpp +++ b/src/test/random.cpp @@ -23,7 +23,7 @@ Revision History: static void tst1() { random_gen r(0); TRACE(random, - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { tout << r() << "\n"; }); } diff --git a/src/test/rational.cpp b/src/test/rational.cpp index 2b4220414..8e17d0f98 100644 --- a/src/test/rational.cpp +++ b/src/test/rational.cpp @@ -288,7 +288,7 @@ public: static void tst2() { tst_hash(0); - for (int i = 0; i <= 10000; i++) { + for (int i = 0; i <= 10000; ++i) { int r = rand() % INT_MAX; if (rand()%2 == 1) r = -r; tst_hash(r); @@ -299,7 +299,7 @@ public: static void tst7() { rational p; p = power(rational(2), 32); - for (unsigned i = 1; i < 1000; i++) { + for (unsigned i = 1; i < 1000; ++i) { rational n(i); rational x; rational y; @@ -396,7 +396,7 @@ static void tst10(bool use_ints) { vals.resize(NUM_RATIONALS); vals2.resize(NUM_RATIONALS); fvals.resize(NUM_RATIONALS); - for (unsigned i = 0; i < NUM_RATIONALS; i++) { + for (unsigned i = 0; i < NUM_RATIONALS; ++i) { int r1 = rand() % MAGNITUDE; int r2 = use_ints ? 1 : rand() % MAGNITUDE; if (r2 == 0) r2 = 1; @@ -407,13 +407,13 @@ static void tst10(bool use_ints) { } { timeit t(true, "multiplication with rationals"); - for (unsigned i = 0; i < NUM_RATIONALS - 1; i++) { + for (unsigned i = 0; i < NUM_RATIONALS - 1; ++i) { vals[i] *= vals[i+1]; } } { timeit t(true, "multiplication with floats: "); - for (unsigned i = 0; i < NUM_RATIONALS - 1; i++) { + for (unsigned i = 0; i < NUM_RATIONALS - 1; ++i) { fvals[i] *= fvals[i+1]; } } @@ -428,7 +428,7 @@ static void tst11(bool use_ints) { vector fvals; vals.resize(NUM_RATIONALS2); fvals.resize(NUM_RATIONALS2); - for (unsigned i = 0; i < NUM_RATIONALS2; i++) { + for (unsigned i = 0; i < NUM_RATIONALS2; ++i) { int r1 = rand() % MAGNITUDE2; int r2 = use_ints ? 1 : rand() % MAGNITUDE2; if (r2 == 0) r2 = 1; @@ -438,15 +438,15 @@ static void tst11(bool use_ints) { } { timeit t(true, "multiplication with big rationals"); - for (unsigned j = 0; j < 10; j++) - for (unsigned i = 0; i < NUM_RATIONALS2-1; i++) { + for (unsigned j = 0; j < 10; ++j) + for (unsigned i = 0; i < NUM_RATIONALS2-1; ++i) { vals[i] *= vals[i+1]; } } { timeit t(true, "multiplication with floats: "); - for (unsigned j = 0; j < 10; j++) - for (unsigned i = 0; i < NUM_RATIONALS2-1; i++) { + for (unsigned j = 0; j < 10; ++j) + for (unsigned i = 0; i < NUM_RATIONALS2-1; ++i) { fvals[i] *= fvals[i+1]; } } diff --git a/src/test/rcf.cpp b/src/test/rcf.cpp index c9fdc49b7..a96280f49 100644 --- a/src/test/rcf.cpp +++ b/src/test/rcf.cpp @@ -89,7 +89,7 @@ static void tst2() { int b[3]; int c[3] = { 10, -2, 8 }; std::cout << "solve: " << mm.solve(A, b, c) << "\n"; - for (unsigned i = 0; i < 3; i++) std::cout << b[i] << " "; + for (unsigned i = 0; i < 3; ++i) std::cout << b[i] << " "; std::cout << "\n"; } scoped_mpz_matrix A2(mm); @@ -111,14 +111,14 @@ static void tst_solve(unsigned n, int _A[], int _b[], int _c[], bool solved) { mpz_matrix_manager mm(nm, allocator); scoped_mpz_matrix A(mm); mm.mk(n, n, A); - for (unsigned i = 0; i < n; i++) - for (unsigned j = 0; j < n; j++) + for (unsigned i = 0; i < n; ++i) + for (unsigned j = 0; j < n; ++j) A.set(i, j, _A[i*n + j]); svector b; b.resize(n, 0); if (mm.solve(A, b.data(), _c)) { ENSURE(solved); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { ENSURE(b[i] == _b[i]); } } @@ -133,14 +133,14 @@ static void tst_lin_indep(unsigned m, unsigned n, int _A[], unsigned ex_sz, unsi mpz_matrix_manager mm(nm, allocator); scoped_mpz_matrix A(mm); mm.mk(m, n, A); - for (unsigned i = 0; i < m; i++) - for (unsigned j = 0; j < n; j++) + for (unsigned i = 0; i < m; ++i) + for (unsigned j = 0; j < n; ++j) A.set(i, j, _A[i*n + j]); unsigned_vector r; r.resize(A.n()); scoped_mpz_matrix B(mm); mm.linear_independent_rows(A, r.data(), B); - for (unsigned i = 0; i < ex_sz; i++) { + for (unsigned i = 0; i < ex_sz; ++i) { ENSURE(r[i] == ex_r[i]); } } diff --git a/src/test/sat_lookahead.cpp b/src/test/sat_lookahead.cpp index 24dd7e919..da7d83220 100644 --- a/src/test/sat_lookahead.cpp +++ b/src/test/sat_lookahead.cpp @@ -6,7 +6,7 @@ #include static void display_model(sat::model const & m) { - for (unsigned i = 1; i < m.size(); i++) { + for (unsigned i = 1; i < m.size(); ++i) { switch (m[i]) { case l_false: std::cout << "-" << i << " "; break; case l_undef: break; diff --git a/src/test/stack.cpp b/src/test/stack.cpp index ddd2f85e9..a5667dc49 100644 --- a/src/test/stack.cpp +++ b/src/test/stack.cpp @@ -37,7 +37,7 @@ static void tst1() { static void tst2(unsigned num, unsigned del_rate) { ptr_vector ptrs; stack s; - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { ENSURE(ptrs.empty() == s.empty()); ENSURE(s.empty() || ptrs.back() == s.top()); if (!ptrs.empty() && rand() % del_rate == 0) { diff --git a/src/test/string_buffer.cpp b/src/test/string_buffer.cpp index 26fff29a2..17645f393 100644 --- a/src/test/string_buffer.cpp +++ b/src/test/string_buffer.cpp @@ -29,7 +29,7 @@ static void tst1() { static void tst2() { string_buffer<> b; - for (unsigned i = 0; i < 10000; i++) { + for (unsigned i = 0; i < 10000; ++i) { int r = rand() % 10; b << r; } diff --git a/src/test/total_order.cpp b/src/test/total_order.cpp index 5f4ffbcad..99c54fb8d 100644 --- a/src/test/total_order.cpp +++ b/src/test/total_order.cpp @@ -40,7 +40,7 @@ static void tst2() { to.insert(1); to.insert_after(1, 2); to.insert_after(2, 3); - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { to.move_after(3, 1); to.move_after(1, 2); to.move_after(2, 3); @@ -52,10 +52,10 @@ static void tst2() { static void tst3(unsigned sz, unsigned num_rounds) { uint_total_order to; to.insert(0); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { to.insert_after(i, i+1); } - for (unsigned i = 0; i < num_rounds; i++) { + for (unsigned i = 0; i < num_rounds; ++i) { unsigned v1 = rand() % sz; unsigned v2 = rand() % sz; if (v1 != v2) @@ -78,7 +78,7 @@ void move_after(unsigned_vector & v, unsigned_vector & inv_v, unsigned a, unsign unsigned pos_b = inv_v[b]; ENSURE(pos_a != pos_b); if (pos_b < pos_a) { - for (unsigned i = pos_b; i < pos_a; i++) { + for (unsigned i = pos_b; i < pos_a; ++i) { v[i] = v[i+1]; inv_v[v[i+1]] = i; } @@ -106,19 +106,19 @@ static void tst4(unsigned sz, unsigned num_rounds) { to.insert(0); v.push_back(0); inv_v.push_back(0); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { to.insert_after(i, i+1); v.push_back(i+1); inv_v.push_back(i+1); } - for (unsigned i = 0; i < num_rounds; i++) { + for (unsigned i = 0; i < num_rounds; ++i) { unsigned v1 = rand() % sz; unsigned v2 = rand() % sz; if (v1 != v2) { to.move_after(v1, v2); move_after(v, inv_v, v1, v2); } - for (unsigned k = 0; k < sz - 1; k++) { + for (unsigned k = 0; k < sz - 1; ++k) { ENSURE(inv_v[v[k]] == k); ENSURE(to.lt(v[k], v[k+1])); } @@ -133,12 +133,12 @@ static void tst4(unsigned sz, unsigned num_rounds) { static void bad_case(unsigned sz, unsigned num_rounds) { uint_total_order to; to.insert(0); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { to.insert_after(i, i+1); } - for (unsigned i = 0; i < num_rounds; i++) { + for (unsigned i = 0; i < num_rounds; ++i) { to.move_after(sz, 0); - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { to.move_after(j, j+1); } if (i % 10 == 0) { diff --git a/src/test/trigo.cpp b/src/test/trigo.cpp index 3a3426ba6..61acb149d 100644 --- a/src/test/trigo.cpp +++ b/src/test/trigo.cpp @@ -45,7 +45,7 @@ static void tst_sine(std::ostream & out, unsigned N, unsigned k) { scoped_mpq a(nm); nm.set(a, 0); tst_sine_core(out, nm, im, a, 1); - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { nm.set(a, 4 * (rand() % PREC), PREC); if (rand() % 2 == 0) nm.neg(a); @@ -71,7 +71,7 @@ static void tst_cosine(std::ostream & out, unsigned N, unsigned k) { scoped_mpq a(nm); nm.set(a, 0); tst_cosine_core(out, nm, im, a, 1); - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { nm.set(a, 4 * (rand() % PREC), PREC); if (rand() % 2 == 0) nm.neg(a); @@ -111,7 +111,7 @@ static void tst_float_sine(std::ostream & out, unsigned N, unsigned k) { // fm.set(a, EBITS, SBITS, MPF_ROUND_TOWARD_POSITIVE, 25336, 100000); // tst_float_sine_core(out, fm, im, a, k); // return; - for (unsigned i = 0; i < N; i++) { + for (unsigned i = 0; i < N; ++i) { unsigned n = 4 * (rand() % PREC); unsigned d = PREC; TRACE(sine, tout << "next-val : " << n << "/" << d << "\n";); @@ -140,7 +140,7 @@ static void tst_e(std::ostream & out) { unsynch_mpq_manager nm; interval_manager im(rl, nm); im_default_config::interval r; - for (unsigned i = 0; i < 64; i++) { + for (unsigned i = 0; i < 64; ++i) { im.e(i, r); out << nm.to_string(im.lower(r)) << " <= E\n"; out << "E <= " << nm.to_string(im.upper(r)) << "\n"; @@ -156,7 +156,7 @@ static void tst_e_float(std::ostream & out) { interval_manager > im(rl, fm); scoped_mpq q(qm); im_float_config::interval r; - for (unsigned i = 0; i < 64; i++) { + for (unsigned i = 0; i < 64; ++i) { im.e(i, r); out << fm.to_rational_string(im.lower(r)) << " <= E\n"; out << "E <= " << fm.to_rational_string(im.upper(r)) << "\n"; diff --git a/src/test/uint_set.cpp b/src/test/uint_set.cpp index f0c170860..d498fb6b5 100644 --- a/src/test/uint_set.cpp +++ b/src/test/uint_set.cpp @@ -27,7 +27,7 @@ static void tst1(unsigned n) { unsigned size = 0; unsigned num_op = rand()%1000; - for (unsigned i = 0; i < num_op; i++) { + for (unsigned i = 0; i < num_op; ++i) { unsigned op = rand()%3; if (op < 2) { unsigned idx = rand() % n; @@ -47,7 +47,7 @@ static void tst1(unsigned n) { } ENSURE(s1.num_elems() == size); ENSURE((size == 0) == s1.empty()); - for (unsigned idx = 0; idx < n; idx++) { + for (unsigned idx = 0; idx < n; ++idx) { ENSURE(s2[idx] == s1.contains(idx)); } } @@ -60,7 +60,7 @@ static void tst2(unsigned n) { s.insert(val); ENSURE(!s.empty()); ENSURE(s.num_elems() == 1); - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { unsigned val2 = rand()%n; if (val != val2) { ENSURE(!s.contains(val2)); @@ -113,7 +113,7 @@ static void tst3(unsigned n) { ENSURE(s2.subset_of(s4)); ENSURE(s4.subset_of(s2)); ENSURE(s2 != s3); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { uint_set s5; s5.insert(i); ENSURE(s1.contains(i) == s5.subset_of(s1)); @@ -159,11 +159,11 @@ static void tst5() { } void tst_uint_set() { - for (unsigned i = 0; i < 100; i++) { + for (unsigned i = 0; i < 100; ++i) { tst1(1 + rand()%31); tst1(1 + rand()%100); } - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { tst2(1); tst2(10); tst2(31); diff --git a/src/test/upolynomial.cpp b/src/test/upolynomial.cpp index d6a643a65..ec3192f46 100644 --- a/src/test/upolynomial.cpp +++ b/src/test/upolynomial.cpp @@ -41,12 +41,12 @@ static void tst1() { // display coefficients of q std::cout << "expanded q: "; - for (unsigned i = 0; i < q.size(); i++) + for (unsigned i = 0; i < q.size(); ++i) std::cout << nm.to_string(q[i]) << " "; std::cout << "\n"; // traverse coefficients of q adding 1 - for (unsigned i = 0; i < q.size(); i++) { + for (unsigned i = 0; i < q.size(); ++i) { nm.add(q[i], mpz(1), q[i]); } // All operations in upolynomial::manager assume the leading coefficient of q is not zero. @@ -104,7 +104,7 @@ static void tst_isolate_roots(polynomial_ref const & p, unsigned prec, mpbq_mana std::cout << "sign var(+oo): " << um.sign_variations_at_plus_inf(sseq) << "\n"; ENSURE(roots.size() + lowers.size() == um.sign_variations_at_minus_inf(sseq) - um.sign_variations_at_plus_inf(sseq)); std::cout << "roots:"; - for (unsigned i = 0; i < roots.size(); i++) { + for (unsigned i = 0; i < roots.size(); ++i) { ENSURE(um.eval_sign_at(q.size(), q.data(), roots[i]) == 0); std::cout << " "; bqm.display_decimal(std::cout, roots[i], prec); } @@ -112,7 +112,7 @@ static void tst_isolate_roots(polynomial_ref const & p, unsigned prec, mpbq_mana timeit timer(true, "interval check"); std::cout << "\n"; std::cout << "intervals:"; - for (unsigned i = 0; i < lowers.size(); i++) { + for (unsigned i = 0; i < lowers.size(); ++i) { std::cout << " ("; bqm.display_decimal(std::cout, lowers[i], prec); std::cout << ", "; @@ -159,10 +159,10 @@ static void check_roots(mpbq_vector const & roots, mpbq_vector const & lowers, m ENSURE(expected_sz == roots.size() + lowers.size()); bool_vector visited; visited.resize(expected_sz, false); - for (unsigned i = 0; i < expected_sz; i++) { + for (unsigned i = 0; i < expected_sz; ++i) { rational const & r = expected_roots[i]; bool found = false; - for (unsigned j = 0; j < roots.size(); j++) { + for (unsigned j = 0; j < roots.size(); ++j) { if (to_rational(roots[j]) == r) { ENSURE(!visited[j]); VERIFY(!found); @@ -170,7 +170,7 @@ static void check_roots(mpbq_vector const & roots, mpbq_vector const & lowers, m visited[j] = true; } } - for (unsigned j = 0; j < lowers.size(); j++) { + for (unsigned j = 0; j < lowers.size(); ++j) { unsigned j_prime = j + roots.size(); if (to_rational(lowers[j]) < r && r < to_rational(uppers[j])) { VERIFY(!found); @@ -889,7 +889,7 @@ static void tst_fact(polynomial_ref const & p, unsigned num_distinct_factors, up um.factor(_p, fs, params); std::cout << "factors:\n"; std::cout << um.m().to_string(fs.get_constant()) << "\n"; - for (unsigned i = 0; i < fs.distinct_factors(); i++) { + for (unsigned i = 0; i < fs.distinct_factors(); ++i) { std::cout << "*("; um.display(std::cout, fs[i]); std::cout << ")^" << fs.get_degree(i) << std::endl; } std::cout << fs.distinct_factors() << " " << num_distinct_factors << "\n"; diff --git a/src/test/var_subst.cpp b/src/test/var_subst.cpp index 90bc95056..36d5e8f03 100644 --- a/src/test/var_subst.cpp +++ b/src/test/var_subst.cpp @@ -49,7 +49,7 @@ void tst_instantiate(ast_manager & m, expr * f) { quantifier * q = find_quantifier(f); if (q) { expr_ref_vector cnsts(m); - for (unsigned i = 0; i < q->get_num_decls(); i++) + for (unsigned i = 0; i < q->get_num_decls(); ++i) cnsts.push_back(m.mk_fresh_const("a", q->get_decl_sort(i))); expr_ref r = instantiate(m, q, cnsts.data()); TRACE(var_subst, tout << "quantifier:\n" << mk_pp(q, m) << "\nresult:\n" << mk_pp(r, m) << "\n";); diff --git a/src/test/vector.cpp b/src/test/vector.cpp index c9bf5a75a..7a13558a2 100644 --- a/src/test/vector.cpp +++ b/src/test/vector.cpp @@ -22,13 +22,13 @@ Revision History: static void tst1() { svector v1; ENSURE(v1.empty()); - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { v1.push_back(i + 3); ENSURE(static_cast(v1[i]) == i + 3); ENSURE(v1.capacity() >= v1.size()); ENSURE(!v1.empty()); } - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { ENSURE(static_cast(v1[i]) == i + 3); } svector::iterator it = v1.begin(); @@ -36,7 +36,7 @@ static void tst1() { for (int i = 0; it != end; ++it, ++i) { ENSURE(*it == i + 3); } - for (unsigned i = 0; i < 1000; i++) { + for (unsigned i = 0; i < 1000; ++i) { ENSURE(static_cast(v1.back()) == 1000 - i - 1 + 3); ENSURE(v1.size() == 1000 - i); v1.pop_back(); diff --git a/src/test/zstring.cpp b/src/test/zstring.cpp index e77aac15c..6f1ea90be 100644 --- a/src/test/zstring.cpp +++ b/src/test/zstring.cpp @@ -8,7 +8,7 @@ static void tst_ascii_roundtrip() { unsigned ascii_min = 0x20; // ' ' unsigned ascii_max = 0x7E; // '~' - for (unsigned i = ascii_min; i <= ascii_max; i++) { + for (unsigned i = ascii_min; i <= ascii_max; ++i) { zstring input(i); std::string expected(1, i); bool roundtrip_ok = input.encode() == expected; diff --git a/src/util/approx_set.cpp b/src/util/approx_set.cpp index 521197137..5c6d73a16 100644 --- a/src/util/approx_set.cpp +++ b/src/util/approx_set.cpp @@ -23,7 +23,7 @@ void approx_set::display(std::ostream & out) const { out << "{"; bool first = true; unsigned long long s = m_set; - for (unsigned i = 0; i < approx_set_traits::capacity; i++) { + for (unsigned i = 0; i < approx_set_traits::capacity; ++i) { if ((s & 1) != 0) { if (first) { first = false; diff --git a/src/util/approx_set.h b/src/util/approx_set.h index 011a8017d..2ef95ce98 100644 --- a/src/util/approx_set.h +++ b/src/util/approx_set.h @@ -59,7 +59,7 @@ public: } approx_set_tpl(unsigned sz, T const * es) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) insert(es[i]); } diff --git a/src/util/bit_util.cpp b/src/util/bit_util.cpp index fdca2dc83..960288177 100644 --- a/src/util/bit_util.cpp +++ b/src/util/bit_util.cpp @@ -113,7 +113,7 @@ unsigned ntz_core(unsigned x) { */ unsigned ntz(unsigned sz, unsigned const * data) { unsigned r = 0; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { unsigned d = data[i]; if (d == 0) r += 32; @@ -133,14 +133,14 @@ void copy(unsigned src_sz, unsigned const * src, unsigned dst_sz, unsigned * dst) { if (dst_sz >= src_sz) { unsigned i; - for (i = 0; i < src_sz; i++) + for (i = 0; i < src_sz; ++i) dst[i] = src[i]; - for (; i < dst_sz; i++) + for (; i < dst_sz; ++i) dst[i] = 0; } else { SASSERT(dst_sz < src_sz); - for (unsigned i = 0; i < dst_sz; i++) + for (unsigned i = 0; i < dst_sz; ++i) dst[i] = src[i]; } } @@ -149,7 +149,7 @@ void copy(unsigned src_sz, unsigned const * src, \brief Return true if all words of data are zero. */ bool is_zero(unsigned sz, unsigned const * data) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) if (data[i]) return false; return true; @@ -159,7 +159,7 @@ bool is_zero(unsigned sz, unsigned const * data) { \brief Set all words of data to zero. */ void reset(unsigned sz, unsigned * data) { - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) data[i] = 0; } @@ -189,7 +189,7 @@ void shl(unsigned src_sz, unsigned const * src, unsigned k, i = dst_sz; } else if (i < dst_sz) { - for (unsigned r = i; r < dst_sz; r++) + for (unsigned r = i; r < dst_sz; ++r) dst[r] = 0; } while (j > 0) { @@ -203,7 +203,7 @@ void shl(unsigned src_sz, unsigned const * src, unsigned k, if (bit_shift > 0) { unsigned comp_shift = (8 * sizeof(unsigned)) - bit_shift; unsigned prev = 0; - for (unsigned i = word_shift; i < dst_sz; i++) { + for (unsigned i = word_shift; i < dst_sz; ++i) { unsigned new_prev = (dst[i] >> comp_shift); dst[i] <<= bit_shift; dst[i] |= prev; @@ -216,7 +216,7 @@ void shl(unsigned src_sz, unsigned const * src, unsigned k, unsigned prev = 0; if (src_sz > dst_sz) src_sz = dst_sz; - for (unsigned i = 0; i < src_sz; i++) { + for (unsigned i = 0; i < src_sz; ++i) { unsigned new_prev = (src[i] >> comp_shift); dst[i] = src[i]; dst[i] <<= bit_shift; @@ -225,7 +225,7 @@ void shl(unsigned src_sz, unsigned const * src, unsigned k, } if (dst_sz > src_sz) { dst[src_sz] = prev; - for (unsigned i = src_sz+1; i < dst_sz; i++) + for (unsigned i = src_sz+1; i < dst_sz; ++i) dst[i] = 0; } } @@ -252,7 +252,7 @@ void shr(unsigned sz, unsigned const * src, unsigned k, unsigned * dst) { unsigned i = 0; unsigned j = digit_shift; if (bit_shift != 0) { - for (; i < new_sz - 1; i++, j++) { + for (; i < new_sz - 1; ++i, ++j) { dst[i] = src[j]; dst[i] >>= bit_shift; dst[i] |= (src[j+1] << comp_shift); @@ -261,18 +261,18 @@ void shr(unsigned sz, unsigned const * src, unsigned k, unsigned * dst) { dst[i] >>= bit_shift; } else { - for (; i < new_sz; i++, j++) { + for (; i < new_sz; ++i, ++j) { dst[i] = src[j]; } } - for (unsigned i = new_sz; i < sz; i++) + for (unsigned i = new_sz; i < sz; ++i) dst[i] = 0; } else { SASSERT(new_sz == sz); SASSERT(bit_shift != 0); unsigned i = 0; - for (; i < new_sz - 1; i++) { + for (; i < new_sz - 1; ++i) { dst[i] = src[i]; dst[i] >>= bit_shift; dst[i] |= (src[i+1] << comp_shift); @@ -298,7 +298,7 @@ void shr(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, uns unsigned sz = new_sz; if (new_sz > dst_sz) sz = dst_sz; - for (; i < sz - 1; i++, j++) { + for (; i < sz - 1; ++i, ++j) { dst[i] = src[j]; dst[i] >>= bit_shift; dst[i] |= (src[j+1] << comp_shift); @@ -311,7 +311,7 @@ void shr(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, uns else { if (new_sz > dst_sz) new_sz = dst_sz; - for (; i < new_sz; i++, j++) { + for (; i < new_sz; ++i, ++j) { dst[i] = src[j]; } } @@ -323,7 +323,7 @@ void shr(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, uns if (new_sz > dst_sz) sz = dst_sz; unsigned i = 0; - for (; i < sz - 1; i++) { + for (; i < sz - 1; ++i) { dst[i] = src[i]; dst[i] >>= bit_shift; dst[i] |= (src[i+1] << comp_shift); @@ -333,7 +333,7 @@ void shr(unsigned src_sz, unsigned const * src, unsigned k, unsigned dst_sz, uns if (new_sz > dst_sz) dst[i] |= (src[i+1] << comp_shift); } - for (unsigned i = new_sz; i < dst_sz; i++) + for (unsigned i = new_sz; i < dst_sz; ++i) dst[i] = 0; } @@ -345,7 +345,7 @@ bool has_one_at_first_k_bits(unsigned sz, unsigned const * data, unsigned k) { unsigned word_sz = k / (8 * sizeof(unsigned)); if (word_sz > sz) word_sz = sz; - for (unsigned i = 0; i < word_sz; i++) { + for (unsigned i = 0; i < word_sz; ++i) { if (data[i] != 0) return true; } @@ -358,7 +358,7 @@ bool has_one_at_first_k_bits(unsigned sz, unsigned const * data, unsigned k) { } bool inc(unsigned sz, unsigned * data) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { data[i]++; if (data[i] != 0) return true; // no overflow @@ -367,7 +367,7 @@ bool inc(unsigned sz, unsigned * data) { } bool dec(unsigned sz, unsigned * data) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { data[i]--; if (data[i] != UINT_MAX) return true; // no underflow @@ -389,7 +389,7 @@ bool lt(unsigned sz, unsigned * data1, unsigned * data2) { bool add(unsigned sz, unsigned const * a, unsigned const * b, unsigned * c) { unsigned k = 0; - for (unsigned j = 0; j < sz; j++) { + for (unsigned j = 0; j < sz; ++j) { unsigned r = a[j] + b[j]; bool c1 = r < a[j]; c[j] = r + k; diff --git a/src/util/bit_vector.cpp b/src/util/bit_vector.cpp index 831700dbb..41113f127 100644 --- a/src/util/bit_vector.cpp +++ b/src/util/bit_vector.cpp @@ -102,13 +102,13 @@ void bit_vector::shift_right(unsigned k) { } if (bit_shift > 0) { DEBUG_CODE({ - for (unsigned i = 0; i < word_shift; i++) { + for (unsigned i = 0; i < word_shift; ++i) { SASSERT(m_data[i] == 0); } }); unsigned comp_shift = (8 * sizeof(unsigned)) - bit_shift; unsigned prev = 0; - for (unsigned i = word_shift; i < new_num_words; i++) { + for (unsigned i = word_shift; i < new_num_words; ++i) { unsigned new_prev = (m_data[i] >> comp_shift); m_data[i] <<= bit_shift; m_data[i] |= prev; @@ -124,7 +124,7 @@ bool bit_vector::operator==(bit_vector const & source) const { if (n == 0) return true; unsigned i; - for (i = 0; i < n - 1; i++) { + for (i = 0; i < n - 1; ++i) { if (m_data[i] != source.m_data[i]) return false; } @@ -142,12 +142,12 @@ bit_vector & bit_vector::operator|=(bit_vector const & source) { unsigned bit_rest = source.m_num_bits % 32; if (bit_rest == 0) { unsigned i = 0; - for (i = 0; i < n2; i++) + for (i = 0; i < n2; ++i) m_data[i] |= source.m_data[i]; } else { unsigned i = 0; - for (i = 0; i < n2 - 1; i++) + for (i = 0; i < n2 - 1; ++i) m_data[i] |= source.m_data[i]; unsigned mask = MK_MASK(bit_rest); m_data[i] |= source.m_data[i] & mask; @@ -161,7 +161,7 @@ bit_vector & bit_vector::operator&=(bit_vector const & source) { if (n1 == 0) return *this; if (n2 > n1) { - for (unsigned i = 0; i < n1; i++) + for (unsigned i = 0; i < n1; ++i) m_data[i] &= source.m_data[i]; } else { @@ -169,17 +169,17 @@ bit_vector & bit_vector::operator&=(bit_vector const & source) { unsigned bit_rest = source.m_num_bits % 32; unsigned i = 0; if (bit_rest == 0) { - for (i = 0; i < n2; i++) + for (i = 0; i < n2; ++i) m_data[i] &= source.m_data[i]; } else { - for (i = 0; i < n2 - 1; i++) + for (i = 0; i < n2 - 1; ++i) m_data[i] &= source.m_data[i]; unsigned mask = MK_MASK(bit_rest); m_data[i] &= (source.m_data[i] & mask); } - for (i = n2; i < n1; i++) + for (i = n2; i < n1; ++i) m_data[i] = 0; } return *this; @@ -196,7 +196,7 @@ void bit_vector::display(std::ostream & out) const { out << "0"; } #else - for (unsigned i = 0; i < m_num_bits; i++) { + for (unsigned i = 0; i < m_num_bits; ++i) { if (get(i)) out << "1"; else diff --git a/src/util/buffer.h b/src/util/buffer.h index b71717fe6..c36aa03bb 100644 --- a/src/util/buffer.h +++ b/src/util/buffer.h @@ -97,7 +97,7 @@ public: } buffer(unsigned sz, const T & elem) { - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { push_back(elem); } SASSERT(size() == sz); @@ -193,7 +193,7 @@ public: } void append(unsigned n, T const * elems) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { push_back(elems[i]); } } @@ -230,12 +230,12 @@ public: void resize(unsigned nsz, const T & elem=T()) { unsigned sz = size(); if (nsz > sz) { - for (unsigned i = sz; i < nsz; i++) { + for (unsigned i = sz; i < nsz; ++i) { push_back(elem); } } else if (nsz < sz) { - for (unsigned i = nsz; i < sz; i++) { + for (unsigned i = nsz; i < sz; ++i) { pop_back(); } } @@ -245,7 +245,7 @@ public: void shrink(unsigned nsz) { unsigned sz = size(); SASSERT(nsz <= sz); - for (unsigned i = nsz; i < sz; i++) + for (unsigned i = nsz; i < sz; ++i) pop_back(); SASSERT(size() == nsz); } @@ -266,7 +266,7 @@ template class ptr_buffer : public buffer { public: void append(unsigned n, T * const * elems) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { this->push_back(elems[i]); } } diff --git a/src/util/chashtable.h b/src/util/chashtable.h index 4e11619f7..5d4e4caa6 100644 --- a/src/util/chashtable.h +++ b/src/util/chashtable.h @@ -130,7 +130,7 @@ protected: } #if 0 TRACE(chashtable, - for (unsigned i = 0; i < source_capacity; i++) { + for (unsigned i = 0; i < source_capacity; ++i) { tout << i << ":["; if (source[i].m_next == 0) tout << "null"; @@ -141,7 +141,7 @@ protected: tout << ", " << source[i].m_data << "]\n"; } tout << "\n"; - for (unsigned i = 0; i < target_capacity; i++) { + for (unsigned i = 0; i < target_capacity; ++i) { tout << i << ":["; if (target[i].m_next == 0) tout << "null"; diff --git a/src/util/container_util.h b/src/util/container_util.h index b4319f24f..185737fe1 100644 --- a/src/util/container_util.h +++ b/src/util/container_util.h @@ -102,7 +102,7 @@ void print_map(const T & cont, std::ostream & out) { template unsigned find_index(const It & begin, const It & end, const V & val) { It it = begin; - for (unsigned idx = 0; it != end; it++, idx++) { + for (unsigned idx = 0; it != end; ++it, ++idx) { if (*it == val) { return idx; } diff --git a/src/util/dependency.h b/src/util/dependency.h index 6094cc555..5837e575b 100644 --- a/src/util/dependency.h +++ b/src/util/dependency.h @@ -56,7 +56,7 @@ public: vs.push_back(to_leaf(d)->m_value); } else { - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { dependency* child = to_join(d)->m_children[i]; if (!child->is_marked()) { todo.push_back(child); @@ -125,7 +125,7 @@ private: m_allocator.deallocate(sizeof(leaf), to_leaf(d)); } else { - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { dependency * c = to_join(d)->m_children[i]; SASSERT(c->m_ref_count > 0); c->m_ref_count--; @@ -208,7 +208,7 @@ public: } } else { - for (unsigned i = 0; i < 2; i++) { + for (unsigned i = 0; i < 2; ++i) { dependency * child = to_join(d)->m_children[i]; if (!child->is_marked()) { m_todo.push_back(child); diff --git a/src/util/fixed_bit_vector.cpp b/src/util/fixed_bit_vector.cpp index 732f37acb..2a2d013a9 100644 --- a/src/util/fixed_bit_vector.cpp +++ b/src/util/fixed_bit_vector.cpp @@ -100,21 +100,21 @@ fixed_bit_vector_manager::fill1(fixed_bit_vector& bv) const { fixed_bit_vector& fixed_bit_vector_manager::set_and(fixed_bit_vector& dst, fixed_bit_vector const& src) const { - for (unsigned i = 0; i < m_num_words; i++) + for (unsigned i = 0; i < m_num_words; ++i) dst.m_data[i] &= src.m_data[i]; return dst; } fixed_bit_vector& fixed_bit_vector_manager::set_or(fixed_bit_vector& dst, fixed_bit_vector const& src) const { - for (unsigned i = 0; i < m_num_words; i++) + for (unsigned i = 0; i < m_num_words; ++i) dst.m_data[i] |= src.m_data[i]; return dst; } fixed_bit_vector& fixed_bit_vector_manager::set_neg(fixed_bit_vector& dst) const { - for (unsigned i = 0; i < m_num_words; i++) + for (unsigned i = 0; i < m_num_words; ++i) dst.m_data[i] = ~dst.m_data[i]; return dst; } @@ -130,7 +130,7 @@ bool fixed_bit_vector_manager::equals(fixed_bit_vector const& a, fixed_bit_vecto unsigned n = num_words(); if (n == 0) return true; - for (unsigned i = 0; i < n - 1; i++) { + for (unsigned i = 0; i < n - 1; ++i) { if (a.m_data[i] != b.m_data[i]) return false; } diff --git a/src/util/gparams.cpp b/src/util/gparams.cpp index 7a81e000c..33afb5af6 100644 --- a/src/util/gparams.cpp +++ b/src/util/gparams.cpp @@ -236,13 +236,13 @@ public: name++; std::string tmp = name; unsigned n = static_cast(tmp.size()); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (tmp[i] >= 'A' && tmp[i] <= 'Z') tmp[i] = tmp[i] - 'A' + 'a'; else if (tmp[i] == '-') tmp[i] = '_'; } - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (tmp[i] == '.') { param_name = tmp.c_str() + i + 1; tmp.resize(i); diff --git a/src/util/mpbq.cpp b/src/util/mpbq.cpp index 2622dd140..494686649 100644 --- a/src/util/mpbq.cpp +++ b/src/util/mpbq.cpp @@ -443,7 +443,7 @@ std::ostream& mpbq_manager::display_decimal(std::ostream & out, mpbq const & a, SASSERT(!m_manager.is_zero(n1)); out << m_manager.to_string(v1); out << "."; - for (unsigned i = 0; i < prec; i++) { + for (unsigned i = 0; i < prec; ++i) { m_manager.mul(n1, ten, n1); m_manager.div(n1, two_k, v1); m_manager.rem(n1, two_k, n1); @@ -487,7 +487,7 @@ std::ostream& mpbq_manager::display_decimal(std::ostream & out, mpbq const & a, if (m_manager.is_zero(n1) && m_manager.is_zero(n2)) goto end; // number is an integer out << "."; - for (unsigned i = 0; i < prec; i++) { + for (unsigned i = 0; i < prec; ++i) { m_manager.mul(n1, ten, n1); m_manager.mul(n2, ten, n2); m_manager.div(n1, two_k1, v1); diff --git a/src/util/mpf.cpp b/src/util/mpf.cpp index 0071843f4..39941bdd3 100644 --- a/src/util/mpf.cpp +++ b/src/util/mpf.cpp @@ -1197,7 +1197,7 @@ void mpf_manager::to_sbv_mpq(mpf_rounding_mode rm, const mpf & x, scoped_mpq & o mpf_exp_t e = (mpf_exp_t)t.exponent() - t.sbits() + 1; if (e < 0) { bool last = m_mpz_manager.is_odd(z), round = false, sticky = false; - for (; e != 0; e++) { + for (; e != 0; ++e) { m_mpz_manager.machine_div2k(z, 1); sticky |= round; round = last; @@ -1662,7 +1662,7 @@ std::string mpf_manager::to_string_binary(mpf const & x, unsigned upper_extra, u } std::string tmp_str = ""; - for (unsigned i = 0; i < x.ebits; i++) { + for (unsigned i = 0; i < x.ebits; ++i) { tmp_str += m_mpz_manager.is_odd(tmp) ? "1" : "0"; tmp /= 2; } @@ -1672,7 +1672,7 @@ std::string mpf_manager::to_string_binary(mpf const & x, unsigned upper_extra, u tmp_str = ""; m_mpz_manager.set(tmp, sig(x)); unsigned num_bits = upper_extra + x.sbits + lower_extra; - for (unsigned i = 0; i < num_bits || !tmp.is_zero(); i++) { + for (unsigned i = 0; i < num_bits || !tmp.is_zero(); ++i) { tmp_str += m_mpz_manager.is_odd(tmp) ? "1" : "0"; tmp /= 2; if (i == lower_extra - 1) diff --git a/src/util/mpff.cpp b/src/util/mpff.cpp index c55e69c19..a0851bad6 100644 --- a/src/util/mpff.cpp +++ b/src/util/mpff.cpp @@ -40,7 +40,7 @@ mpff_manager::mpff_manager(unsigned prec, unsigned initial_capacity) { m_capacity = initial_capacity; m_to_plus_inf = false; m_significands.resize(initial_capacity * prec, 0); - for (unsigned i = 0; i < MPFF_NUM_BUFFERS; i++) + for (unsigned i = 0; i < MPFF_NUM_BUFFERS; ++i) m_buffers[i].resize(2 * prec, 0); // Reserve space for zero VERIFY(m_id_gen.mk() == 0); @@ -63,7 +63,7 @@ void mpff_manager::allocate(mpff & n) { n.m_sig_idx = sig_idx; DEBUG_CODE({ unsigned * s = sig(n); - for (unsigned i = 0; i < m_precision; i++) { + for (unsigned i = 0; i < m_precision; ++i) { SASSERT(s[i] == 0); } }); @@ -73,7 +73,7 @@ void mpff_manager::to_buffer(unsigned idx, mpff const & n) const { SASSERT(idx < MPFF_NUM_BUFFERS); svector & b = const_cast(this)->m_buffers[idx]; unsigned * s = sig(n); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) b[i] = s[i]; } @@ -82,7 +82,7 @@ void mpff_manager::to_buffer_ext(unsigned idx, mpff const & n) const { svector & b = const_cast(this)->m_buffers[idx]; unsigned * s = sig(n); unsigned j = m_precision; - for (unsigned i = 0; i < m_precision; i++, j++) { + for (unsigned i = 0; i < m_precision; ++i, ++j) { b[i] = s[i]; b[j] = 0; } @@ -93,7 +93,7 @@ void mpff_manager::to_buffer_shifting(unsigned idx, mpff const & n) const { svector & b = const_cast(this)->m_buffers[idx]; unsigned * s = sig(n); unsigned j = m_precision; - for (unsigned i = 0; i < m_precision; i++, j++) { + for (unsigned i = 0; i < m_precision; ++i, ++j) { b[i] = 0; b[j] = s[i]; } @@ -104,7 +104,7 @@ void mpff_manager::del(mpff & n) { if (sig_idx != 0) { m_id_gen.recycle(sig_idx); unsigned * s = sig(n); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) s[i] = 0; } } @@ -192,7 +192,7 @@ bool mpff_manager::is_abs_one(mpff const & n) const { unsigned * s = sig(n); if (s[m_precision - 1] != 0x80000000u) return false; - for (unsigned i = 0; i < m_precision - 1; i++) + for (unsigned i = 0; i < m_precision - 1; ++i) if (s[i] != 0) return false; return true; @@ -209,7 +209,7 @@ bool mpff_manager::is_two(mpff const & n) const { unsigned * s = sig(n); if (s[m_precision - 1] != 0x80000000u) return false; - for (unsigned i = 0; i < m_precision - 1; i++) + for (unsigned i = 0; i < m_precision - 1; ++i) if (s[i] != 0) return false; return true; @@ -243,7 +243,7 @@ void mpff_manager::set(mpff & n, unsigned v) { v <<= num_leading_zeros; unsigned * s = sig(n); s[m_precision - 1] = v; - for (unsigned i = 0; i < m_precision - 1; i++) + for (unsigned i = 0; i < m_precision - 1; ++i) s[i] = 0; } SASSERT(check(n)); @@ -284,7 +284,7 @@ void mpff_manager::set(mpff & n, uint64_t v) { unsigned * s = sig(n); s[m_precision-1] = _v[1]; s[m_precision-2] = _v[0]; - for (unsigned i = 0; i < m_precision - 2; i++) + for (unsigned i = 0; i < m_precision - 2; ++i) s[i] = 0; } SASSERT(check(n)); @@ -319,7 +319,7 @@ void mpff_manager::set(mpff & n, mpff const & v) { n.m_exponent = v.m_exponent; unsigned * s1 = sig(n); unsigned * s2 = sig(v); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) s1[i] = s2[i]; SASSERT(check(n)); } @@ -342,7 +342,7 @@ void mpff_manager::set_core(mpff & n, mpz_manager & m, mpz const & v) { while (w.size() < m_precision) { w.push_back(0); } - TRACE(mpff, tout << "w words: "; for (unsigned i = 0; i < w.size(); i++) tout << w[i] << " "; tout << "\n";); + TRACE(mpff, tout << "w words: "; for (unsigned i = 0; i < w.size(); ++i) tout << w[i] << " "; tout << "\n";); unsigned w_sz = w.size(); SASSERT(w_sz >= m_precision); unsigned num_leading_zeros = nlz(w_sz, w.data()); @@ -415,7 +415,7 @@ bool mpff_manager::eq(mpff const & a, mpff const & b) const { return false; unsigned * s1 = sig(a); unsigned * s2 = sig(b); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) if (s1[i] != s2[i]) return false; return true; @@ -500,7 +500,7 @@ void mpff_manager::inc_significand(mpff & a) { void mpff_manager::dec_significand(mpff & a) { SASSERT(!is_minus_epsilon(a) && !is_zero(a) && !is_plus_epsilon(a)); unsigned * s = sig(a); - for (unsigned i = 0; i < m_precision - 1; i++) { + for (unsigned i = 0; i < m_precision - 1; ++i) { s[i]--; if (s[i] != UINT_MAX) return; @@ -530,14 +530,14 @@ void mpff_manager::set_min_significand(mpff & a) { // we have that 0x8000..00 is the minimal significand unsigned * s = sig(a); s[m_precision - 1] = MIN_MSW; - for (unsigned i = 0; i < m_precision - 1; i++) + for (unsigned i = 0; i < m_precision - 1; ++i) s[i] = 0; } void mpff_manager::set_max_significand(mpff & a) { SASSERT(!is_zero(a)); unsigned * s = sig(a); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) s[i] = UINT_MAX; } @@ -713,7 +713,7 @@ void mpff_manager::add_sub(bool is_sub, mpff const & a, mpff const & b, mpff & c if (num_leading_zeros == sizeof(unsigned) * 8) { // no shift is needed c.m_exponent = exp_a; - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) sig_c[i] = sig_r[i]; } else if (num_leading_zeros == sizeof(unsigned) * 8 - 1) { @@ -1036,7 +1036,7 @@ void mpff_manager::power(mpff const & a, unsigned p, mpff & b) { throw overflow_exception(); unsigned * r = sig(b); r[m_precision - 1] = 0x80000000u; - for (unsigned i = 0; i < m_precision - 1; i++) + for (unsigned i = 0; i < m_precision - 1; ++i) r[i] = 0; b.m_exponent = static_cast(exp); } @@ -1247,10 +1247,10 @@ void mpff_manager::display_decimal(std::ostream & out, mpff const & n, unsigned sbuffer buffer; unsigned num_extra_words = 1 + static_cast(exp/word_sz); unsigned shift = word_sz - exp%word_sz; - for (unsigned i = 0; i < num_extra_words; i++) + for (unsigned i = 0; i < num_extra_words; ++i) buffer.push_back(0); unsigned * s = sig(n); - for (unsigned i = 0; i < m_precision; i++) + for (unsigned i = 0; i < m_precision; ++i) buffer.push_back(s[i]); shr(buffer.size(), buffer.data(), shift, buffer.size(), buffer.data()); sbuffer str_buffer(11*buffer.size(), 0); @@ -1264,12 +1264,12 @@ void mpff_manager::display_decimal(std::ostream & out, mpff const & n, unsigned unsigned num_extra_words = m_precision < num_words ? num_words - m_precision : 0; num_extra_words++; unsigned * s = sig(n); - for (unsigned i = 0; i < m_precision; i++) { + for (unsigned i = 0; i < m_precision; ++i) { buffer1.push_back(s[i]); buffer2.push_back(0); buffer3.push_back(0); } - for (unsigned i = 0; i < num_extra_words; i++) { + for (unsigned i = 0; i < num_extra_words; ++i) { buffer1.push_back(0); buffer2.push_back(0); } diff --git a/src/util/mpfx.cpp b/src/util/mpfx.cpp index b25aa4b0c..9e2f0d06f 100644 --- a/src/util/mpfx.cpp +++ b/src/util/mpfx.cpp @@ -76,7 +76,7 @@ void mpfx_manager::del(mpfx & n) { if (sig_idx != 0) { m_id_gen.recycle(sig_idx); unsigned * w = words(n); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w[i] = 0; } } @@ -90,7 +90,7 @@ void mpfx_manager::reset(mpfx & n) { bool mpfx_manager::is_int(mpfx const & n) const { unsigned * w = words(n); - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) if (w[i] != 0) return false; return true; @@ -109,7 +109,7 @@ bool mpfx_manager::is_int64(mpfx const & a) const { unsigned * w = words(a); w += m_frac_part_sz; if (w[1] < 0x80000000u || (w[1] == 0x80000000u && is_neg(a))) { - for (unsigned i = 2; i < m_int_part_sz; i++) + for (unsigned i = 2; i < m_int_part_sz; ++i) if (w[i] != 0) return false; return true; @@ -125,7 +125,7 @@ bool mpfx_manager::is_uint64(mpfx const & a) const { if (is_zero(a) || m_int_part_sz <= 2) return true; unsigned * w = words(a); - for (unsigned i = m_frac_part_sz + 2; i < m_total_sz; i++) + for (unsigned i = m_frac_part_sz + 2; i < m_total_sz; ++i) if (w[i] != 0) return false; return true; @@ -156,7 +156,7 @@ void mpfx_manager::set(mpfx & n, unsigned v) { allocate_if_needed(n); n.m_sign = 0; unsigned * w = words(n); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w[i] = 0; w[m_frac_part_sz] = v; } @@ -204,7 +204,7 @@ void mpfx_manager::set(mpfx & n, uint64_t v) { uint64_t * _vp = &v; unsigned * _v = nullptr; memcpy(&_v, &_vp, sizeof(unsigned*)); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w[i] = 0; w[m_frac_part_sz] = _v[0]; if (m_int_part_sz == 1) { @@ -244,7 +244,7 @@ void mpfx_manager::set(mpfx & n, mpfx const & v) { n.m_sign = v.m_sign; unsigned * w1 = words(n); unsigned * w2 = words(v); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w1[i] = w2[i]; SASSERT(check(n)); } @@ -262,7 +262,7 @@ void mpfx_manager::set_core(mpfx & n, mpz_manager & m, mpz const & v) { if (sz > m_int_part_sz) throw overflow_exception(); unsigned * w = words(n); - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) w[i] = 0; ::copy(sz, m_tmp_digits.data(), m_int_part_sz, w + m_frac_part_sz); } @@ -327,7 +327,7 @@ bool mpfx_manager::eq(mpfx const & a, mpfx const & b) const { return false; unsigned * w1 = words(a); unsigned * w2 = words(b); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) if (w1[i] != w2[i]) return false; return true; @@ -442,7 +442,7 @@ void mpfx_manager::mul(mpfx const & a, mpfx const & b, mpfx & c) { throw overflow_exception(); // copy result to c unsigned * w_c = words(c); - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w_c[i] = _r[i]; } STRACE(mpfx_trace, display(tout, c); tout << "\n";); @@ -463,9 +463,9 @@ void mpfx_manager::div(mpfx const & a, mpfx const & b, mpfx & c) { unsigned * w_a_shft = m_buffer0.data(); unsigned a_shft_sz = sz(w_a) + m_frac_part_sz; // copy a to buffer 0, and shift by m_frac_part_sz - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) w_a_shft[i] = 0; - for (unsigned i = 0; i < m_total_sz; i++) + for (unsigned i = 0; i < m_total_sz; ++i) w_a_shft[i+m_frac_part_sz] = w_a[i]; unsigned * w_b = words(b); unsigned b_sz = sz(w_b); @@ -484,7 +484,7 @@ void mpfx_manager::div(mpfx const & a, mpfx const & b, mpfx & c) { w_b, b_sz, w_q, w_r); - for (unsigned i = m_total_sz; i < q_sz; i++) + for (unsigned i = m_total_sz; i < q_sz; ++i) if (w_q[i] != 0) throw overflow_exception(); if (((c.m_sign == 1) != m_to_plus_inf) && !::is_zero(r_sz, w_r)) { @@ -496,16 +496,16 @@ void mpfx_manager::div(mpfx const & a, mpfx const & b, mpfx & c) { bool zero_q = true; if (m_total_sz >= q_sz) { unsigned i; - for (i = 0; i < q_sz; i++) { + for (i = 0; i < q_sz; ++i) { if (w_q[i] != 0) zero_q = false; w_c[i] = w_q[i]; } - for (; i < m_total_sz; i++) + for (; i < m_total_sz; ++i) w_c[i] = 0; } else { - for (unsigned i = 0; i < m_total_sz; i++) { + for (unsigned i = 0; i < m_total_sz; ++i) { if (w_q[i] != 0) zero_q = false; w_c[i] = w_q[i]; @@ -544,7 +544,7 @@ void mpfx_manager::div2k(mpfx & a, unsigned k) { void mpfx_manager::set_epsilon(mpfx & n) { unsigned * w = words(n); w[0] = 1; - for (unsigned i = 1; i < m_total_sz; i++) + for (unsigned i = 1; i < m_total_sz; ++i) w[i] = 0; } @@ -565,7 +565,7 @@ void mpfx_manager::floor(mpfx & n) { unsigned * w = words(n); if (is_neg(n)) { bool is_int = true; - for (unsigned i = 0; i < m_frac_part_sz; i++) { + for (unsigned i = 0; i < m_frac_part_sz; ++i) { if (w[i] != 0) { is_int = false; w[i] = 0; @@ -575,7 +575,7 @@ void mpfx_manager::floor(mpfx & n) { throw overflow_exception(); } else { - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) w[i] = 0; } if (::is_zero(m_int_part_sz, w + m_frac_part_sz)) @@ -589,7 +589,7 @@ void mpfx_manager::ceil(mpfx & n) { unsigned * w = words(n); if (is_pos(n)) { bool is_int = true; - for (unsigned i = 0; i < m_frac_part_sz; i++) { + for (unsigned i = 0; i < m_frac_part_sz; ++i) { if (w[i] != 0) { is_int = false; w[i] = 0; @@ -599,7 +599,7 @@ void mpfx_manager::ceil(mpfx & n) { throw overflow_exception(); } else { - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) w[i] = 0; } if (::is_zero(m_int_part_sz, w + m_frac_part_sz)) @@ -812,7 +812,7 @@ void mpfx_manager::display_smt2(std::ostream & out, mpfx const & n) const { if (!is_int(n)) { out << " "; unsigned * w = m_buffer0.data(); - for (unsigned i = 0; i < m_frac_part_sz; i++) + for (unsigned i = 0; i < m_frac_part_sz; ++i) w[i] = 0; w[m_frac_part_sz] = 1; sbuffer str_buffer2(11*(m_frac_part_sz+1), 0); diff --git a/src/util/mpn.cpp b/src/util/mpn.cpp index 4e38e2d83..f8c38484c 100644 --- a/src/util/mpn.cpp +++ b/src/util/mpn.cpp @@ -57,7 +57,7 @@ bool mpn_manager::add(mpn_digit const * a, unsigned lnga, mpn_digit k = 0; mpn_digit r; bool c1, c2; - for (unsigned j = 0; j < len; j++) { + for (unsigned j = 0; j < len; ++j) { mpn_digit u_j = (j < lnga) ? a[j] : 0; mpn_digit v_j = (j < lngb) ? b[j] : 0; r = u_j + v_j; c1 = r < u_j; @@ -81,7 +81,7 @@ bool mpn_manager::sub(mpn_digit const * a, unsigned lnga, mpn_digit & k = *pborrow; k = 0; mpn_digit r; bool c1, c2; - for (unsigned j = 0; j < len; j++) { + for (unsigned j = 0; j < len; ++j) { mpn_digit u_j = (j < lnga) ? a[j] : 0; mpn_digit v_j = (j < lngb) ? b[j] : 0; r = u_j - v_j; c1 = r > u_j; @@ -104,17 +104,17 @@ bool mpn_manager::mul(mpn_digit const * a, unsigned lnga, #define DIGIT_BITS (sizeof(mpn_digit)*8) #define HALF_BITS (sizeof(mpn_digit)*4) - for (unsigned i = 0; i < lnga; i++) + for (unsigned i = 0; i < lnga; ++i) c[i] = 0; - for (unsigned j = 0; j < lngb; j++) { + for (unsigned j = 0; j < lngb; ++j) { mpn_digit v_j = b[j]; if (v_j == 0) { // This branch may be omitted according to Knuth. c[j+lnga] = 0; } else { k = 0; - for (i = 0; i < lnga; i++) { + for (i = 0; i < lnga; ++i) { mpn_digit u_i = a[i]; mpn_double_digit t; t = ((mpn_double_digit)u_i * (mpn_double_digit)v_j) + @@ -145,9 +145,9 @@ bool mpn_manager::div(mpn_digit const * numer, unsigned lnum, bool res = false; if (lnum < lden) { - for (unsigned i = 0; i < (lnum-lden+1); i++) + for (unsigned i = 0; i < (lnum-lden+1); ++i) quot[i] = 0; - for (unsigned i = 0; i < lden; i++) + for (unsigned i = 0; i < lden; ++i) rem[i] = (i < lnum) ? numer[i] : 0; return false; } @@ -160,7 +160,7 @@ bool mpn_manager::div(mpn_digit const * numer, unsigned lnum, } else if (lnum < lden || (lnum == lden && numer[lnum-1] < denom[lden-1])) { *quot = 0; - for (unsigned i = 0; i < lden; i++) + for (unsigned i = 0; i < lden; ++i) rem[i] = (i < lnum) ? numer[i] : 0; } else { @@ -186,7 +186,7 @@ bool mpn_manager::div(mpn_digit const * numer, unsigned lnum, unsigned real_size; add(temp.data(), lnum, rem, lden, temp.data(), lnum+1, &real_size); bool ok = true; - for (unsigned i = 0; i < lnum && ok; i++) + for (unsigned i = 0; i < lnum && ok; ++i) if (temp[i] != numer[i]) ok = false; if (temp[lnum] != 0) ok = false; CTRACE(mpn_dbg, !ok, tout << "DIV BUG: quot * denom + rem = "; display_raw(tout, temp.data(), lnum+1); tout << std::endl; ); @@ -210,9 +210,9 @@ unsigned mpn_manager::div_normalize(mpn_digit const * numer, unsigned lnum, if (d == 0) { n_numer[lnum] = 0; - for (unsigned i = 0; i < lnum; i++) + for (unsigned i = 0; i < lnum; ++i) n_numer[i] = numer[i]; - for (unsigned i = 0; i < lden; i++) + for (unsigned i = 0; i < lden; ++i) n_denom[i] = denom[i]; } else if (lnum != 0) { @@ -238,11 +238,11 @@ unsigned mpn_manager::div_normalize(mpn_digit const * numer, unsigned lnum, void mpn_manager::div_unnormalize(mpn_sbuffer & numer, mpn_sbuffer & denom, unsigned d, mpn_digit * rem) const { if (d == 0) { - for (unsigned i = 0; i < denom.size(); i++) + for (unsigned i = 0; i < denom.size(); ++i) rem[i] = numer[i]; } else { - for (unsigned i = 0; i < denom.size()-1; i++) + for (unsigned i = 0; i < denom.size()-1; ++i) rem[i] = numer[i] >> d | (LAST_BITS(d, numer[i+1]) << (DIGIT_BITS-d)); rem[denom.size()-1] = numer[denom.size()-1] >> d; } @@ -320,7 +320,7 @@ bool mpn_manager::div_n(mpn_sbuffer & numer, mpn_sbuffer const & denom, ab.resize(n+2); unsigned real_size; add(denom.data(), n, &numer[j], n+1, ab.data(), n+2, &real_size); - for (unsigned i = 0; i < n+1; i++) + for (unsigned i = 0; i < n+1; ++i) numer[j+i] = ab[i]; } TRACE(mpn_div, tout << "q_hat=" << q_hat << " r_hat=" << r_hat; @@ -346,7 +346,7 @@ char * mpn_manager::to_string(mpn_digit const * a, unsigned lng, char * buf, uns } else { mpn_sbuffer temp(lng, 0), t_numer(lng+1, 0), t_denom(1, 0); - for (unsigned i = 0; i < lng; i++) + for (unsigned i = 0; i < lng; ++i) temp[i] = a[i]; unsigned j = 0; @@ -364,7 +364,7 @@ char * mpn_manager::to_string(mpn_digit const * a, unsigned lng, char * buf, uns j--; unsigned mid = (j/2) + ((j % 2) ? 1 : 0); - for (unsigned i = 0; i < mid; i++) + for (unsigned i = 0; i < mid; ++i) std::swap(buf[i], buf[j-i]); } diff --git a/src/util/mpq.cpp b/src/util/mpq.cpp index f5c636a3f..ddc227847 100644 --- a/src/util/mpq.cpp +++ b/src/util/mpq.cpp @@ -108,7 +108,7 @@ void mpq_manager::gcd(unsigned sz, mpq const * as, mpq & g) { break; } gcd(as[0], as[1], g); - for (unsigned i = 2; i < sz; i++) { + for (unsigned i = 2; i < sz; ++i) { if (is_one(g)) return; gcd(g, as[i], g); @@ -164,7 +164,7 @@ void mpq_manager::display_decimal(std::ostream & out, mpq const & a, unsi if (is_zero(n1)) goto end; // number is an integer out << "."; - for (unsigned i = 0; i < prec; i++) { + for (unsigned i = 0; i < prec; ++i) { mul(n1, ten, n1); div(n1, d1, v1); SASSERT(lt(v1, ten)); diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp index 94d95d85c..284c4a15e 100644 --- a/src/util/mpz.cpp +++ b/src/util/mpz.cpp @@ -1187,20 +1187,20 @@ void mpz_manager::gcd(unsigned sz, mpz const * as, mpz & g) { break; } unsigned i; - for (i = 0; i < sz; i++) { + for (i = 0; i < sz; ++i) { if (!is_small(as[i])) break; } if (i != sz) { // array has big numbers sbuffer p; - for (i = 0; i < sz; i++) + for (i = 0; i < sz; ++i) p.push_back(i); sz_lt lt(*this, as); std::sort(p.begin(), p.end(), lt); - TRACE(mpz_gcd, for (unsigned i = 0; i < sz; i++) tout << p[i] << ":" << size_info(as[p[i]]) << " "; tout << "\n";); + TRACE(mpz_gcd, for (unsigned i = 0; i < sz; ++i) tout << p[i] << ":" << size_info(as[p[i]]) << " "; tout << "\n";); gcd(as[p[0]], as[p[1]], g); - for (i = 2; i < sz; i++) { + for (i = 2; i < sz; ++i) { if (is_one(g)) return; gcd(g, as[p[i]], g); @@ -1209,7 +1209,7 @@ void mpz_manager::gcd(unsigned sz, mpz const * as, mpz & g) { } else { gcd(as[0], as[1], g); - for (unsigned i = 2; i < sz; i++) { + for (unsigned i = 2; i < sz; ++i) { if (is_one(g)) return; gcd(g, as[i], g); @@ -1229,7 +1229,7 @@ void mpz_manager::gcd(unsigned sz, mpz const * as, mpz & g) { break; } gcd(as[0], as[1], g); - for (unsigned i = 2; i < sz; i++) { + for (unsigned i = 2; i < sz; ++i) { if (is_one(g)) return; gcd(g, as[i], g); @@ -1687,7 +1687,7 @@ double mpz_manager::get_double(mpz const & a) const { double r = 0.0; double d = 1.0; unsigned sz = size(a); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { r += d * static_cast(digits(a)[i]); if (sizeof(digit_t) == sizeof(uint64_t)) d *= (1.0 + static_cast(UINT64_MAX)); // 64-bit version, multiply by 2^64 @@ -1891,7 +1891,7 @@ void mpz_manager::power(mpz const & a, unsigned p, mpz & b) { allocate_if_needed(b, sz); SASSERT(b.m_ptr->m_capacity >= sz); b.m_ptr->m_size = sz; - for (unsigned i = 0; i < sz - 1; i++) + for (unsigned i = 0; i < sz - 1; ++i) b.m_ptr->m_digits[i] = 0; b.m_ptr->m_digits[sz-1] = 1 << shift; b.m_val = 1; @@ -1947,7 +1947,7 @@ bool mpz_manager::is_power_of_two(mpz const & a, unsigned & shift) { mpz_cell * c = a.m_ptr; unsigned sz = c->m_size; digit_t * ds = c->m_digits; - for (unsigned i = 0; i < sz - 1; i++) { + for (unsigned i = 0; i < sz - 1; ++i) { if (ds[i] != 0) return false; } @@ -1986,7 +1986,7 @@ void mpz_manager::ensure_capacity(mpz & a, unsigned capacity) { SASSERT(a.m_ptr->m_capacity >= capacity); if (val == INT_MIN) { unsigned intmin_sz = m_int_min.m_ptr->m_size; - for (unsigned i = 0; i < intmin_sz; i++) + for (unsigned i = 0; i < intmin_sz; ++i) a.m_ptr->m_digits[i] = m_int_min.m_ptr->m_digits[i]; a.m_val = -1; a.m_ptr->m_size = m_int_min.m_ptr->m_size; @@ -2007,7 +2007,7 @@ void mpz_manager::ensure_capacity(mpz & a, unsigned capacity) { SASSERT(new_cell->m_capacity == capacity); unsigned old_sz = a.m_ptr->m_size; new_cell->m_size = old_sz; - for (unsigned i = 0; i < old_sz; i++) + for (unsigned i = 0; i < old_sz; ++i) new_cell->m_digits[i] = a.m_ptr->m_digits[i]; deallocate(a); a.m_ptr = new_cell; @@ -2077,7 +2077,7 @@ void mpz_manager::machine_div2k(mpz & a, unsigned k) { unsigned i = 0; unsigned j = digit_shift; if (bit_shift != 0) { - for (; i < new_sz - 1; i++, j++) { + for (; i < new_sz - 1; ++i, ++j) { ds[i] = ds[j]; ds[i] >>= bit_shift; ds[i] |= (ds[j+1] << comp_shift); @@ -2086,7 +2086,7 @@ void mpz_manager::machine_div2k(mpz & a, unsigned k) { ds[i] >>= bit_shift; } else { - for (; i < new_sz; i++, j++) { + for (; i < new_sz; ++i, ++j) { ds[i] = ds[j]; } } @@ -2095,7 +2095,7 @@ void mpz_manager::machine_div2k(mpz & a, unsigned k) { SASSERT(new_sz == sz); SASSERT(bit_shift != 0); unsigned i = 0; - for (; i < new_sz - 1; i++) { + for (; i < new_sz - 1; ++i) { ds[i] >>= bit_shift; ds[i] |= (ds[i+1] << comp_shift); } @@ -2136,7 +2136,7 @@ void mpz_manager::mul2k(mpz & a, unsigned k) { mpz_cell * cell_a = a.m_ptr; old_sz = cell_a->m_size; digit_t * ds = cell_a->m_digits; - for (unsigned i = old_sz; i < new_sz; i++) + for (unsigned i = old_sz; i < new_sz; ++i) ds[i] = 0; cell_a->m_size = new_sz; @@ -2154,13 +2154,13 @@ void mpz_manager::mul2k(mpz & a, unsigned k) { } if (bit_shift > 0) { DEBUG_CODE({ - for (unsigned i = 0; i < word_shift; i++) { + for (unsigned i = 0; i < word_shift; ++i) { SASSERT(ds[i] == 0); } }); unsigned comp_shift = (8 * sizeof(digit_t)) - bit_shift; digit_t prev = 0; - for (unsigned i = word_shift; i < new_sz; i++) { + for (unsigned i = word_shift; i < new_sz; ++i) { digit_t new_prev = (ds[i] >> comp_shift); ds[i] <<= bit_shift; ds[i] |= prev; @@ -2215,7 +2215,7 @@ unsigned mpz_manager::power_of_two_multiple(mpz const & a) { unsigned sz = c->m_size; unsigned r = 0; digit_t * source = c->m_digits; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { if (source[i] != 0) { digit_t v = source[i]; if (sizeof(digit_t) == 8) { @@ -2515,7 +2515,7 @@ bool mpz_manager::decompose(mpz const & a, svector & digits) { #ifndef _MP_GMP mpz_cell * cell_a = a.m_ptr; unsigned sz = cell_a->m_size; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { digits.push_back(cell_a->m_digits[i]); } return a.m_val < 0; diff --git a/src/util/object_allocator.h b/src/util/object_allocator.h index 10c02665e..af95a2d2f 100644 --- a/src/util/object_allocator.h +++ b/src/util/object_allocator.h @@ -70,7 +70,7 @@ class object_allocator : public ResetProc { void call_destructors_for_page(T * page, unsigned end) { T * page_end = page + end; - for (; page < page_end; page++) + for (; page < page_end; ++page) page->~T(); } @@ -174,7 +174,7 @@ public: if (num_workers > old_capacity) { m_regions.resize(num_workers); m_free_lists.resize(num_workers); - for (unsigned i = old_capacity; i < capacity(); i++) { + for (unsigned i = old_capacity; i < capacity(); ++i) { m_regions[i] = alloc(region); } } @@ -194,7 +194,7 @@ public: void reset() { SASSERT(!m_concurrent); unsigned c = capacity(); - for (unsigned i = 0; i < c; i++) { + for (unsigned i = 0; i < c; ++i) { m_regions[i]->reset(); m_free_lists[i].reset(); } @@ -275,7 +275,7 @@ public: unsigned get_objects_count() const { unsigned count = 0; unsigned n_regions = m_regions.size(); - for (unsigned i = 0; i < n_regions; i++) { + for (unsigned i = 0; i < n_regions; ++i) { count += m_regions[i]->get_objects_count(); count -= m_free_lists[i].size(); } diff --git a/src/util/params.cpp b/src/util/params.cpp index 27cd062e9..536869f25 100644 --- a/src/util/params.cpp +++ b/src/util/params.cpp @@ -32,7 +32,7 @@ std::string norm_param_name(char const* n) { if (sz == 0) return "_"; - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { char curr = r[i]; if ('A' <= curr && curr <= 'Z') r[i] = curr - 'A' + 'a'; @@ -173,12 +173,12 @@ struct param_descrs::imp { " ----------|------|-------------|--------\n"; } for (symbol const& name : names) { - for (unsigned i = 0; i < indent; i++) out << " "; + for (unsigned i = 0; i < indent; ++i) out << " "; if (smt2_style) out << ':'; std::string s = name.str(); unsigned n = static_cast(s.length()); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (smt2_style && s[i] == '_') out << '-'; else if (!smt2_style && s[i] == '-') diff --git a/src/util/parray.h b/src/util/parray.h index 2678b3834..ff36e4f61 100644 --- a/src/util/parray.h +++ b/src/util/parray.h @@ -92,7 +92,7 @@ private: void dec_ref(unsigned sz, value * vs) { if (C::ref_count) - for (unsigned i = 0; i < sz; i++) + for (unsigned i = 0; i < sz; ++i) m_vmanager.dec_ref(vs[i]); } @@ -151,7 +151,7 @@ private: size_t new_capacity = curr_capacity == 0 ? 2 : (3 * curr_capacity + 1) >> 1; value * new_vs = allocate_values(new_capacity); if (curr_capacity > 0) { - for (size_t i = 0; i < curr_capacity; i++) + for (size_t i = 0; i < curr_capacity; ++i) new_vs[i] = vs[i]; deallocate_values(vs); } @@ -197,7 +197,7 @@ private: void copy_values(value * s, unsigned sz, value * & t) { SASSERT(t == 0); t = allocate_values(capacity(s)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { t[i] = s[i]; inc_ref(t[i]); } diff --git a/src/util/permutation.cpp b/src/util/permutation.cpp index 47b9d85a1..7a571aa2b 100644 --- a/src/util/permutation.cpp +++ b/src/util/permutation.cpp @@ -25,7 +25,7 @@ permutation::permutation(unsigned size) { void permutation::reset(unsigned size) { m_p.reset(); m_inv_p.reset(); - for (unsigned i = 0; i < size; i++) { + for (unsigned i = 0; i < size; ++i) { m_p.push_back(i); m_inv_p.push_back(i); } @@ -46,7 +46,7 @@ void permutation::move_after(unsigned i, unsigned j) { if (i >= j) return; unsigned i_prime = m_p[i]; - for (unsigned k = i; k < j; k++) { + for (unsigned k = i; k < j; ++k) { m_p[k] = m_p[k+1]; m_inv_p[m_p[k]] = k; } @@ -57,7 +57,7 @@ void permutation::move_after(unsigned i, unsigned j) { void permutation::display(std::ostream & out) const { unsigned n = m_p.size(); - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (i > 0) out << " "; out << i << ":" << m_p[i]; @@ -68,7 +68,7 @@ bool permutation::check_invariant() const { SASSERT(m_p.size() == m_inv_p.size()); unsigned n = m_p.size(); bool_vector check_vector(n, false); // To check for duplicate and out-of-range values - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { unsigned pi = m_p[i]; SASSERT(m_p[i] < n); SASSERT(m_inv_p[i] < n); diff --git a/src/util/permutation.h b/src/util/permutation.h index 0d4399f7e..f48872e5c 100644 --- a/src/util/permutation.h +++ b/src/util/permutation.h @@ -57,7 +57,7 @@ inline std::ostream & operator<<(std::ostream & out, permutation const & p) { template void apply_permutation_core(unsigned sz, T * data, unsigned * p) { int * p1 = reinterpret_cast(p); - for (int i = 0; i < static_cast(sz); i++) { + for (int i = 0; i < static_cast(sz); ++i) { if (p1[i] < 0) continue; // already processed int j = i; @@ -86,7 +86,7 @@ void apply_permutation(unsigned sz, T * data, unsigned const * p) { apply_permutation_core(sz, data, const_cast(p)); // restore p int * p1 = reinterpret_cast(const_cast(p)); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { p1[i] = - p1[i] - 1; } } diff --git a/src/util/prime_generator.cpp b/src/util/prime_generator.cpp index 303c351ba..9015123c8 100644 --- a/src/util/prime_generator.cpp +++ b/src/util/prime_generator.cpp @@ -32,12 +32,12 @@ void prime_generator::process_next_k_numbers(uint64_t k) { SASSERT(m_primes[j] == 3); while (!todo.empty()) { unsigned sz = m_primes.size(); - for (; j < sz; j++) { + for (; j < sz; ++j) { uint64_t p = m_primes[j]; unsigned todo_sz = todo.size(); unsigned k1 = 0; unsigned k2 = 0; - for (; k1 < todo_sz; k1++) { + for (; k1 < todo_sz; ++k1) { if (todo[k1] % p == 0) continue; todo[k2] = todo[k1]; @@ -48,7 +48,7 @@ void prime_generator::process_next_k_numbers(uint64_t k) { return; if (p > (todo[k2-1] / p) + 1) { // all numbers in todo are primes - for (unsigned k1 = 0; k1 < k2; k1++) { + for (unsigned k1 = 0; k1 < k2; ++k1) { m_primes.push_back(todo[k1]); } return; @@ -58,7 +58,7 @@ void prime_generator::process_next_k_numbers(uint64_t k) { p = p*p; unsigned todo_sz = todo.size(); unsigned k1 = 0; - for (k1 = 0; k1 < todo_sz; k1++) { + for (k1 = 0; k1 < todo_sz; ++k1) { if (todo[k1] < p) { m_primes.push_back(todo[k1]); } @@ -67,7 +67,7 @@ void prime_generator::process_next_k_numbers(uint64_t k) { } } unsigned k2 = 0; - for (; k1 < todo_sz; k1++, k2++) { + for (; k1 < todo_sz; ++k1, ++k2) { todo[k2] = todo[k1]; } todo.shrink(k2); diff --git a/src/util/rational.cpp b/src/util/rational.cpp index 54b40ac58..e11245fa3 100644 --- a/src/util/rational.cpp +++ b/src/util/rational.cpp @@ -34,7 +34,7 @@ static void mk_power_up_to(vector & pws, unsigned n) { unsigned sz = pws.size(); rational curr = pws[sz - 1]; rational two(2); - for (unsigned i = sz; i <= n; i++) { + for (unsigned i = sz; i <= n; ++i) { curr *= two; pws.push_back(curr); } diff --git a/src/util/ref_buffer.h b/src/util/ref_buffer.h index 2833effe4..67b53c323 100644 --- a/src/util/ref_buffer.h +++ b/src/util/ref_buffer.h @@ -115,7 +115,7 @@ public: } void append(unsigned n, T * const * elems) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { push_back(elems[i]); } } diff --git a/src/util/ref_pair_vector.h b/src/util/ref_pair_vector.h index 40f845af6..1ed708168 100644 --- a/src/util/ref_pair_vector.h +++ b/src/util/ref_pair_vector.h @@ -75,7 +75,7 @@ public: m_nodes.shrink(sz); } else { - for (unsigned i = m_nodes.size(); i < sz; i++) + for (unsigned i = m_nodes.size(); i < sz; ++i) push_back(d); } } diff --git a/src/util/ref_vector.h b/src/util/ref_vector.h index 3a8492c29..c8d685ec7 100644 --- a/src/util/ref_vector.h +++ b/src/util/ref_vector.h @@ -84,7 +84,7 @@ public: m_nodes.shrink(sz); } else { - for (unsigned i = m_nodes.size(); i < sz; i++) + for (unsigned i = m_nodes.size(); i < sz; ++i) push_back(d); } } @@ -167,7 +167,7 @@ public: void erase(T * elem) { unsigned sz = size(); - for (unsigned idx = 0; idx < sz; idx++) { + for (unsigned idx = 0; idx < sz; ++idx) { if (m_nodes[idx] == elem) { erase(idx); return; @@ -177,7 +177,7 @@ public: bool contains(T * elem) const { unsigned sz = size(); - for (unsigned idx = 0; idx < sz; idx++) + for (unsigned idx = 0; idx < sz; ++idx) if (m_nodes[idx] == elem) return true; return false; diff --git a/src/util/region.h b/src/util/region.h index 9f28be908..b7cf17376 100644 --- a/src/util/region.h +++ b/src/util/region.h @@ -44,7 +44,7 @@ public: void pop_scope(); void pop_scope(unsigned num_scopes) { - for (unsigned i = 0; i < num_scopes; i++) { + for (unsigned i = 0; i < num_scopes; ++i) { pop_scope(); } } @@ -79,7 +79,7 @@ public: void push_scope(); void pop_scope(); void pop_scope(unsigned num_scopes) { - for (unsigned i = 0; i < num_scopes; i++) { + for (unsigned i = 0; i < num_scopes; ++i) { pop_scope(); } } diff --git a/src/util/s_integer.h b/src/util/s_integer.h index b102d6d4b..7d17f6f22 100644 --- a/src/util/s_integer.h +++ b/src/util/s_integer.h @@ -101,7 +101,7 @@ public: friend inline s_integer ceil(const s_integer & r) { return r; } s_integer expt(int n) const { s_integer result(1); - for (int i = 0; i < n; i++) { + for (int i = 0; i < n; ++i) { result *= *this; } return result; diff --git a/src/util/sat_literal.h b/src/util/sat_literal.h index 61ee5f657..fb22ce5e1 100644 --- a/src/util/sat_literal.h +++ b/src/util/sat_literal.h @@ -179,7 +179,7 @@ namespace sat { }; inline std::ostream & operator<<(std::ostream & out, mk_lits_pp const & ls) { - for (unsigned i = 0; i < ls.m_num; i++) { + for (unsigned i = 0; i < ls.m_num; ++i) { if (i > 0) out << " "; out << ls.m_lits[i]; } diff --git a/src/util/scoped_numeral_buffer.h b/src/util/scoped_numeral_buffer.h index 81d10ba40..a1860a7ad 100644 --- a/src/util/scoped_numeral_buffer.h +++ b/src/util/scoped_numeral_buffer.h @@ -34,7 +34,7 @@ public: void reset() { unsigned sz = this->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().del(this->operator[](i)); } super::reset(); @@ -51,7 +51,7 @@ public: unsigned old_sz = this->size(); if (old_sz == sz) return; - for (unsigned i = sz; i < old_sz; i++) + for (unsigned i = sz; i < old_sz; ++i) m().del(this->operator[](i)); super::shrink(sz); } diff --git a/src/util/scoped_numeral_vector.h b/src/util/scoped_numeral_vector.h index b586b5181..b5cfb69cb 100644 --- a/src/util/scoped_numeral_vector.h +++ b/src/util/scoped_numeral_vector.h @@ -40,7 +40,7 @@ public: void reset() { auto sz = this->size(); - for (unsigned i = 0; i < sz; i++) { + for (unsigned i = 0; i < sz; ++i) { m().del(this->operator[](i)); } svector::reset(); @@ -61,7 +61,7 @@ public: unsigned old_sz = this->size(); if (old_sz == sz) return; - for (unsigned i = sz; i < old_sz; i++) + for (unsigned i = sz; i < old_sz; ++i) m().del(this->operator[](i)); svector::shrink(sz); } diff --git a/src/util/scoped_ptr_vector.h b/src/util/scoped_ptr_vector.h index 90afbb6ef..06688eb71 100644 --- a/src/util/scoped_ptr_vector.h +++ b/src/util/scoped_ptr_vector.h @@ -65,7 +65,7 @@ public: m_vector.shrink(sz); } else { - for (unsigned i = m_vector.size(); i < sz; i++) + for (unsigned i = m_vector.size(); i < sz; ++i) push_back(nullptr); } } diff --git a/src/util/sexpr.cpp b/src/util/sexpr.cpp index dcf427dfe..4b0b8378d 100644 --- a/src/util/sexpr.cpp +++ b/src/util/sexpr.cpp @@ -31,7 +31,7 @@ struct sexpr_composite : public sexpr { sexpr_composite(unsigned num_children, sexpr * const * children, unsigned line, unsigned pos): sexpr(kind_t::COMPOSITE, line, pos), m_num_children(num_children) { - for (unsigned i = 0; i < num_children; i++) { + for (unsigned i = 0; i < num_children; ++i) { m_children[i] = children[i]; children[i]->inc_ref(); } @@ -226,7 +226,7 @@ void sexpr_manager::del(sexpr * n) { switch (n->get_kind()) { case sexpr::kind_t::COMPOSITE: { unsigned num = n->get_num_children(); - for (unsigned i = 0; i < num; i++) { + for (unsigned i = 0; i < num; ++i) { sexpr * child = n->get_child(i); SASSERT(child->m_ref_count > 0); child->m_ref_count--; diff --git a/src/util/small_object_allocator.cpp b/src/util/small_object_allocator.cpp index 879168721..204b4bacd 100644 --- a/src/util/small_object_allocator.cpp +++ b/src/util/small_object_allocator.cpp @@ -30,7 +30,7 @@ Revision History: small_object_allocator::small_object_allocator(char const * id) { - for (unsigned i = 0; i < NUM_SLOTS; i++) { + for (unsigned i = 0; i < NUM_SLOTS; ++i) { m_chunks[i] = nullptr; m_free_list[i] = nullptr; } @@ -41,7 +41,7 @@ small_object_allocator::small_object_allocator(char const * id) { } small_object_allocator::~small_object_allocator() { - for (unsigned i = 0; i < NUM_SLOTS; i++) { + for (unsigned i = 0; i < NUM_SLOTS; ++i) { chunk * c = m_chunks[i]; while (c) { chunk * next = c->m_next; @@ -57,7 +57,7 @@ small_object_allocator::~small_object_allocator() { } void small_object_allocator::reset() { - for (unsigned i = 0; i < NUM_SLOTS; i++) { + for (unsigned i = 0; i < NUM_SLOTS; ++i) { chunk * c = m_chunks[i]; while (c) { chunk * next = c->m_next; @@ -148,7 +148,7 @@ void * small_object_allocator::allocate(size_t size) { size_t small_object_allocator::get_wasted_size() const { size_t r = 0; - for (unsigned slot_id = 0; slot_id < NUM_SLOTS; slot_id++) { + for (unsigned slot_id = 0; slot_id < NUM_SLOTS; ++slot_id) { size_t slot_obj_size = slot_id << PTR_ALIGNMENT; void ** ptr = reinterpret_cast(const_cast(this)->m_free_list[slot_id]); while (ptr != nullptr) { @@ -161,7 +161,7 @@ size_t small_object_allocator::get_wasted_size() const { size_t small_object_allocator::get_num_free_objs() const { size_t r = 0; - for (unsigned slot_id = 0; slot_id < NUM_SLOTS; slot_id++) { + for (unsigned slot_id = 0; slot_id < NUM_SLOTS; ++slot_id) { void ** ptr = reinterpret_cast(const_cast(this)->m_free_list[slot_id]); while (ptr != nullptr) { r ++; @@ -185,7 +185,7 @@ void small_object_allocator::consolidate() { static_cast(memory::get_allocation_size())/static_cast(1024*1024) << ")" << std::endl;); ptr_vector chunks; ptr_vector free_objs; - for (unsigned slot_id = 1; slot_id < NUM_SLOTS; slot_id++) { + for (unsigned slot_id = 1; slot_id < NUM_SLOTS; ++slot_id) { if (m_free_list[slot_id] == nullptr) continue; chunks.reset(); @@ -232,7 +232,7 @@ void small_object_allocator::consolidate() { else { curr_chunk->m_next = last_chunk; last_chunk = curr_chunk; - for (unsigned i = saved_obj_idx; i < obj_idx; i++) { + for (unsigned i = saved_obj_idx; i < obj_idx; ++i) { // relink objects void * free_obj = free_objs[i]; *(reinterpret_cast(free_obj)) = last_free_obj; diff --git a/src/util/smt2_util.cpp b/src/util/smt2_util.cpp index 365d8fe70..75dc0da5a 100644 --- a/src/util/smt2_util.cpp +++ b/src/util/smt2_util.cpp @@ -35,7 +35,7 @@ bool is_smt2_quoted_symbol(char const * s) { return true; unsigned len = static_cast(strlen(s)); if (len >= 2 && s[0] == '|' && s[len-1] == '|') { - for (unsigned i = 1; i + 1 < len; i++) { + for (unsigned i = 1; i + 1 < len; ++i) { if (s[i] == '\\' && i + 2 < len && (s[i+1] == '\\' || s[i+1] == '|')) { i++; } @@ -44,7 +44,7 @@ bool is_smt2_quoted_symbol(char const * s) { } return false; } - for (unsigned i = 0; i < len; i++) + for (unsigned i = 0; i < len; ++i) if (!is_smt2_simple_symbol_char(s[i])) return true; return false; diff --git a/src/util/statistics.cpp b/src/util/statistics.cpp index 632a7f750..2c842dc09 100644 --- a/src/util/statistics.cpp +++ b/src/util/statistics.cpp @@ -83,7 +83,7 @@ typedef map key2dval; unsigned get_max_len(ptr_buffer & keys) { unsigned max = 0; - for (unsigned i = 0; i < static_cast(keys.size()); i++) { + for (unsigned i = 0; i < static_cast(keys.size()); ++i) { char * k = keys.get(i); if (*k == ':') k++; @@ -114,13 +114,13 @@ std::ostream& statistics::display_smt2(std::ostream & out) const { out << "\n "; \ display_smt2_key(out, k); \ unsigned len = static_cast(strlen(k)); \ - for (unsigned j = len; j < max; j++) \ + for (unsigned j = len; j < max; ++j) \ out << " "; \ first = false; \ } out << "("; - for (unsigned i = 0; i < keys.size(); i++) { + for (unsigned i = 0; i < keys.size(); ++i) { char * k = keys.get(i); unsigned val; if (m_u.find(k, val)) { @@ -147,11 +147,11 @@ std::ostream& statistics::display(std::ostream & out) const { k++; \ out << k << ":"; \ unsigned len = static_cast(strlen(k)); \ - for (unsigned j = len; j < max; j++) \ + for (unsigned j = len; j < max; ++j) \ out << " "; \ } - for (unsigned i = 0; i < keys.size(); i++) { + for (unsigned i = 0; i < keys.size(); ++i) { char * k = keys.get(i); unsigned val; if (m_u.find(k, val)) { diff --git a/src/util/symbol_table.h b/src/util/symbol_table.h index 1a805ff35..5d2cce726 100644 --- a/src/util/symbol_table.h +++ b/src/util/symbol_table.h @@ -165,7 +165,7 @@ public: m_trail_lims.pop_back(); unsigned curr_size = m_trail_stack.size(); SASSERT(old_size <= curr_size); - for (unsigned i = old_size; i < curr_size; i++) { + for (unsigned i = old_size; i < curr_size; ++i) { key_data & curr_entry = m_trail_stack.back(); symbol key = curr_entry.m_key; if (key.is_marked()) { diff --git a/src/util/total_order.h b/src/util/total_order.h index 5aac3f82b..18fcab9be 100644 --- a/src/util/total_order.h +++ b/src/util/total_order.h @@ -105,7 +105,7 @@ class total_order { curr_gap = ideal_gap; c = a->m_next; uint64_t inc = curr_gap; - for (unsigned i = 0; i < j; i++) { + for (unsigned i = 0; i < j; ++i) { c->m_val = v0 + inc; c = c->m_next; inc += curr_gap; diff --git a/src/util/uint_set.h b/src/util/uint_set.h index fc1f508d7..ab4c7e44f 100644 --- a/src/util/uint_set.h +++ b/src/util/uint_set.h @@ -42,7 +42,7 @@ public: } bool empty() const { - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { if ((*this)[i] != 0) { return false; } @@ -72,7 +72,7 @@ public: unsigned num_elems() const { unsigned r = 0; - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { r += get_num_1bits((*this)[i]); } return r; @@ -84,7 +84,7 @@ public: if (source_size > size()) { resize(source_size + 1); } - for (unsigned i = 0; i < source_size; i++) { + for (unsigned i = 0; i < source_size; ++i) { (*this)[i] |= source[i]; } return *this; @@ -95,7 +95,7 @@ public: if (source_size < size()) { resize(source_size); } - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { (*this)[i] &= source[i]; } return *this; @@ -106,7 +106,7 @@ public: if (source.size() < min_size) { min_size = source.size(); } - for (unsigned i = 0; i < min_size; i++) { + for (unsigned i = 0; i < min_size; ++i) { if ((*this)[i] != source[i]) { return false; } @@ -135,7 +135,7 @@ public: if (source.size() < min_size) { min_size = source.size(); } - for (unsigned i = 0; i < min_size; i++) { + for (unsigned i = 0; i < min_size; ++i) { if (((*this)[i] & ~source[i]) != 0) { return false; } @@ -219,7 +219,7 @@ inline std::ostream & operator<<(std::ostream & target, const uint_set & s) { unsigned n = s.get_max_elem() + 1; target << "{"; bool first = true; - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { if (s.contains(i)) { if (first) { first = false; diff --git a/src/util/union_find.h b/src/util/union_find.h index 93d8affea..1a735e2f0 100644 --- a/src/util/union_find.h +++ b/src/util/union_find.h @@ -159,7 +159,7 @@ public: void display(std::ostream & out) const { unsigned num = get_num_vars(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { out << "v" << v << " --> v" << m_find[v] << " (" << size(v) << ")\n"; } } @@ -167,7 +167,7 @@ public: #ifdef Z3DEBUG bool check_invariant() const { unsigned num = get_num_vars(); - for (unsigned v = 0; v < num; v++) { + for (unsigned v = 0; v < num; ++v) { if (is_root(v)) { unsigned curr = v; unsigned sz = 0; diff --git a/src/util/util.cpp b/src/util/util.cpp index ee1e734af..d60f8467a 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -112,7 +112,7 @@ unsigned uint64_log2(uint64_t v) { } bool product_iterator_next(unsigned n, unsigned const * sz, unsigned * it) { - for (unsigned i = 0; i < n; i++) { + for (unsigned i = 0; i < n; ++i) { it[i]++; if (it[i] < sz[i]) return true; @@ -147,7 +147,7 @@ void escaped::display(std::ostream & out) const { } out << c; if (c == '\n') { - for (unsigned i = 0; i < m_indent; i++) + for (unsigned i = 0; i < m_indent; ++i) out << " "; } } diff --git a/src/util/util.h b/src/util/util.h index 0fed4a13b..e6fe1fd85 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -114,7 +114,7 @@ static inline unsigned get_num_1bits(unsigned v) { #ifdef Z3DEBUG unsigned c; unsigned v1 = v; - for (c = 0; v1; c++) { + for (c = 0; v1; ++c) { v1 &= v1 - 1; } #endif @@ -133,7 +133,7 @@ static inline unsigned get_num_1bits(uint64_t v) { #ifdef Z3DEBUG unsigned c; uint64_t v1 = v; - for (c = 0; v1; c++) { + for (c = 0; v1; ++c) { v1 &= v1 - 1; } #endif @@ -311,7 +311,7 @@ public: template bool compare_arrays(const T * array1, const T * array2, unsigned size) { - for (unsigned i = 0; i < size; i++) { + for (unsigned i = 0; i < size; ++i) { if (!(array1[i] == array2[i])) { return false; } diff --git a/src/util/vector.h b/src/util/vector.h index f3bd5da6b..ad2802e92 100644 --- a/src/util/vector.h +++ b/src/util/vector.h @@ -170,7 +170,7 @@ public: } vector(SZ s, T const * data) { - for (SZ i = 0; i < s; i++) { + for (SZ i = 0; i < s; ++i) { push_back(data[i]); } } @@ -195,7 +195,7 @@ public: } if (size() != other.size()) return false; - for (unsigned i = 0; i < size(); i++) { + for (unsigned i = 0; i < size(); ++i) { if ((*this)[i] != other[i]) return false; }