From 77060bcda229dc237d3952fbf5da59709cd81e05 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 15 Feb 2019 16:55:08 -0800 Subject: [PATCH] [iter] Add hb_all, hb_any, hb_none --- src/hb-iter.hh | 46 +++++++++++++++++++++++++++++++++++++++++++++- src/test-iter.cc | 2 ++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/hb-iter.hh b/src/hb-iter.hh index e59d8993b..6672830c2 100644 --- a/src/hb-iter.hh +++ b/src/hb-iter.hh @@ -130,7 +130,7 @@ static const struct { template hb_iter_t (T) - operator () (const T& c) const + operator () (T&& c) const { return c.iter (); } /* Specialization for C arrays. */ @@ -490,6 +490,50 @@ static const struct } } hb_drain HB_UNUSED; +/* hb-all, hb-any, hb-none. */ + +static const struct +{ + template + bool + operator () (Iterable&& c) const + { + for (auto it = hb_iter (c); it; ++it) + if (!*it) + return false; + return true; + } +} hb_all HB_UNUSED; + +static const struct +{ + template + bool + operator () (Iterable&& c) const + { + for (auto it = hb_iter (c); it; ++it) + if (it) + return true; + return false; + } +} hb_any HB_UNUSED; + +static const struct +{ + template + bool + operator () (Iterable&& c) const + { + for (auto it = hb_iter (c); it; ++it) + if (it) + return false; + return true; + } +} hb_none HB_UNUSED; + /* * Algorithms operating on iterators. */ diff --git a/src/test-iter.cc b/src/test-iter.cc index d7e9a00ea..7dfa0a917 100644 --- a/src/test-iter.cc +++ b/src/test-iter.cc @@ -137,6 +137,8 @@ main (int argc, char **argv) test_iterator (hb_zip (st, v)); + hb_any (hb_zip (st, v)); + hb_array_t > pa; pa->as_array ();