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

Use constexpr to replace passthru_ bools

Browse Source
This commit is contained in:
Behdad Esfahbod 2019-07-02 19:15:03 -07:00
parent 2e48fd0779
commit c4aa10ebc8
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-algs.hh
View File

@ -915,32 +915,24 @@ hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *o
struct hb_bitwise_and
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = false;
static constexpr bool passthru_right = false;
template <typename T> constexpr auto
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & b)
}
HB_FUNCOBJ (hb_bitwise_and);
struct hb_bitwise_or
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = true;
template <typename T> constexpr auto
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a | b)
}
HB_FUNCOBJ (hb_bitwise_or);
struct hb_bitwise_xor
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = true;
template <typename T> constexpr auto
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a ^ b)
}
HB_FUNCOBJ (hb_bitwise_xor);
struct hb_bitwise_sub
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = false;
template <typename T> constexpr auto
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & ~b)
}

18
src/hb-set.hh
View File

@ -448,6 +448,8 @@ struct hb_set_t
dirty ();
constexpr bool passthru_left = op (0, 0) || op (1, 0);
constexpr bool passthru_right = op (0, 0) || op (0, 1);
unsigned int na = pages.length;
unsigned int nb = other->pages.length;
unsigned int next_page = na;
@ -464,20 +466,20 @@ struct hb_set_t
}
else if (page_map[a].major < other->page_map[b].major)
{
if (Op::passthru_left)
if (passthru_left)
count++;
a++;
}
else
{
if (Op::passthru_right)
if (passthru_right)
count++;
b++;
}
}
if (Op::passthru_left)
if (passthru_left)
count += na - a;
if (Op::passthru_right)
if (passthru_right)
count += nb - b;
if (count > pages.length)
@ -501,7 +503,7 @@ struct hb_set_t
else if (page_map[a - 1].major > other->page_map[b - 1].major)
{
a--;
if (Op::passthru_left)
if (passthru_left)
{
count--;
page_map[count] = page_map[a];
@ -510,7 +512,7 @@ struct hb_set_t
else
{
b--;
if (Op::passthru_right)
if (passthru_right)
{
count--;
page_map[count].major = other->page_map[b].major;
@ -519,14 +521,14 @@ struct hb_set_t
}
}
}
if (Op::passthru_left)
if (passthru_left)
while (a)
{
a--;
count--;
page_map[count] = page_map [a];
}
if (Op::passthru_right)
if (passthru_right)
while (b)
{
b--;