mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-03 21:09:11 +00:00
Code Activity

refactor get_sort

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-02-02 04:45:54 -08:00
parent 4455f6caf8
commit 3ae4c6e9de
129 changed files with 362 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/muz/spacer/spacer_legacy_mev.cpp
View file

@ -363,7 +363,7 @@ void model_evaluator::inherit_value(expr* e, expr* v)
{
expr* w;
SASSERT(!is_unknown(v));
SASSERT(m.get_sort(e) == m.get_sort(v));
SASSERT(e->get_sort() == v->get_sort());
if (is_x(v)) {
set_x(e);
} else if (m.is_bool(e)) {
@ -807,7 +807,7 @@ expr_ref model_evaluator::eval(const model_ref& model, expr* e){
expr_ref_vector args(m);
expr_ref else_case(m);
if (extract_array_func_interp(result, stores, else_case)) {
result = m_array.mk_const_array(m.get_sort(e), else_case);
result = m_array.mk_const_array(e->get_sort(), else_case);
while (!stores.empty() && stores.back().back() == else_case) {
stores.pop_back();
}

2
src/muz/spacer/spacer_mev_array.cpp
View file

@ -198,7 +198,7 @@ void model_evaluator_array_util::eval(model& mdl, expr* e, expr_ref& r, bool mod
expr_ref_vector args(m);
expr_ref else_case(m);
if (extract_array_func_interp(mdl, r, stores, else_case)) {
r = m_array.mk_const_array(m.get_sort(e), else_case);
r = m_array.mk_const_array(e->get_sort(), else_case);
while (!stores.empty() && stores.back().back() == else_case) {
stores.pop_back();
}

6
src/muz/spacer/spacer_qe_project.cpp
View file

@ -273,13 +273,13 @@ namespace spacer_qe {
if (a.is_le(lit, e1, e2) || a.is_ge(lit, e2, e1)) {
if (!is_linear( mul, e1, c, ts) || !is_linear(-mul, e2, c, ts))
return false;
s = m.get_sort(e1);
s = e1->get_sort();
is_strict = is_not;
}
else if (a.is_lt(lit, e1, e2) || a.is_gt(lit, e2, e1)) {
if (!is_linear( mul, e1, c, ts) || !is_linear(-mul, e2, c, ts))
return false;
s = m.get_sort(e1);
s = e1->get_sort();
is_strict = !is_not;
}
else if (m.is_eq(lit, e1, e2) && a.is_int_real (e1)) {
@ -311,7 +311,7 @@ namespace spacer_qe {
if (is_not) is_diseq = true;
else is_eq = true;
}
s = m.get_sort(e1);
s = e1->get_sort();
}
else {
IF_VERBOSE(2, verbose_stream() << "can't project:" << mk_pp(lit, m) << "\n";);