mirror of
https://github.com/Z3Prover/z3
synced 2025-08-21 02:30:23 +00:00
merge with unstable branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
commit
3ba2e712b2
72 changed files with 925 additions and 930 deletions
|
@ -1881,8 +1881,8 @@ void fpa2bv_converter::mk_to_fp(func_decl * f, unsigned num, expr * const * args
|
|||
else if (num == 2 &&
|
||||
m_bv_util.is_bv(args[0]) &&
|
||||
m_bv_util.get_bv_size(args[0]) == 3 &&
|
||||
m_arith_util.is_int(args[1]) ||
|
||||
m_arith_util.is_real(args[1])) {
|
||||
(m_arith_util.is_int(args[1]) ||
|
||||
m_arith_util.is_real(args[1]))) {
|
||||
// rm + real -> float
|
||||
mk_to_fp_real(f, f->get_range(), args[0], args[1], result);
|
||||
}
|
||||
|
|
|
@ -107,7 +107,7 @@ unsigned used_vars::get_num_vars() const {
|
|||
unsigned num = m_found_vars.size();
|
||||
for (unsigned i = 0; i < num; i++) {
|
||||
if (m_found_vars[i])
|
||||
return r++;
|
||||
r++;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue