mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-18 09:12:16 +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

8
src/ast/fpa/fpa2bv_converter.cpp
View file

@ -2415,7 +2415,7 @@ void fpa2bv_converter::mk_to_fp(func_decl * f, unsigned num, expr * const * args
}
else if (num == 2 &&
m_util.is_rm(args[0]) &&
m_util.is_float(m.get_sort(args[1]))) {
m_util.is_float(args[1]->get_sort())) {
// rm + float -> float
mk_to_fp_float(f, f->get_range(), args[0], args[1], result);
}
@ -3223,7 +3223,7 @@ void fpa2bv_converter::mk_to_ieee_bv_unspecified(func_decl * f, unsigned num, ex
else {
expr_ref nw = nan_wrap(args[0]);
sort * domain[1] = { m.get_sort(nw) };
sort * domain[1] = { nw->get_sort() };
func_decl * f_bv = mk_bv_uf(f, domain, f->get_range());
result = m.mk_app(f_bv, nw);
@ -3439,7 +3439,7 @@ void fpa2bv_converter::mk_to_bv_unspecified(func_decl * f, unsigned num, expr *
else {
expr * rm_bv = to_app(args[0])->get_arg(0);
expr_ref nw = nan_wrap(args[1]);
sort * domain[2] = { m.get_sort(rm_bv), m.get_sort(nw) };
sort * domain[2] = { rm_bv->get_sort(), nw->get_sort() };
func_decl * f_bv = mk_bv_uf(f, domain, f->get_range());
result = m.mk_app(f_bv, rm_bv, nw);
}
@ -3456,7 +3456,7 @@ void fpa2bv_converter::mk_to_real_unspecified(func_decl * f, unsigned num, expr
else {
expr * n = args[0];
expr_ref nw = nan_wrap(n);
sort * domain[1] = { m.get_sort(nw) };
sort * domain[1] = { nw->get_sort() };
func_decl * f_bv = mk_bv_uf(f, domain, f->get_range());
result = m.mk_app(f_bv, nw);
}

4
src/ast/rewriter/enum2bv_rewriter.cpp
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) {

2
src/ast/rewriter/expr_safe_replace.cpp
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);

2
src/ast/rewriter/func_decl_replace.cpp
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);