mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +00:00
Code Activity

fix build, refactor

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-02-02 05:26:57 -08:00
parent 3ae4c6e9de
commit 937b61fc88
53 changed files with 145 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qe/mbp/mbp_arrays.cpp
View file

@ -1257,7 +1257,7 @@ namespace mbp {
if (s == m_var->x()) {
expr_ref result(t, m);
expr_ref_vector args(m);
sort* range = get_array_range(m.get_sort(s));
sort* range = get_array_range(s->get_sort());
for (unsigned i = 0; i < idxs.size(); ++i) {
app_ref var(m), sel(m);
expr_ref val(m);
@ -1559,7 +1559,7 @@ namespace mbp {
lits.push_back(m.mk_eq(a1, a2));
}
else {
sort* s = m.get_sort(store->get_arg(indices.size() + 1));
sort* s = store->get_arg(indices.size() + 1)->get_sort();
for (app* idx : *m_indices[s]) {
indices.push_back(idx);
assert_store_select(indices, store, mdl, tg, lits);

2
src/qe/nlarith_util.cpp
View file

@ -67,7 +67,7 @@ namespace nlarith {
ast_manager& m = m_lits.get_manager();
std::string name = m_x->get_decl()->get_name().str();
name += suffix;
sort* r = m.get_sort(m_x);
sort* r = m_x->get_sort();
v= m.mk_const(symbol(name.c_str()), r);
}
};

2
src/qe/qe.cpp
View file

@ -2075,7 +2075,7 @@ namespace qe {
for (unsigned i = 0; i < num_vars; ++i) {
contains_app contains_x(m, vars[i]);
if (contains_x(fml)) {
sorts.push_back(m.get_sort(vars[i]));
sorts.push_back(vars[i]->get_sort());
names.push_back(vars[i]->get_decl()->get_name());
free_vars.push_back(vars[i]);
}

2
src/qe/qe_arith_plugin.cpp
View file

@ -1037,7 +1037,7 @@ namespace qe {
app_ref x(m_ctx.get_var(index-1), m);
app_ref z(m);
expr_ref p1(m);
sort* s = m.get_sort(p);
sort* s = p->get_sort();
if (is_aux) {
// An auxiliary variable was introduced in lieu of 'x'.
// it has coefficient 'm' = values[index].

6
src/qe/qe_array_plugin.cpp
View file

@ -92,7 +92,7 @@ namespace qe {
for (unsigned i = 0; i < sz; ++i) {
expr_ref save(m);
save = lhs = args[i].get();
args[i] = arith.mk_numeral(rational(0), m.get_sort(lhs));
args[i] = arith.mk_numeral(rational(0), lhs->get_sort());
rhs = arith.mk_uminus(arith.mk_add(args.size(), args.c_ptr()));
if (arith.is_mul(lhs, e1, e2) &&
arith.is_numeral(e1, r) &&
@ -165,7 +165,7 @@ namespace qe {
expr_ref store_B_i_t(m);
unsigned num_args = args[0].size();
B = m.mk_fresh_const("B", m.get_sort(A));
B = m.mk_fresh_const("B", A->get_sort());
ptr_buffer<expr> args2;
args2.push_back(B);
for (unsigned i = 0; i < num_args; ++i) {
@ -232,7 +232,7 @@ namespace qe {
for (unsigned i = args.size(); i > 0; ) {
--i;
args2.reset();
w = m.mk_fresh_const("w", m.get_sort(args[i].back()));
w = m.mk_fresh_const("w", args[i].back()->get_sort());
args2.push_back(store_T);
args2.append(args[i]);

6
src/qe/qe_dl_plugin.cpp
View file

@ -116,12 +116,12 @@ namespace qe {
private:
bool is_small_domain(contains_app& x, eq_atoms& eqs, uint64_t& domain_size) {
VERIFY(m_util.try_get_size(m.get_sort(x.x()), domain_size));
VERIFY(m_util.try_get_size(x.x()->get_sort(), domain_size));
return domain_size < eqs.num_eqs() + eqs.num_neqs();
}
void assign_small_domain(contains_app & x,eq_atoms& eqs, unsigned value) {
expr_ref vl(m_util.mk_numeral(value, m.get_sort(x.x())), m);
expr_ref vl(m_util.mk_numeral(value, x.x()->get_sort()), m);
expr_ref eq(m.mk_eq(x.x(), vl), m);
m_ctx.add_constraint(true, eq);
}
@ -145,7 +145,7 @@ namespace qe {
}
void subst_small_domain(contains_app & x,eq_atoms& eqs, unsigned v,expr_ref & fml) {
expr_ref vl(m_util.mk_numeral(v, m.get_sort(x.x())), m);
expr_ref vl(m_util.mk_numeral(v, x.x()->get_sort()), m);
m_replace.apply_substitution(x.x(), vl, fml);
}

2
src/qe/qe_lite.cpp
View file

@ -2307,7 +2307,7 @@ public:
ptr_vector<sort> sorts;
svector<symbol> names;
for (unsigned i = 0; i < vars.size(); ++i) {
sorts.push_back(m.get_sort(vars[i].get()));
sorts.push_back(vars[i]->get_sort());
names.push_back(vars[i]->get_decl()->get_name());
}
q = m.mk_exists(vars.size(), sorts.c_ptr(), names.c_ptr(), tmp, 1, qe_lite);

4
src/qe/qe_mbp.cpp
View file

@ -55,7 +55,7 @@ class mbproj::impl {
}
mbp::project_plugin* get_plugin(app* var) {
family_id fid = m.get_sort(var)->get_family_id();
family_id fid = var->get_sort()->get_family_id();
return m_plugins.get(fid, nullptr);
}
@ -168,7 +168,7 @@ class mbproj::impl {
expr* e1, * e2;
if (m_array.is_select(n)) {
for (expr* arg : *n) {
if (arg->get_sort() == m.get_sort(m_var) && arg != m_var)
if (arg->get_sort() == m_var->get_sort() && arg != m_var)
m_res.push_back(arg);
}
}