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

[iter] Rename 

Moving towards making iota useful for non-integers.
This commit is contained in:
Behdad Esfahbod 2019-08-30 10:20:30 -05:00
parent 2d5643aed4
commit 814dc3cbe5
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hb-iter.hh
View File

@ -602,13 +602,13 @@ struct
} }
HB_FUNCOBJ (hb_apply); HB_FUNCOBJ (hb_apply);
/* hb_iota()/hb_range() */ /* hb_range()/hb_iota() */
template <typename T, typename S> template <typename T, typename S>
struct hb_counter_iter_t : struct hb_range_iter_t :
hb_iter_t<hb_counter_iter_t<T, S>, T> hb_iter_t<hb_range_iter_t<T, S>, T>
{ {
hb_counter_iter_t (T start, T end_, S step) : v (start), end_ (end_for (start, end_, step)), step (step) {} hb_range_iter_t (T start, T end_, S step) : v (start), end_ (end_for (start, end_, step)), step (step) {}
typedef T __item_t__; typedef T __item_t__;
static constexpr bool is_random_access_iterator = true; static constexpr bool is_random_access_iterator = true;
@ -621,8 +621,8 @@ struct hb_counter_iter_t :
void __forward__ (unsigned n) { v += n * step; } void __forward__ (unsigned n) { v += n * step; }
void __prev__ () { v -= step; } void __prev__ () { v -= step; }
void __rewind__ (unsigned n) { v -= n * step; } void __rewind__ (unsigned n) { v -= n * step; }
hb_counter_iter_t __end__ () const { return hb_counter_iter_t (end_, end_, step); } hb_range_iter_t __end__ () const { return hb_range_iter_t (end_, end_, step); }
bool operator != (const hb_counter_iter_t& o) const bool operator != (const hb_range_iter_t& o) const
{ return v != o.v; } { return v != o.v; }
private: private:
@ -644,23 +644,24 @@ struct hb_counter_iter_t :
}; };
struct struct
{ {
template <typename T = unsigned, typename S = unsigned> hb_counter_iter_t<T, S> template <typename T = unsigned> hb_range_iter_t<T, unsigned>
operator () (T start = 0u, S&& step = 1u) const
{ return hb_counter_iter_t<T, S> (start, step >= 0 ? hb_int_max (T) : hb_int_min (T), step); }
}
HB_FUNCOBJ (hb_iota);
struct
{
template <typename T = unsigned> hb_counter_iter_t<T, unsigned>
operator () (T end = (unsigned) -1) const operator () (T end = (unsigned) -1) const
{ return hb_counter_iter_t<T, unsigned> (0, end, 1u); } { return hb_range_iter_t<T, unsigned> (0, end, 1u); }
template <typename T, typename S = unsigned> hb_counter_iter_t<T, S> template <typename T, typename S = unsigned> hb_range_iter_t<T, S>
operator () (T start, T end, S&& step = 1u) const operator () (T start, T end, S&& step = 1u) const
{ return hb_counter_iter_t<T, S> (start, end, step); } { return hb_range_iter_t<T, S> (start, end, step); }
} }
HB_FUNCOBJ (hb_range); HB_FUNCOBJ (hb_range);
struct
{
template <typename T = unsigned, typename S = unsigned> hb_range_iter_t<T, S>
operator () (T start = 0u, S&& step = 1u) const
{ return hb_range_iter_t<T, S> (start, step >= 0 ? hb_int_max (T) : hb_int_min (T), step); }
}
HB_FUNCOBJ (hb_iota);
/* hb_enumerate */ /* hb_enumerate */
struct struct