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

@ -313,7 +313,7 @@ namespace arith {
expr* e2 = n2->get_expr();
if (m.is_ite(e1) || m.is_ite(e2))
return;
if (e1->get_sort() != m.get_sort(e2))
if (e1->get_sort() != e2->get_sort())
return;
reset_evidence();
for (auto const& ev : e)
@ -612,7 +612,7 @@ namespace arith {
SASSERT("integer variables should have integer values: " && (!a.is_int(o) || r.is_int() || m.limit().is_canceled()));
if (a.is_int(o) && !r.is_int())
r = floor(r);
value = a.mk_numeral(r, m.get_sort(o));
value = a.mk_numeral(r, o->get_sort());
}
else if (a.is_arith_expr(o)) {
expr_ref_vector args(m);

6
src/sat/smt/array_axioms.cpp
View file

@ -425,7 +425,7 @@ namespace array {
bool solver::has_unitary_domain(app* array_term) {
SASSERT(a.is_array(array_term));
sort* s = m.get_sort(array_term);
sort* s = array_term->get_sort();
unsigned dim = get_array_arity(s);
for (unsigned i = 0; i < dim; ++i) {
sort* d = get_array_domain(s, i);
@ -437,7 +437,7 @@ namespace array {
bool solver::has_large_domain(expr* array_term) {
SASSERT(a.is_array(array_term));
sort* s = m.get_sort(array_term);
sort* s = array_term->get_sort();
unsigned dim = get_array_arity(s);
rational sz(1);
for (unsigned i = 0; i < dim; ++i) {
@ -504,7 +504,7 @@ namespace array {
for (unsigned j = i; j-- > 0; ) {
theory_var v2 = roots[j];
expr* e2 = var2expr(v2);
if (e1->get_sort() != m.get_sort(e2))
if (e1->get_sort() != e2->get_sort())
continue;
if (have_different_model_values(v1, v2))
continue;

2
src/sat/smt/dt_solver.cpp
View file

@ -511,7 +511,7 @@ namespace dt {
};
for (enode* arg : euf::enode_args(parentc)) {
add(arg);
sort* s = m.get_sort(arg->get_expr());
sort* s = arg->get_expr()->get_sort();
if (m_autil.is_array(s) && dt.is_datatype(get_array_range(s)))
for (enode* aarg : get_array_args(arg))
add(aarg);

2
src/sat/smt/q_mbi.cpp
View file

@ -553,7 +553,7 @@ namespace q {
}
mbp::project_plugin* mbqi::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);
}

2
src/sat/smt/q_solver.cpp
View file

@ -181,7 +181,7 @@ namespace q {
if (!m_unit_table.empty())
return;
for (euf::enode* n : ctx.get_egraph().nodes()) {
if (!n->interpreted() && !m.is_uninterp(m.get_sort(n->get_expr())))
if (!n->interpreted() && !m.is_uninterp(n->get_expr()->get_sort()))
continue;
expr* e = n->get_expr();
sort* s = e->get_sort();