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

[bit-set-invertible] Rewrite next/previous() using s.next/previous_range()

This commit is contained in:
Behdad Esfahbod 2021-08-19 11:19:24 -06:00
parent 248ad3bce5
commit eb98bc1e32
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/hb-bit-set-invertible.hh
View File

@ -181,21 +181,24 @@ struct hb_bit_set_invertible_t
return s.next (codepoint);
auto old = *codepoint;
do
auto v = old;
s.next (&v);
if (old + 1 < v)
{
auto v = old;
s.next (&v);
if (old + 1 < v)
{
*codepoint = old + 1;
return true;
}
old++;
*codepoint = old + 1;
return true;
}
while (old != INVALID);
*codepoint = INVALID;
return false;
if (unlikely (old + 1 == INVALID))
{
*codepoint = INVALID;
return false;
}
s.next_range (&old, &v);
*codepoint = v + 1;
return *codepoint != INVALID;
}
bool previous (hb_codepoint_t *codepoint) const
{
@ -203,21 +206,24 @@ struct hb_bit_set_invertible_t
return s.previous (codepoint);
auto old = *codepoint;
do
auto v = old;
s.previous (&v);
if (old - 1 > v)
{
auto v = old;
s.previous (&v);
if (old - 1 > v)
{
*codepoint = old - 1;
return true;
}
old--;
*codepoint = old - 1;
return true;
}
while (old != INVALID);
*codepoint = INVALID;
return false;
if (unlikely (old - 1 == INVALID))
{
*codepoint = INVALID;
return false;
}
s.previous_range (&v, &old);
*codepoint = v - 1;
return *codepoint != INVALID;
}
bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const
{