mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

call it data instead of c_ptr for approaching C++11 std::vector convention.

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-04-13 18:17:10 -07:00
parent 524dcd35f9
commit 4a6083836a
456 changed files with 2802 additions and 2802 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tactic/core/blast_term_ite_tactic.cpp
View file

@ -80,14 +80,14 @@ class blast_term_ite_tactic : public tactic {
expr_ref e1(m), e2(m);
ptr_vector<expr> args1(num_args, args);
args1[i] = t;
e1 = m.mk_app(f, num_args, args1.c_ptr());
e1 = m.mk_app(f, num_args, args1.data());
if (m.are_equal(t, e)) {
result = e1;
return BR_REWRITE1;
}
else {
args1[i] = e;
e2 = m.mk_app(f, num_args, args1.c_ptr());
e2 = m.mk_app(f, num_args, args1.data());
result = m.mk_ite(c, e1, e2);
++m_num_fresh;
return BR_REWRITE3;

2
src/tactic/core/cofactor_elim_term_ite.cpp
View file

@ -617,7 +617,7 @@ struct cofactor_elim_term_ite::imp {
has_term_ite = true;
expr_ref new_t(m);
if (has_new_args)
new_t = m.mk_app(to_app(t)->get_decl(), num, new_args.c_ptr());
new_t = m.mk_app(to_app(t)->get_decl(), num, new_args.data());
else
new_t = t;
if (has_term_ite && is_atom(new_t)) {

6
src/tactic/core/ctx_simplify_tactic.cpp
View file

@ -420,8 +420,8 @@ struct ctx_simplify_tactic::imp {
r = new_new_args[0];
}
else {
std::reverse(new_new_args.c_ptr(), new_new_args.c_ptr() + new_new_args.size());
m_mk_app(t->get_decl(), new_new_args.size(), new_new_args.c_ptr(), r);
std::reverse(new_new_args.data(), new_new_args.data() + new_new_args.size());
m_mk_app(t->get_decl(), new_new_args.size(), new_new_args.data(), r);
}
cache(t, r);
}
@ -495,7 +495,7 @@ struct ctx_simplify_tactic::imp {
r = t;
}
else {
m_mk_app(t->get_decl(), new_args.size(), new_args.c_ptr(), r);
m_mk_app(t->get_decl(), new_args.size(), new_args.data(), r);
}
}

4
src/tactic/core/distribute_forall_tactic.cpp
View file

@ -52,7 +52,7 @@ class distribute_forall_tactic : public tactic {
tmp_q = m.update_quantifier(old_q, not_arg);
new_args.push_back(elim_unused_vars(m, tmp_q, params_ref()));
}
result = m.mk_and(new_args.size(), new_args.c_ptr());
result = m.mk_and(new_args.size(), new_args.data());
if (m.proofs_enabled()) {
result_pr = m.mk_push_quant(old_q, result);
}
@ -73,7 +73,7 @@ class distribute_forall_tactic : public tactic {
tmp_q = m.update_quantifier(old_q, arg);
new_args.push_back(elim_unused_vars(m, tmp_q, params_ref()));
}
result = m.mk_and(new_args.size(), new_args.c_ptr());
result = m.mk_and(new_args.size(), new_args.data());
if (m.proofs_enabled()) {
result_pr = m.mk_push_quant(old_q, result);
}

2
src/tactic/core/dom_simplify_tactic.cpp
View file

@ -290,7 +290,7 @@ expr_ref dom_simplify_tactic::simplify_rec(expr * e0) {
// for fn applications.
m_args.push_back(m.is_bool(arg) ? arg : simplify_arg(arg));
}
r = m.mk_app(to_app(e)->get_decl(), m_args.size(), m_args.c_ptr());
r = m.mk_app(to_app(e)->get_decl(), m_args.size(), m_args.data());
}
else {
r = e;

12
src/tactic/core/elim_uncnstr_tactic.cpp
View file

@ -161,12 +161,12 @@ class elim_uncnstr_tactic : public tactic {
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.c_ptr());
sel = m().mk_app(fid, OP_SELECT, new_args.size(), new_args.data());
expr_ref diff_sel(m());
if (!mk_diff(sel, diff_sel))
return false;
new_args.push_back(diff_sel);
r = m().mk_app(fid, OP_STORE, new_args.size(), new_args.c_ptr());
r = m().mk_app(fid, OP_STORE, new_args.size(), new_args.data());
return true;
}
if (fid == m_dt_util.get_family_id()) {
@ -197,7 +197,7 @@ class elim_uncnstr_tactic : public tactic {
new_args.push_back(m().get_some_value(constructor->get_domain(i)));
}
}
r = m().mk_app(constructor, new_args.size(), new_args.c_ptr());
r = m().mk_app(constructor, new_args.size(), new_args.data());
return true;
}
// TODO: handle more cases.
@ -396,7 +396,7 @@ class elim_uncnstr_tactic : public tactic {
if (new_args.size() == 1)
rest = new_args[0];
else
rest = m().mk_app(fid, add_k, new_args.size(), new_args.c_ptr());
rest = m().mk_app(fid, add_k, new_args.size(), new_args.data());
add_def(v, m().mk_app(fid, sub_k, u, rest));
}
return u;
@ -503,7 +503,7 @@ class elim_uncnstr_tactic : public tactic {
args.push_back(r);
if (low > 0)
args.push_back(m_bv_util.mk_numeral(rational(0), low));
add_def(arg, m_bv_util.mk_concat(args.size(), args.c_ptr()));
add_def(arg, m_bv_util.mk_concat(args.size(), args.data()));
}
return r;
}
@ -698,7 +698,7 @@ class elim_uncnstr_tactic : public tactic {
else
new_args.push_back(m().get_some_value(c->get_domain(i)));
}
add_def(args[0], m().mk_app(c, new_args.size(), new_args.c_ptr()));
add_def(args[0], m().mk_app(c, new_args.size(), new_args.data()));
return u;
}
}

2
src/tactic/core/occf_tactic.cpp
View file

@ -175,7 +175,7 @@ class occf_tactic : public tactic {
}
if (keep != nullptr)
new_lits.push_back(keep);
g->update(i, m.mk_or(new_lits.size(), new_lits.c_ptr()), nullptr, d);
g->update(i, m.mk_or(new_lits.size(), new_lits.data()), nullptr, d);
}
g->inc_depth();
result.push_back(g.get());

8
src/tactic/core/pb_preprocess_tactic.cpp
View file

@ -256,7 +256,7 @@ private:
coeffs.push_back(pb.get_coeff(r, j));
args.push_back(negate(to_app(r)->get_arg(j)));
}
tmp = pb.mk_ge(args.size(), coeffs.c_ptr(), args.c_ptr(), sum - k + rational::one());
tmp = pb.mk_ge(args.size(), coeffs.data(), args.data(), sum - k + rational::one());
g->update(i, tmp, g->pr(i), g->dep(i));
}
}
@ -293,7 +293,7 @@ private:
start = end;
TRACE("pb", tout << fml1 << "\n";);
}
fml2 = pb.mk_ge(cut_args.size(), cut_coeffs.c_ptr(), cut_args.c_ptr(), pb.get_k(e));
fml2 = pb.mk_ge(cut_args.size(), cut_coeffs.data(), cut_args.data(), pb.get_k(e));
g->update(i, fml2, nullptr, g->dep(i));
TRACE("pb", tout << fml2 << "\n";);
}
@ -350,7 +350,7 @@ private:
cut_args.push_back(z);
j <<= 1;
}
fml1 = pb.mk_ge(args.size(), coeffs.c_ptr(), args.c_ptr(), rational(0));
fml1 = pb.mk_ge(args.size(), coeffs.data(), args.data(), rational(0));
m_r(fml1, fml);
return fml;
}
@ -519,7 +519,7 @@ private:
set_value(mc, arg, j != min_index);
}
tmp1 = pb.mk_ge(args2.size(), coeffs2.c_ptr(), args2.c_ptr(), k2);
tmp1 = pb.mk_ge(args2.size(), coeffs2.data(), args2.data(), k2);
IF_VERBOSE(3, verbose_stream() << " " << tmp1 << "\n";
for (unsigned i = 0; i < args2.size(); ++i) {
verbose_stream() << mk_pp(args2[i].get(), m) << " ";

8
src/tactic/core/reduce_args_tactic.cpp
View file

@ -372,7 +372,7 @@ struct reduce_args_tactic::imp {
if (!bv.get(i))
domain.push_back(f->get_domain(i));
}
new_f = m.mk_fresh_func_decl(f->get_name(), symbol::null, domain.size(), domain.c_ptr(), f->get_range());
new_f = m.mk_fresh_func_decl(f->get_name(), symbol::null, domain.size(), domain.data(), f->get_range());
m.inc_ref(tmp);
m.inc_ref(new_f);
}
@ -382,7 +382,7 @@ struct reduce_args_tactic::imp {
if (!bv.get(i))
new_args.push_back(args[i]);
}
result = m.mk_app(new_f, new_args.size(), new_args.c_ptr());
result = m.mk_app(new_f, new_args.size(), new_args.data());
return BR_DONE;
}
};
@ -421,7 +421,7 @@ struct reduce_args_tactic::imp {
func_decl * new_def = it2->m_value;
f_mc->hide(new_def);
SASSERT(new_def->get_arity() == new_args.size());
app * new_t = m_manager.mk_app(new_def, new_args.size(), new_args.c_ptr());
app * new_t = m_manager.mk_app(new_def, new_args.size(), new_args.data());
if (def == nullptr) {
def = new_t;
}
@ -436,7 +436,7 @@ struct reduce_args_tactic::imp {
if (new_eqs.size() == 1)
cond = new_eqs[0];
else
cond = m_manager.mk_and(new_eqs.size(), new_eqs.c_ptr());
cond = m_manager.mk_and(new_eqs.size(), new_eqs.data());
def = m_manager.mk_ite(cond, new_t, def);
}
}

2
src/tactic/core/reduce_invertible_tactic.cpp
View file

@ -490,7 +490,7 @@ private:
}
if (has_new_var) {
sub(new_body, result);
result = m.mk_quantifier(old_q->get_kind(), new_sorts.size(), new_sorts.c_ptr(), old_q->get_decl_names(), result, old_q->get_weight());
result = m.mk_quantifier(old_q->get_kind(), new_sorts.size(), new_sorts.data(), old_q->get_decl_names(), result, old_q->get_weight());
result_pr = nullptr;
return true;
}

6
src/tactic/core/solve_eqs_tactic.cpp
View file

@ -230,7 +230,7 @@ class solve_eqs_tactic : public tactic {
for (unsigned k = 0; k < n; ++k) {
if (k != j) args.push_back(arg->get_arg(k));
}
div = m_a_util.mk_mul(args.size(), args.c_ptr());
div = m_a_util.mk_mul(args.size(), args.data());
return true;
}
return false;
@ -248,7 +248,7 @@ class solve_eqs_tactic : public tactic {
for (unsigned k = 0; k < num; ++k) {
if (k != i) args.push_back(lhs->get_arg(k));
}
def = m_a_util.mk_sub(rhs, m_a_util.mk_add(args.size(), args.c_ptr()));
def = m_a_util.mk_sub(rhs, m_a_util.mk_add(args.size(), args.data()));
def = m_a_util.mk_div(def, div);
if (m_produce_proofs)
pr = m().mk_rewrite(eq, m().mk_eq(var, def));
@ -311,7 +311,7 @@ class solve_eqs_tactic : public tactic {
def = m_a_util.mk_sub(rhs, other_args[0]);
break;
default:
def = m_a_util.mk_sub(rhs, m_a_util.mk_add(other_args.size(), other_args.c_ptr()));
def = m_a_util.mk_sub(rhs, m_a_util.mk_add(other_args.size(), other_args.data()));
break;
}
if (m_produce_proofs)

6
src/tactic/core/split_clause_tactic.cpp
View file

@ -67,7 +67,7 @@ class split_clause_tactic : public tactic {
expr * not_li = m.mk_not(m_clause->get_arg(i));
prs.push_back(m.mk_lemma(pr_i, not_li));
}
return proof_ref(m.mk_unit_resolution(prs.size(), prs.c_ptr()), m);
return proof_ref(m.mk_unit_resolution(prs.size(), prs.data()), m);
}
proof_converter * translate(ast_translation & translator) override {
@ -124,8 +124,8 @@ public:
subgoal_i->inc_depth();
result.push_back(subgoal_i);
}
in->set(concat(in->pc(), result.size(), result.c_ptr()));
in->add(dependency_converter::concat(result.size(), result.c_ptr()));
in->set(concat(in->pc(), result.size(), result.data()));
in->add(dependency_converter::concat(result.size(), result.data()));
}
void cleanup() override {

4
src/tactic/core/symmetry_reduce_tactic.cpp
View file

@ -164,7 +164,7 @@ private:
for (unsigned i = 0; i < g.size(); ++i) {
conjs.push_back(g.form(i));
}
fml = m().mk_and(conjs.size(), conjs.c_ptr());
fml = m().mk_and(conjs.size(), conjs.data());
normalize(fml);
}
@ -613,7 +613,7 @@ private:
for (unsigned i = 0; i < C.size(); ++i) {
eqs.push_back(m().mk_eq(t, C[i]));
}
return m().mk_or(eqs.size(), eqs.c_ptr());
return m().mk_or(eqs.size(), eqs.data());
}
};

22
src/tactic/core/tseitin_cnf_tactic.cpp
View file

@ -495,7 +495,7 @@ class tseitin_cnf_tactic : public tactic {
inv(lb, nlb);
mk_clause(la, nlb);
}
mk_clause(lits.size(), lits.c_ptr());
mk_clause(lits.size(), lits.data());
return DONE;
}
@ -575,13 +575,13 @@ class tseitin_cnf_tactic : public tactic {
#define MK_ITE_ROOT_CLS(L1, L2) { \
ctx.push_back(L1); ctx.push_back(L2); \
mk_clause(ctx.size(), ctx.c_ptr()); \
mk_clause(ctx.size(), ctx.data()); \
ctx.pop_back(); ctx.pop_back(); \
}
#define MK_ITE_CLS(L1, L2, L3) { \
ctx.push_back(L1); ctx.push_back(L2); ctx.push_back(L3); \
mk_clause(ctx.size(), ctx.c_ptr()); \
mk_clause(ctx.size(), ctx.data()); \
ctx.pop_back(); ctx.pop_back(); ctx.pop_back(); \
}
@ -643,9 +643,9 @@ class tseitin_cnf_tactic : public tactic {
MK_ITE_CLS(nlb, nlc, k);
ex_neg_ctx.push_back(lb); ex_neg_ctx.push_back(lc); ex_neg_ctx.push_back(nk);
mk_clause(ex_neg_ctx.size(), ex_neg_ctx.c_ptr());
mk_clause(ex_neg_ctx.size(), ex_neg_ctx.data());
ex_pos_ctx.push_back(nlb); ex_pos_ctx.push_back(nlc); ex_pos_ctx.push_back(k);
mk_clause(ex_pos_ctx.size(), ex_pos_ctx.c_ptr());
mk_clause(ex_pos_ctx.size(), ex_pos_ctx.data());
}
}
break;
@ -707,7 +707,7 @@ class tseitin_cnf_tactic : public tactic {
lits.push_back(l);
}
if (root) {
mk_clause(lits.size(), lits.c_ptr());
mk_clause(lits.size(), lits.data());
}
else {
for (unsigned i = 0; i < num; i++) {
@ -715,7 +715,7 @@ class tseitin_cnf_tactic : public tactic {
mk_clause(l, k);
}
lits.push_back(nk);
mk_clause(lits.size(), lits.c_ptr());
mk_clause(lits.size(), lits.data());
}
}
else {
@ -745,7 +745,7 @@ class tseitin_cnf_tactic : public tactic {
}
if (!root) {
lits.push_back(k);
mk_clause(lits.size(), lits.c_ptr());
mk_clause(lits.size(), lits.data());
}
continue;
}
@ -761,7 +761,7 @@ class tseitin_cnf_tactic : public tactic {
SASSERT(offsets.size() == num);
sbuffer<expr**> arg_lits;
ptr_buffer<expr> lits;
expr ** buffer_ptr = buffer.c_ptr();
expr ** buffer_ptr = buffer.data();
for (unsigned i = 0; i < num; i++) {
arg_lits.push_back(buffer_ptr + offsets[i]);
}
@ -772,9 +772,9 @@ class tseitin_cnf_tactic : public tactic {
}
if (!root)
lits.push_back(nk);
mk_clause(lits.size(), lits.c_ptr());
mk_clause(lits.size(), lits.data());
}
while (product_iterator_next(szs.size(), szs.c_ptr(), it.c_ptr()));
while (product_iterator_next(szs.size(), szs.data(), it.data()));
}
return DONE;
}