3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-20 10:10:21 +00:00

fix build, refactor

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

View file

@ -64,9 +64,9 @@ struct enum2bv_rewriter::imp {
unsigned bv_size = get_bv_size(s);
sort_ref bv_sort(m_bv.mk_sort(bv_size), m);
if (is_unate(s))
return m_bv.mk_numeral(rational((1 << idx) - 1), bv_sort);
return m_bv.mk_numeral(rational((1 << idx) - 1), bv_sort.get());
else
return m_bv.mk_numeral(rational(idx), bv_sort);
return m_bv.mk_numeral(rational(idx), bv_sort.get());
}
void constrain_domain(expr* x, sort* s, sort* bv_sort) {

View file

@ -99,7 +99,7 @@ void expr_safe_replace::operator()(expr* e, expr_ref& res) {
if (d) {
m_args.push_back(d);
arg_differs |= arg != d;
SASSERT(arg->get_sort() == m.get_sort(d));
SASSERT(arg->get_sort() == d->get_sort());
}
else {
m_todo.push_back(arg);

View file

@ -43,7 +43,7 @@ expr_ref func_decl_replace::operator()(expr* e) {
if (m_cache.find(arg, d)) {
m_args.push_back(d);
arg_differs |= arg != d;
SASSERT(arg->get_sort() == m.get_sort(d));
SASSERT(arg->get_sort() == d->get_sort());
}
else {
m_todo.push_back(arg);