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

[set] Add "inverted" to page_t::next/prev()

This commit is contained in:
Behdad Esfahbod 2021-08-15 11:42:16 -06:00
parent c88e7ec935
commit 9bd64fa077
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-set.hh
View File

@ -133,7 +133,7 @@ struct hb_set_t
return pop; return pop;
} }
bool next (hb_codepoint_t *codepoint) const bool next (hb_codepoint_t *codepoint, bool inverted = false) const
{ {
unsigned int m = (*codepoint + 1) & MASK; unsigned int m = (*codepoint + 1) & MASK;
if (!m) if (!m)
@ -145,7 +145,9 @@ struct hb_set_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 (elt_t p = vv; i < len (); p = v[++i]) for (elt_t p = elt_maybe_invert (vv, inverted);
i < len ();
p = elt_maybe_invert (v[++i], inverted))
if (p) if (p)
{ {
*codepoint = i * ELT_BITS + elt_get_min (p); *codepoint = i * ELT_BITS + elt_get_min (p);
@ -155,7 +157,7 @@ struct hb_set_t
*codepoint = INVALID; *codepoint = INVALID;
return false; return false;
} }
bool previous (hb_codepoint_t *codepoint) const bool previous (hb_codepoint_t *codepoint, bool inverted = false) const
{ {
unsigned int m = (*codepoint - 1) & MASK; unsigned int m = (*codepoint - 1) & MASK;
if (m == MASK) if (m == MASK)
@ -171,7 +173,7 @@ struct hb_set_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;
elt_t p = vv; elt_t p = elt_maybe_invert (vv, inverted);
while (true) while (true)
{ {
if (p) if (p)
@ -180,7 +182,7 @@ struct hb_set_t
return true; return true;
} }
if ((int) i <= 0) break; if ((int) i <= 0) break;
p = v[--i]; p = elt_maybe_invert (v[--i], inverted);
} }
*codepoint = INVALID; *codepoint = INVALID;