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

[iter] Check for more before forwarding/rewinding past ends

Browse Source
This commit is contained in:
Behdad Esfahbod 2019-05-11 11:54:30 -07:00
parent c1c122e7b3
commit 606841b070
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-iter.hh
View File

@ -196,11 +196,11 @@ struct hb_iter_fallback_mixin_t
/* Advancing: Implement __next__(), or __forward__() if random-access. */ /* Advancing: Implement __next__(), or __forward__() if random-access. */
void __next__ () { *thiz() += 1; } void __next__ () { *thiz() += 1; }
void __forward__ (unsigned n) { while (n--) ++*thiz(); } void __forward__ (unsigned n) { while (*thiz() && n--) ++*thiz(); }
/* Rewinding: Implement __prev__() or __rewind__() if bidirectional. */ /* Rewinding: Implement __prev__() or __rewind__() if bidirectional. */
void __prev__ () { *thiz() -= 1; } void __prev__ () { *thiz() -= 1; }
void __rewind__ (unsigned n) { while (n--) --*thiz(); } void __rewind__ (unsigned n) { while (*thiz() && n--) --*thiz(); }
/* Range-based for: Implement __end__() if can be done faster, /* Range-based for: Implement __end__() if can be done faster,
* and operator!=. */ * and operator!=. */

6
src/test-iter.cc
View File

@ -82,10 +82,8 @@ test_iterator_non_default_constructable (Iter it)
(void) _; (void) _;
it += it.len (); it += it.len ();
if (0) it = it + 10;
it = it + 10; it = 10 + it;
if (0)
it = 10 + it;
assert (*it == it[0]); assert (*it == it[0]);