mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-06-29 03:48:51 +00:00
Code Activity

fix

Browse source
This commit is contained in:
Nuno Lopes 2026-02-15 16:45:38 +00:00
parent 0a22332196
commit bd993ca963
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/util/mpq.h
View file

@ -672,8 +672,11 @@ public:
set(target.m_den, source.m_den); set(target.m_den, source.m_den);
} }
void set(mpz & a, int val) { mpz_manager<SYNCH>::set(a, val); }
void set(mpz & a, int64_t val) { mpz_manager<SYNCH>::set(a, val); } void set(mpz & a, int64_t val) { mpz_manager<SYNCH>::set(a, val); }
void set(mpq & a, int val) { set(a, (int64_t)val); }
void set(mpq & a, int64_t val) { void set(mpq & a, int64_t val) {
set(a.m_num, val); set(a.m_num, val);
reset_denominator(a); reset_denominator(a);

11
src/util/mpz.h
View file

@ -159,6 +159,14 @@ public:
SASSERT(fits_in_small(v)); SASSERT(fits_in_small(v));
} }
mpz(int v) noexcept : m_value(static_cast<uintptr_t>(v) << 1) {
SASSERT(fits_in_small(v));
}
mpz(unsigned v) noexcept : m_value(static_cast<uintptr_t>(v) << 1) {
SASSERT(fits_in_small(v));
}
mpz(mpz_type* ptr) noexcept { mpz(mpz_type* ptr) noexcept {
set_ptr(ptr, false, true); // external pointer, non-negative set_ptr(ptr, false, true); // external pointer, non-negative
} }
@ -600,6 +608,9 @@ public:
void set(mpz & a, char const * val); void set(mpz & a, char const * val);
void set(mpz & a, int val) { set(a, (int64_t)val); }
void set(mpz & a, unsigned val) { set(a, (uint64_t)val); }
void set(mpz & a, int64_t val) { void set(mpz & a, int64_t val) {
if (mpz::fits_in_small(val) && is_small(a)) { if (mpz::fits_in_small(val) && is_small(a)) {
a.set(val); a.set(val);

8
src/util/rational.h
View file

@ -46,6 +46,8 @@ public:
rational(rational const & r) { m().set(m_val, r.m_val); } rational(rational const & r) { m().set(m_val, r.m_val); }
rational(rational&&) = default; rational(rational&&) = default;
explicit rational(int n) { m().set(m_val, n); }
explicit rational(unsigned n) { m().set(m_val, n); }
explicit rational(int64_t n) { m().set(m_val, n); } explicit rational(int64_t n) { m().set(m_val, n); }
explicit rational(uint64_t n) { m().set(m_val, n); } explicit rational(uint64_t n) { m().set(m_val, n); }
@ -289,7 +291,7 @@ public:
rational r = mod(a,b); rational r = mod(a,b);
SASSERT(r.is_nonneg()); SASSERT(r.is_nonneg());
rational r2 = r; rational r2 = r;
r2 *= rational(uint64_t(2)); r2 *= rational(2);
if (operator<(b, r2)) { if (operator<(b, r2)) {
r -= b; r -= b;
} }
@ -509,11 +511,11 @@ public:
} }
unsigned get_num_bits() const { unsigned get_num_bits() const {
return get_num_digits(rational(uint64_t(2))); return get_num_digits(rational(2));
} }
unsigned get_num_decimal() const { unsigned get_num_decimal() const {
return get_num_digits(rational(uint64_t(10))); return get_num_digits(rational(10));
} }
/** /**