mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-14 03:04:44 +00:00
Code Activity

Remove int64, uint64 typedefs in favor of int64_t / uint64_t.

Browse source
This commit is contained in:
Bruce Mitchener 2018-03-31 14:45:04 +07:00
parent 16a2ad9afd
commit 2fa304d8de
80 changed files with 437 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/util/total_order.h
View file

@ -35,7 +35,7 @@ class total_order {
struct cell {
cell * m_next;
cell * m_prev;
uint64 m_val;
uint64_t m_val;
T m_data;
};
@ -53,11 +53,11 @@ class total_order {
m_base.m_val = 0;
}
uint64 v(cell * a) const { return a->m_val; }
uint64_t v(cell * a) const { return a->m_val; }
uint64 vb(cell * a) const { return v(a) - v(base()); }
uint64_t vb(cell * a) const { return v(a) - v(base()); }
uint64 vbn(cell * a) const { return a->m_next == base() ? UINT64_MAX : vb(a->m_next); }
uint64_t vbn(cell * a) const { return a->m_next == base() ? UINT64_MAX : vb(a->m_next); }
cell * mk_cell(T const & a) {
SASSERT(!m_map.contains(a));
@ -84,18 +84,18 @@ class total_order {
}
void _insert_after(cell * a, cell * b) {
uint64 vb_a = vb(a);
uint64 vbn_a = vbn(a);
uint64_t vb_a = vb(a);
uint64_t vbn_a = vbn(a);
SASSERT(vb_a < vbn_a);
if (vbn_a < 2 || (vb_a > vbn_a - 2)) {
TRACE("total_order", tout << "relabeling...\n"; tout << "\n";);
uint64 v0 = v(a);
unsigned sz = size();
uint64 ideal_gap = UINT64_MAX / sz;
uint64 goal_gap = ideal_gap / 32;
cell * c = a->m_next->m_next;
unsigned j = 2;
uint64 curr_gap = (v(c) - v0) / j;
uint64_t v0 = v(a);
unsigned sz = size();
uint64_t ideal_gap = UINT64_MAX / sz;
uint64_t goal_gap = ideal_gap / 32;
cell * c = a->m_next->m_next;
unsigned j = 2;
uint64_t curr_gap = (v(c) - v0) / j;
while (j < sz && curr_gap < goal_gap) {
j++;
c = c->m_next;
@ -105,7 +105,7 @@ class total_order {
if (j == sz)
curr_gap = ideal_gap;
c = a->m_next;
uint64 inc = curr_gap;
uint64_t inc = curr_gap;
for (unsigned i = 0; i < j; i++) {
c->m_val = v0 + inc;
c = c->m_next;
@ -116,7 +116,7 @@ class total_order {
vbn_a = vbn(a);
}
SASSERT(vb_a <= vbn_a - 2);
uint64 vb_b = vb_a + ((vbn_a - vb_a)/2);
uint64_t vb_b = vb_a + ((vbn_a - vb_a)/2);
SASSERT(vb_b > vb_a);
SASSERT(vb_b < vbn_a);
b->m_val = vb_b + v(base());