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

[iter] Change __more__ to fallback to __len__

This commit is contained in:
Behdad Esfahbod 2018-12-21 18:49:27 -05:00
parent 474a12058d
commit 2a33ab0560
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-iter.hh
View File

@ -75,11 +75,11 @@ struct hb_iter_t
item_t& item () const { return thiz()->__item__ (); }
item_t& item_at (unsigned i) const { return thiz()->__item_at__ (i); }
bool more () const { return thiz()->__more__ (); }
unsigned len () const { return thiz()->__len__ (); }
void next () { thiz()->__next__ (); }
void forward (unsigned n) { thiz()->__forward__ (n); }
void prev () { thiz()->__prev__ (); }
void rewind (unsigned n) { thiz()->__rewind__ (n); }
unsigned len () const { return thiz()->__len__ (); }
bool random_access () const { return thiz()->__random_access__ (); }
protected:
@ -102,9 +102,10 @@ struct hb_iter_mixin_t
item_t& __item__ () const { return thiz()->item_at (0); }
item_t& __item_at__ (unsigned i) const { return *(thiz() + i); }
/* Termination: Implement __more__(), or __end__() and operator ==. */
bool __more__ () const { return !(*thiz() == thiz()->__end__ ()); }
iter_t __end__ () const;
/* Termination: Implement __more__(), or __len__() if random-access. */
bool __more__ () const { return thiz()->__len__ (); }
unsigned __len__ () const
{ iter_t c (*thiz()); unsigned l = 0; while (c) { c++; l++; }; return l; }
/* Advancing: Implement __next__(), or __forward__() if random-access. */
void __next__ () { thiz()->forward (1); }
@ -114,11 +115,7 @@ struct hb_iter_mixin_t
void __prev__ () { thiz()->rewind (1); }
void __rewind__ (unsigned n) { while (n--) thiz()->prev (); }
/* Population: Implement __len__() if known. */
unsigned __len__ () const
{ iter_t c (*thiz()); unsigned l = 0; while (c) { c++; l++; }; return l; }
/* Random access: Return true if len(), forward(), item_at() are fast. */
/* Random access: Return true if item_at(), len(), forward() are fast. */
bool __random_access__ () const { return false; }
};

1
src/test-iter.cc
View File

@ -36,7 +36,6 @@ struct array_iter_t : hb_iter_t<array_iter_t<T>, T>, hb_iter_mixin_t<array_iter_
typedef T __item_type__;
T& __item_at__ (unsigned i) const { return arr[i]; }
bool __more__ () const { return arr.length; }
void __forward__ (unsigned n) { arr += n; }
void __rewind__ (unsigned n) { arr -= n; }
unsigned __len__ () const { return arr.length; }