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

[iter] Port remaining "for (auto" instances to daggers

This commit is contained in:
Behdad Esfahbod 2019-03-29 22:55:02 -07:00
parent 668d2d562f
commit f505b5d5c9
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hb-ot-layout-gsubgpos.hh
View File

@ -1565,9 +1565,14 @@ struct ContextFormat2
&class_def
};
for (auto it = hb_enumerate (ruleSet); it; ++it)
if (class_def.intersects_class (c->glyphs, (*it).first))
(this+(*it).second).closure (c, lookup_context);
return
+ hb_enumerate (ruleSet)
| hb_filter ([&] (unsigned _) -> bool
{ return class_def.intersects_class (c->glyphs, _); },
hb_first)
| hb_map (hb_second)
| hb_apply ([&] (const OffsetTo<RuleSet> &_) { (this+_).closure (c, lookup_context); })
;
}
void collect_glyphs (hb_collect_glyphs_context_t *c) const
@ -2186,12 +2191,13 @@ struct ChainContextFormat2
&lookahead_class_def}
};
for (auto it = hb_enumerate (ruleSet); it; ++it)
if (input_class_def.intersects_class (glyphs, (*it).first) &&
(this+(*it).second).intersects (glyphs, lookup_context))
return true;
return false;
return
+ hb_enumerate (ruleSet)
| hb_filter ([&] (const hb_pair_t<unsigned, const OffsetTo<ChainRuleSet> &> p) -> bool
{ return input_class_def.intersects_class (glyphs, p.first) &&
(this+p.second).intersects (glyphs, lookup_context); })
| hb_any
;
}
void closure (hb_closure_context_t *c) const
{
@ -2209,9 +2215,14 @@ struct ChainContextFormat2
&lookahead_class_def}
};
for (auto it = hb_enumerate (ruleSet); it; ++it)
if (input_class_def.intersects_class (c->glyphs, (*it).first))
(this+(*it).second).closure (c, lookup_context);
return
+ hb_enumerate (ruleSet)
| hb_filter ([&] (unsigned _) -> bool
{ return input_class_def.intersects_class (c->glyphs, _); },
hb_first)
| hb_map (hb_second)
| hb_apply ([&] (const OffsetTo<ChainRuleSet> &_) { (this+_).closure (c, lookup_context); })
;
}
void collect_glyphs (hb_collect_glyphs_context_t *c) const