From f5705d7656817cbfdbc4479b1cb0be3af6f4abdf Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 May 2019 14:46:55 -0700 Subject: [PATCH] Whitespace --- src/hb-map.hh | 10 +++++----- src/test-iter.cc | 11 +++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/hb-map.hh b/src/hb-map.hh index 36dfc3e..0e57f97 100644 --- a/src/hb-map.hh +++ b/src/hb-map.hh @@ -210,16 +210,16 @@ struct hb_hashmap_t /* * Iterator */ - auto iter() const HB_AUTO_RETURN + auto iter () const HB_AUTO_RETURN ( + hb_array (items, mask + 1) | hb_filter (&item_t::is_real) | hb_map (&item_t::get_pair) ) - auto keys() const HB_AUTO_RETURN + auto keys () const HB_AUTO_RETURN ( - + iter() + + iter() | hb_map (&hb_pair_t::first) ) @@ -233,9 +233,9 @@ struct hb_hashmap_t while (!items[i].is_unused ()) { if (items[i] == key) - return i; + return i; if (tombstone == (unsigned) -1 && items[i].is_tombstone ()) - tombstone = i; + tombstone = i; i = (i + ++step) & mask; } return tombstone == (unsigned) -1 ? i : tombstone; diff --git a/src/test-iter.cc b/src/test-iter.cc index 273ba6c..69f2de9 100644 --- a/src/test-iter.cc +++ b/src/test-iter.cc @@ -208,11 +208,14 @@ main (int argc, char **argv) using map_pair_t = hb_item_type; + hb_iter (m) - | hb_map ([] (map_pair_t p) { return p.first * p.second; }); + | hb_map ([] (map_pair_t p) { return p.first * p.second; }) + ; - using map_key_t = decltype (*m.keys()); - + hb_iter (m.keys ()) - | hb_filter ([] (map_key_t k) { return k < 42; }); + m.keys (); + using map_key_t = decltype (*m.keys()); + + hb_iter (m.keys ()) + | hb_filter ([] (map_key_t k) { return k < 42; }) + ; unsigned int temp1 = 10; unsigned int temp2 = 0; -- 2.7.4