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

[iter] Rename

This commit is contained in:
Behdad Esfahbod 2019-01-29 13:39:19 -08:00
parent e75b22039f
commit 84a25d79c6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-array.hh
View File

@ -39,7 +39,7 @@ struct hb_sorted_array_t;
template <typename Type>
struct hb_array_t :
hb_iter_t<hb_array_t<Type>, Type&>,
hb_iter_mixin_t<hb_array_t<Type>, Type&>
hb_iter_fallback_mixin_t<hb_array_t<Type>, Type&>
{
/*
* Constructors.

12
src/hb-iter.hh
View File

@ -64,7 +64,7 @@ struct hb_iter_t
/* TODO:
* Port operators below to use hb_enable_if to sniff which method implements
* an operator and use it, and remove hb_iter_mixin_t completely. */
* an operator and use it, and remove hb_iter_fallback_mixin_t completely. */
/* Operators. */
iter_t iter () const { return *thiz(); }
@ -132,7 +132,7 @@ hb_iter (Type (&array)[length]) { return hb_iter (array, length); }
/* Mixin to fill in what the subclass doesn't provide. */
template <typename iter_t, typename item_t = typename iter_t::__item_t__>
struct hb_iter_mixin_t
struct hb_iter_fallback_mixin_t
{
private:
/* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */
@ -158,9 +158,9 @@ struct hb_iter_mixin_t
void __rewind__ (unsigned n) { while (n--) --*thiz(); }
protected:
hb_iter_mixin_t () {}
hb_iter_mixin_t (const hb_iter_mixin_t &o HB_UNUSED) {}
void operator = (const hb_iter_mixin_t &o HB_UNUSED) {}
hb_iter_fallback_mixin_t () {}
hb_iter_fallback_mixin_t (const hb_iter_fallback_mixin_t &o HB_UNUSED) {}
void operator = (const hb_iter_fallback_mixin_t &o HB_UNUSED) {}
};
/*
@ -269,7 +269,7 @@ template <typename Iter, typename Pred, typename Proj,
hb_enable_if (hb_is_iterator (Iter))>
struct hb_filter_iter_t :
hb_iter_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>,
hb_iter_mixin_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>
hb_iter_fallback_mixin_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>
{
hb_filter_iter_t (const Iter& it_, Pred&& p, Proj&& f) : it (it_), p (p), f (f)
{ while (it && !p (f (*it))) ++it; }

2
src/hb-ot-layout-common.hh
View File

@ -1122,7 +1122,7 @@ struct Coverage
struct iter_t :
hb_iter_t<iter_t, hb_codepoint_t>,
hb_iter_mixin_t<iter_t, hb_codepoint_t>
hb_iter_fallback_mixin_t<iter_t, hb_codepoint_t>
{
static constexpr bool is_sorted_iterator = true;
iter_t (const Coverage &c_ = Null(Coverage))

2
src/hb-set.hh
View File

@ -684,7 +684,7 @@ struct hb_set_t
*/
struct iter_t :
hb_iter_t<iter_t, hb_codepoint_t>,
hb_iter_mixin_t<iter_t, hb_codepoint_t>
hb_iter_fallback_mixin_t<iter_t, hb_codepoint_t>
{
static constexpr bool is_sorted_iterator = true;
iter_t (const hb_set_t &s_ = Null(hb_set_t)) :

2
src/test-iter.cc
View File

@ -35,7 +35,7 @@
template <typename T>
struct array_iter_t :
hb_iter_t<array_iter_t<T>, T&>,
hb_iter_mixin_t<array_iter_t<T>, T&>
hb_iter_fallback_mixin_t<array_iter_t<T>, T&>
{
array_iter_t (hb_array_t<T> arr_) : arr (arr_) {}