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

[algs] Change hb_bind parameter number to be from one 

To match std:;bind, even though our interfaces are very different.
This commit is contained in:
Behdad Esfahbod 2019-05-15 21:36:42 -07:00
parent dfa5e42971
commit 0888e7bc86
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/hb-algs.hh
View File

@ -124,9 +124,11 @@ struct hb_binder_t
{
hb_binder_t (Appl a, V v) : a (a), v (v) {}
static_assert (Pos > 0, "");
template <typename ...Ts,
unsigned P = Pos,
hb_enable_if (P == 0)> auto
hb_enable_if (P == 1)> auto
operator () (Ts&& ...ds) -> decltype (hb_invoke (hb_declval (Appl),
hb_declval (V),
hb_declval (Ts)...))
@ -137,7 +139,7 @@ struct hb_binder_t
}
template <typename T0, typename ...Ts,
unsigned P = Pos,
hb_enable_if (P == 1)> auto
hb_enable_if (P == 2)> auto
operator () (T0&& d0, Ts&& ...ds) -> decltype (hb_invoke (hb_declval (Appl),
hb_declval (T0),
hb_declval (V),
@ -793,7 +795,7 @@ hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *o
/* Operators. */
struct hb_bitwise_and
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = false;
static constexpr bool passthru_right = false;
template <typename T> auto
@ -801,7 +803,7 @@ struct hb_bitwise_and
}
HB_FUNCOBJ (hb_bitwise_and);
struct hb_bitwise_or
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = true;
template <typename T> auto
@ -809,7 +811,7 @@ struct hb_bitwise_or
}
HB_FUNCOBJ (hb_bitwise_or);
struct hb_bitwise_xor
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = true;
template <typename T> auto
@ -817,7 +819,7 @@ struct hb_bitwise_xor
}
HB_FUNCOBJ (hb_bitwise_xor);
struct hb_bitwise_sub
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
static constexpr bool passthru_left = true;
static constexpr bool passthru_right = false;
template <typename T> auto
@ -826,31 +828,31 @@ struct hb_bitwise_sub
HB_FUNCOBJ (hb_bitwise_sub);
struct
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
template <typename T, typename T2> auto
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a + b)
}
HB_FUNCOBJ (hb_add);
struct
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
template <typename T, typename T2> auto
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a - b)
}
HB_FUNCOBJ (hb_sub);
struct
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
template <typename T, typename T2> auto
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a * b)
}
HB_FUNCOBJ (hb_mul);
struct
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
template <typename T, typename T2> auto
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a / b)
}
HB_FUNCOBJ (hb_div);
struct
{ HB_PARTIALIZE(1);
{ HB_PARTIALIZE(2);
template <typename T, typename T2> auto
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a % b)
}

6
src/test-algs.cc
View File

@ -77,10 +77,10 @@ main (int argc, char **argv)
xp = hb_pair_t<int *, double> (nullptr, 1);
xp = hb_pair_t<const int*, int> (nullptr, 1);
assert (3 == hb_bind<0> (hb_min, 3) (4));
assert (3 == hb_bind<0> (hb_min, 4) (3));
assert (3 == hb_bind<1> (hb_min, 3) (4));
assert (3 == hb_bind<2> (hb_min, 4) (3));
auto M0 = hb_bind<1> (hb_max, 0);
auto M0 = hb_bind<2> (hb_max, 0);
assert (M0 (-2) == 0);
assert (M0 (+2) == 2);