mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-09 16:55:47 +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/bv/bit_blaster_model_converter.cpp
View file

@ -159,11 +159,11 @@ struct bit_blaster_model_converter : public model_converter {
if (TO_BOOL) {
SASSERT(is_app_of(bs, m().get_family_id("bv"), OP_MKBV));
result = util.mk_bv(bv_sz, args.c_ptr());
result = util.mk_bv(bv_sz, args.data());
}
else {
SASSERT(is_app_of(bs, m().get_family_id("bv"), OP_CONCAT));
result = util.mk_concat(bv_sz, args.c_ptr());
result = util.mk_concat(bv_sz, args.data());
}
return result;
}

18
src/tactic/bv/bv1_blaster_tactic.cpp
View file

@ -109,7 +109,7 @@ class bv1_blaster_tactic : public tactic {
bits.push_back(m().mk_fresh_const(nullptr, b));
m_newbits.push_back(to_app(bits.back())->get_decl());
}
r = butil().mk_concat(bits.size(), bits.c_ptr());
r = butil().mk_concat(bits.size(), bits.data());
m_saved.push_back(r);
m_const2bits.insert(f, r);
result = r;
@ -127,7 +127,7 @@ class bv1_blaster_tactic : public tactic {
--i;
bits.push_back(butil().mk_extract(i, i, t));
}
result = butil().mk_concat(bits.size(), bits.c_ptr());
result = butil().mk_concat(bits.size(), bits.data());
}
void reduce_eq(expr * arg1, expr * arg2, expr_ref & result) {
@ -142,7 +142,7 @@ class bv1_blaster_tactic : public tactic {
--i;
new_eqs.push_back(m().mk_eq(bits1[i], bits2[i]));
}
result = mk_and(m(), new_eqs.size(), new_eqs.c_ptr());
result = mk_and(m(), new_eqs.size(), new_eqs.data());
}
void reduce_ite(expr * c, expr * t, expr * e, expr_ref & result) {
@ -155,7 +155,7 @@ class bv1_blaster_tactic : public tactic {
unsigned num = t_bits.size();
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.c_ptr());
result = butil().mk_concat(new_ites.size(), new_ites.data());
}
void reduce_num(func_decl * f, expr_ref & result) {
@ -174,7 +174,7 @@ class bv1_blaster_tactic : public tactic {
v = div(v, two);
}
std::reverse(bits.begin(), bits.end());
result = butil().mk_concat(bits.size(), bits.c_ptr());
result = butil().mk_concat(bits.size(), bits.data());
}
void reduce_extract(func_decl * f, expr * arg, expr_ref & result) {
@ -190,7 +190,7 @@ class bv1_blaster_tactic : public tactic {
for (unsigned i = start; i <= end; i++) {
bits.push_back(arg_bits[i]);
}
result = butil().mk_concat(bits.size(), bits.c_ptr());
result = butil().mk_concat(bits.size(), bits.data());
}
void reduce_concat(unsigned num, expr * const * args, expr_ref & result) {
@ -200,9 +200,9 @@ class bv1_blaster_tactic : public tactic {
expr * arg = args[i];
arg_bits.reset();
get_bits(arg, arg_bits);
bits.append(arg_bits.size(), arg_bits.c_ptr());
bits.append(arg_bits.size(), arg_bits.data());
}
result = butil().mk_concat(bits.size(), bits.c_ptr());
result = butil().mk_concat(bits.size(), bits.data());
}
void reduce_bin_xor(expr * arg1, expr * arg2, expr_ref & result) {
@ -216,7 +216,7 @@ class bv1_blaster_tactic : public tactic {
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.c_ptr());
result = butil().mk_concat(new_bits.size(), new_bits.data());
}
void reduce_xor(unsigned num_args, expr * const * args, expr_ref & result) {

2
src/tactic/bv/bvarray2uf_rewriter.cpp
View file

@ -296,7 +296,7 @@ br_status bvarray2uf_rewriter_cfg::reduce_app(func_decl * f, unsigned num, expr
expr_ref body(m_manager);
body = m_manager.mk_eq(m_manager.mk_app(f_t, x.get()),
m_manager.mk_app(map_f, num, new_args.c_ptr()));
m_manager.mk_app(map_f, num, new_args.data()));
expr_ref frllx(m_manager.mk_forall(1, sorts, names, body), m_manager);
extra_assertions.push_back(frllx);

8
src/tactic/bv/elim_small_bv_tactic.cpp
View file

@ -84,7 +84,7 @@ class elim_small_bv_tactic : public tactic {
// (VAR num_decls) ... (VAR num_decls+sz-1); are in positions num_decls .. num_decls+sz-1
std::reverse(substitution.c_ptr(), substitution.c_ptr() + substitution.size());
std::reverse(substitution.data(), substitution.data() + substitution.size());
// (VAR 0) should be in the last position of substitution.
@ -98,7 +98,7 @@ class elim_small_bv_tactic : public tactic {
});
var_subst vsbst(m);
res = vsbst(e, substitution.size(), substitution.c_ptr());
res = vsbst(e, substitution.size(), substitution.data());
SASSERT(is_well_sorted(m, res));
proof_ref pr(m);
@ -171,8 +171,8 @@ class elim_small_bv_tactic : public tactic {
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.c_ptr()) :
m.mk_or(new_bodies.size(), new_bodies.c_ptr());
body = is_forall(q) ? m.mk_and(new_bodies.size(), new_bodies.data()) :
m.mk_or(new_bodies.size(), new_bodies.data());
SASSERT(is_well_sorted(m, body));
proof_ref pr(m);