walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[bit-page] Remove unused inverted code

This commit is contained in:
Behdad Esfahbod 2021-08-19 13:32:44 -06:00
parent 87885e6f02
commit ec4812a7d4
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/hb-bit-page.hh
View File

@ -38,10 +38,10 @@ struct hb_bit_page_t
constexpr unsigned len () const constexpr unsigned len () const
{ return ARRAY_LENGTH_CONST (v); } { return ARRAY_LENGTH_CONST (v); }
bool is_empty (bool inverted = false) const bool is_empty () const
{ {
for (unsigned int i = 0; i < len (); i++) for (unsigned int i = 0; i < len (); i++)
if (elt_maybe_invert (v[i], inverted)) if (v[i])
return false; return false;
return true; return true;
} }
@ -106,7 +106,7 @@ struct hb_bit_page_t
return pop; return pop;
} }
bool next (hb_codepoint_t *codepoint, bool inverted = false) const bool next (hb_codepoint_t *codepoint) const
{ {
unsigned int m = (*codepoint + 1) & MASK; unsigned int m = (*codepoint + 1) & MASK;
if (!m) if (!m)
@ -118,22 +118,17 @@ struct hb_bit_page_t
unsigned int j = m & ELT_MASK; unsigned int j = m & ELT_MASK;
const elt_t vv = v[i] & ~((elt_t (1) << j) - 1); const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
for (const elt_t *pp = &vv; for (const elt_t *p = &vv; i < len (); p = &v[++i])
i < len (); if (*p)
pp = &v[++i])
{
const elt_t p = elt_maybe_invert (*pp, inverted);
if (p)
{ {
*codepoint = i * ELT_BITS + elt_get_min (p); *codepoint = i * ELT_BITS + elt_get_min (*p);
return true; return true;
} }
}
*codepoint = INVALID; *codepoint = INVALID;
return false; return false;
} }
bool previous (hb_codepoint_t *codepoint, bool inverted = false) const bool previous (hb_codepoint_t *codepoint) const
{ {
unsigned int m = (*codepoint - 1) & MASK; unsigned int m = (*codepoint - 1) & MASK;
if (m == MASK) if (m == MASK)
@ -149,40 +144,33 @@ struct hb_bit_page_t
((elt_t (1) << (j + 1)) - 1) : ((elt_t (1) << (j + 1)) - 1) :
(elt_t) -1; (elt_t) -1;
const elt_t vv = v[i] & mask; const elt_t vv = v[i] & mask;
const elt_t *pp = &vv; const elt_t *p = &vv;
while (true) while (true)
{ {
const elt_t p = elt_maybe_invert (*pp, inverted); if (*p)
if (p)
{ {
*codepoint = i * ELT_BITS + elt_get_max (p); *codepoint = i * ELT_BITS + elt_get_max (*p);
return true; return true;
} }
if ((int) i <= 0) break; if ((int) i <= 0) break;
pp = &v[--i]; p = &v[--i];
} }
*codepoint = INVALID; *codepoint = INVALID;
return false; return false;
} }
hb_codepoint_t get_min (bool inverted = false) const hb_codepoint_t get_min () const
{ {
for (unsigned int i = 0; i < len (); i++) for (unsigned int i = 0; i < len (); i++)
{ if (v[i])
elt_t e = elt_maybe_invert (v[i], inverted); return i * ELT_BITS + elt_get_min (v[i]);
if (e)
return i * ELT_BITS + elt_get_min (e);
}
return INVALID; return INVALID;
} }
hb_codepoint_t get_max (bool inverted = false) const hb_codepoint_t get_max () const
{ {
for (int i = len () - 1; i >= 0; i--) for (int i = len () - 1; i >= 0; i--)
{ if (v[i])
elt_t e = elt_maybe_invert (v[i], inverted); return i * ELT_BITS + elt_get_max (v[i]);
if (e)
return i * ELT_BITS + elt_get_max (e);
}
return 0; return 0;
} }
@ -194,7 +182,6 @@ struct hb_bit_page_t
static unsigned int elt_get_min (const elt_t &elt) { return hb_ctz (elt); } static unsigned int elt_get_min (const elt_t &elt) { return hb_ctz (elt); }
static unsigned int elt_get_max (const elt_t &elt) { return hb_bit_storage (elt) - 1; } static unsigned int elt_get_max (const elt_t &elt) { return hb_bit_storage (elt) - 1; }
static elt_t elt_maybe_invert (elt_t elt, bool inverted) { return inverted ? ~elt : elt; }
typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t; typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t;