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

6
src/ackermannization/ackr_model_converter.cpp
View file

@ -150,7 +150,7 @@ void ackr_model_converter::add_entry(model_evaluator & evaluator,
args.push_back(evaluator(info->abstract(arg)));
}
args.push_back(value);
e = autil.mk_store(args.size(), args.c_ptr());
e = autil.mk_store(args.size(), args.data());
}
array_interpretations.insert(A, e);
}
@ -175,14 +175,14 @@ void ackr_model_converter::add_entry(model_evaluator & evaluator,
for (expr* arg : *term) {
args.push_back(evaluator(info->abstract(arg)));
}
if (fi->get_entry(args.c_ptr()) == nullptr) {
if (fi->get_entry(args.data()) == nullptr) {
TRACE("ackermannize",
tout << mk_ismt2_pp(declaration, m) << " args: " << std::endl;
for (expr* arg : args) {
tout << mk_ismt2_pp(arg, m) << std::endl;
}
tout << " -> " << mk_ismt2_pp(value, m) << "\n"; );
fi->insert_new_entry(args.c_ptr(), value);
fi->insert_new_entry(args.data(), value);
}
else {
TRACE("ackermannize", tout << "entry already present\n";);

10
src/ackermannization/lackr_model_constructor.cpp
View file

@ -62,7 +62,7 @@ public:
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<expr> u = m_abstr_model->get_universe(s);
destination->register_usort(s, u.size(), u.c_ptr());
destination->register_usort(s, u.size(), u.data());
}
for (unsigned i = 0; i < m_abstr_model->get_num_functions(); i++) {
@ -213,7 +213,7 @@ private:
}
// handle functions
if (m_ackr_helper.is_uninterp_fn(a)) { // handle uninterpreted
app_ref key(m.mk_app(a->get_decl(), values.c_ptr()), m);
app_ref key(m.mk_app(a->get_decl(), values.data()), m);
if (!make_value_uninterpreted_function(a, key.get(), result)) {
return false;
}
@ -314,7 +314,7 @@ private:
func_decl * const fd = a->get_decl();
const family_id fid = fd->get_family_id();
expr_ref term(m);
term = m.mk_app(a->get_decl(), num, values.c_ptr());
term = m.mk_app(a->get_decl(), num, values.data());
m_evaluator->operator() (term, result);
TRACE("model_constructor",
tout << "eval(\n" << mk_ismt2_pp(term.get(), m, 2) << "\n->"
@ -329,11 +329,11 @@ private:
if (s_fid == m_bv_rw.get_fid())
m_bv_rw.mk_eq_core(values.get(0), values.get(1), result);
} else {
m_b_rw.mk_app_core(fd, num, values.c_ptr(), result);
m_b_rw.mk_app_core(fd, num, values.data(), result);
}
} else {
if (fid == m_bv_rw.get_fid()) {
m_bv_rw.mk_app_core(fd, num, values.c_ptr(), result);
m_bv_rw.mk_app_core(fd, num, values.data(), result);
}
else {
UNREACHABLE();