mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +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

22
src/tactic/core/elim_uncnstr_tactic.cpp
View file

@ -92,7 +92,7 @@ class elim_uncnstr_tactic : public tactic {
return false; // variable already existed for this application
}
v = m().mk_fresh_const(nullptr, m().get_sort(t));
v = m().mk_fresh_const(nullptr, t->get_sort());
TRACE("elim_uncnstr_bug", tout << "eliminating:\n" << mk_ismt2_pp(t, m()) << "\n";);
TRACE("elim_uncnstr_bug_ll", tout << "eliminating:\n" << mk_bounded_pp(t, m()) << "\n";);
m_fresh_vars.push_back(v);
@ -131,7 +131,7 @@ class elim_uncnstr_tactic : public tactic {
// return a term that is different from t.
bool mk_diff(expr * t, expr_ref & r) {
sort * s = m().get_sort(t);
sort * s = t->get_sort();
if (m().is_bool(s)) {
r = m().mk_not(t);
return true;
@ -221,7 +221,7 @@ class elim_uncnstr_tactic : public tactic {
return nullptr;
}
sort * s = m().get_sort(arg1);
sort * s = arg1->get_sort();
// Remark:
// I currently do not support unconstrained vars that have
@ -359,7 +359,7 @@ class elim_uncnstr_tactic : public tactic {
return u;
// v = ite(u, t, t + 1) if le
// v = ite(u, t, t - 1) if !le
add_def(v, m().mk_ite(u, t, m_a_util.mk_add(t, m_a_util.mk_numeral(rational(le ? 1 : -1), m().get_sort(arg1)))));
add_def(v, m().mk_ite(u, t, m_a_util.mk_add(t, m_a_util.mk_numeral(rational(le ? 1 : -1), arg1->get_sort()))));
return u;
}
@ -405,7 +405,7 @@ class elim_uncnstr_tactic : public tactic {
app * process_arith_mul(func_decl * f, unsigned num, expr * const * args) {
if (num == 0)
return nullptr;
sort * s = m().get_sort(args[0]);
sort * s = args[0]->get_sort();
if (uncnstr(num, args)) {
app * r;
if (!mk_fresh_uncnstr_var_for(f, num, args, r))
@ -455,7 +455,7 @@ class elim_uncnstr_tactic : public tactic {
if (num == 0)
return nullptr;
if (uncnstr(num, args)) {
sort * s = m().get_sort(args[0]);
sort * s = args[0]->get_sort();
app * r;
if (!mk_fresh_uncnstr_var_for(f, num, args, r))
return r;
@ -474,7 +474,7 @@ class elim_uncnstr_tactic : public tactic {
app * r;
if (!mk_fresh_uncnstr_var_for(f, num, args, r))
return r;
sort * s = m().get_sort(args[1]);
sort * s = args[1]->get_sort();
if (m_mc)
add_def(args[1], m_bv_util.mk_bv_mul(m_bv_util.mk_numeral(inv, s), r));
return r;
@ -492,7 +492,7 @@ class elim_uncnstr_tactic : public tactic {
return r;
unsigned high = m_bv_util.get_extract_high(f);
unsigned low = m_bv_util.get_extract_low(f);
unsigned bv_size = m_bv_util.get_bv_size(m().get_sort(arg));
unsigned bv_size = m_bv_util.get_bv_size(arg->get_sort());
if (bv_size == high - low + 1) {
add_def(arg, r);
}
@ -510,7 +510,7 @@ class elim_uncnstr_tactic : public tactic {
app * process_bv_div(func_decl * f, expr * arg1, expr * arg2) {
if (uncnstr(arg1) && uncnstr(arg2)) {
sort * s = m().get_sort(arg1);
sort * s = arg1->get_sort();
app * r;
if (!mk_fresh_uncnstr_var_for(f, arg1, arg2, r))
return r;
@ -630,7 +630,7 @@ class elim_uncnstr_tactic : public tactic {
return nullptr;
case OP_BOR:
if (num > 0 && uncnstr(num, args)) {
sort * s = m().get_sort(args[0]);
sort * s = args[0]->get_sort();
app * r;
if (!mk_fresh_uncnstr_var_for(f, num, args, r))
return r;
@ -652,7 +652,7 @@ class elim_uncnstr_tactic : public tactic {
app * r;
if (!mk_fresh_uncnstr_var_for(f, num, args, r))
return r;
sort * s = m().get_sort(args[0]);
sort * s = args[0]->get_sort();
if (m_mc)
add_def(args[0], m_ar_util.mk_const_array(s, r));
return r;

4
src/tactic/core/reduce_invertible_tactic.cpp
View file

@ -409,7 +409,7 @@ private:
// diagonal functions for other types depend on theory.
return false;
}
else if (is_var(v) && is_non_singleton_sort(m.get_sort(v))) {
else if (is_var(v) && is_non_singleton_sort(v->get_sort())) {
new_v = m.mk_var(to_var(v)->get_idx(), m.mk_bool_sort());
return true;
}
@ -484,7 +484,7 @@ private:
TRACE("invertible_tactic", tout << mk_pp(v, m) << " " << mk_pp(p, m) << "\n";);
t.mark_inverted(p);
sub.insert(p, new_v);
new_sorts[i] = m.get_sort(new_v);
new_sorts[i] = new_v->get_sort();
has_new_var |= new_v != v;
}
}