mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +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/solver/assertions/asserted_formulas.cpp
View file

@ -369,7 +369,7 @@ void asserted_formulas::swap_asserted_formulas(vector<justified_expr>& formulas)
void asserted_formulas::find_macros_core() {
vector<justified_expr> new_fmls;
unsigned sz = m_formulas.size();
(*m_macro_finder)(sz - m_qhead, m_formulas.c_ptr() + m_qhead, new_fmls);
(*m_macro_finder)(sz - m_qhead, m_formulas.data() + m_qhead, new_fmls);
swap_asserted_formulas(new_fmls);
reduce_and_solve();
}
@ -425,7 +425,7 @@ void asserted_formulas::apply_quasi_macros() {
vector<justified_expr> new_fmls;
quasi_macros proc(m, m_macro_manager);
while (proc(m_formulas.size() - m_qhead,
m_formulas.c_ptr() + m_qhead,
m_formulas.data() + m_qhead,
new_fmls)) {
swap_asserted_formulas(new_fmls);
new_fmls.reset();
@ -516,7 +516,7 @@ void asserted_formulas::commit() {
}
void asserted_formulas::commit(unsigned new_qhead) {
m_macro_manager.mark_forbidden(new_qhead - m_qhead, m_formulas.c_ptr() + m_qhead);
m_macro_manager.mark_forbidden(new_qhead - m_qhead, m_formulas.data() + m_qhead);
m_expr2depth.reset();
for (unsigned i = m_qhead; i < new_qhead; ++i) {
justified_expr const& j = m_formulas[i];

2
src/solver/check_sat_result.cpp
View file

@ -52,7 +52,7 @@ void simple_check_sat_result::collect_statistics(statistics & st) const {
void simple_check_sat_result::get_unsat_core(expr_ref_vector & r) {
if (m_status == l_false) {
r.reset();
r.append(m_core.size(), m_core.c_ptr());
r.append(m_core.size(), m_core.data());
}
}

6
src/solver/mus.cpp
View file

@ -78,7 +78,7 @@ struct mus::imp {
}
lbool get_mus1(expr_ref_vector& mus) {
ptr_vector<expr> unknown(m_lit2expr.size(), m_lit2expr.c_ptr());
ptr_vector<expr> unknown(m_lit2expr.size(), m_lit2expr.data());
expr_ref_vector core_exprs(m);
TRACE("mus", m_solver.display(tout););
while (!unknown.empty()) {
@ -129,7 +129,7 @@ struct mus::imp {
lbool get_mus2(expr_ref_vector& mus) {
expr* lit = nullptr;
lbool is_sat;
ptr_vector<expr> unknown(m_lit2expr.size(), m_lit2expr.c_ptr());
ptr_vector<expr> unknown(m_lit2expr.size(), m_lit2expr.data());
while (!unknown.empty()) {
IF_VERBOSE(12, verbose_stream() << "(mus reducing core: " << unknown.size() << " new core: " << mus.size() << ")\n";);
{
@ -281,7 +281,7 @@ struct mus::imp {
scoped_append(imp& imp, expr_ref_vector& fmls1, ptr_vector<expr> const& fmls2):
m_fmls(fmls1),
m_size(fmls1.size()) {
fmls1.append(fmls2.size(), fmls2.c_ptr());
fmls1.append(fmls2.size(), fmls2.data());
}
scoped_append(imp& imp, expr_ref_vector& fmls1, expr* fml):
m_fmls(fmls1),

2
src/solver/parallel_tactic.cpp
View file

@ -226,7 +226,7 @@ class parallel_tactic : public tactic {
solver const& get_solver() const { return *m_solver; }
void set_assumptions(ptr_vector<expr> const& asms) {
m_assumptions.append(asms.size(), asms.c_ptr());
m_assumptions.append(asms.size(), asms.data());
}
bool has_assumptions() const { return !m_assumptions.empty(); }

6
src/solver/solver.h
View file

@ -158,9 +158,9 @@ public:
lbool check_sat(unsigned num_assumptions, expr * const * assumptions);
lbool check_sat(expr_ref_vector const& asms) { return check_sat(asms.size(), asms.c_ptr()); }
lbool check_sat(expr_ref_vector const& asms) { return check_sat(asms.size(), asms.data()); }
lbool check_sat(app_ref_vector const& asms) { return check_sat(asms.size(), (expr* const*)asms.c_ptr()); }
lbool check_sat(app_ref_vector const& asms) { return check_sat(asms.size(), (expr* const*)asms.data()); }
lbool check_sat() { return check_sat(0, nullptr); }
@ -171,7 +171,7 @@ public:
assumed for the check.
*/
virtual lbool check_sat_cc(expr_ref_vector const& cube, vector<expr_ref_vector> const& clauses) {
if (clauses.empty()) return check_sat(cube.size(), cube.c_ptr());
if (clauses.empty()) return check_sat(cube.size(), cube.data());
NOT_IMPLEMENTED_YET();
return l_undef;
}

4
src/solver/solver2tactic.cpp
View file

@ -71,7 +71,7 @@ void extract_clauses_and_dependencies(goal_ref const& g, expr_ref_vector& clause
}
SASSERT(clause.size() > 1);
expr_ref cls(m);
cls = mk_or(m, clause.size(), clause.c_ptr());
cls = mk_or(m, clause.size(), clause.data());
clauses.push_back(cls);
}
}
@ -110,7 +110,7 @@ public:
TRACE("solver2tactic", tout << "clauses asserted\n";);
lbool r;
try {
r = local_solver->check_sat(assumptions.size(), assumptions.c_ptr());
r = local_solver->check_sat(assumptions.size(), assumptions.data());
}
catch (...) {
local_solver->collect_statistics(m_st);

8
src/solver/solver_na2as.cpp
View file

@ -64,17 +64,17 @@ struct append_assumptions {
lbool solver_na2as::check_sat_core(unsigned num_assumptions, expr * const * assumptions) {
append_assumptions app(m_assumptions, num_assumptions, assumptions);
TRACE("solver_na2as", display(tout););
return check_sat_core2(m_assumptions.size(), m_assumptions.c_ptr());
return check_sat_core2(m_assumptions.size(), m_assumptions.data());
}
lbool solver_na2as::check_sat_cc(const expr_ref_vector &assumptions, vector<expr_ref_vector> const &clauses) {
if (clauses.empty()) return check_sat(assumptions.size(), assumptions.c_ptr());
append_assumptions app(m_assumptions, assumptions.size(), assumptions.c_ptr());
if (clauses.empty()) return check_sat(assumptions.size(), assumptions.data());
append_assumptions app(m_assumptions, assumptions.size(), assumptions.data());
return check_sat_cc_core(m_assumptions, clauses);
}
lbool solver_na2as::get_consequences(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {
append_assumptions app(m_assumptions, asms.size(), asms.c_ptr());
append_assumptions app(m_assumptions, asms.size(), asms.data());
return get_consequences_core(m_assumptions, vars, consequences);
}

2
src/solver/solver_pool.cpp
View file

@ -290,7 +290,7 @@ private:
}
out << "(set-info :status " << lbool2status(last_status) << ")\n";
m_base->display(out, cube.size(), cube.c_ptr());
m_base->display(out, cube.size(), cube.data());
for (auto const& clause : clauses) {
out << ";; extra clause\n";
out << "(assert (or ";

2
src/solver/tactic2solver.cpp
View file

@ -229,7 +229,7 @@ lbool tactic2solver::check_sat_core2(unsigned num_assumptions, expr * const * as
if (m_produce_unsat_cores) {
ptr_vector<expr> core_elems;
m.linearize(core, core_elems);
m_result->m_core.append(core_elems.size(), core_elems.c_ptr());
m_result->m_core.append(core_elems.size(), core_elems.data());
}
m_tactic->cleanup();
return m_result->status();