From d5c65ffa8dd419b618b1c28602637d3e816d8a94 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 25 May 2017 02:29:54 +0000 Subject: [PATCH] Add non-parallel version of for_each_n (+tests) from the Parallelism TS llvm-svn: 303833 --- libcxx/include/algorithm | 21 ++++++++ .../alg.foreach/for_each_n.pass.cpp | 61 ++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 08ca23f..168d2c4 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -35,6 +35,9 @@ template Function for_each(InputIterator first, InputIterator last, Function f); +template + InputIterator for_each_n(InputIterator first, Size n, Function f); // C++17 + template InputIterator find(InputIterator first, InputIterator last, const T& value); @@ -961,6 +964,24 @@ for_each(_InputIterator __first, _InputIterator __last, _Function __f) return __f; } +// for_each_n + +template +inline _LIBCPP_INLINE_VISIBILITY +_InputIterator +for_each_n(_InputIterator __first, _Size __orig_n, _Function __f) +{ + typedef decltype(__convert_to_integral(__orig_n)) _IntegralSize; + _IntegralSize __n = __orig_n; + while (__n > 0) + { + __f(*__first); + ++__first; + --__n; + } + return __first; +} + // find template diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp new file mode 100644 index 0000000..fd24edb --- /dev/null +++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp @@ -0,0 +1,61 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// +// UNSUPPORTED: c++98, c++03, c++11, c++14 + +// template +// InputIterator for_each_n(InputIterator first, Size n, Function f); + + +#include +#include + +#include "test_iterators.h" + +struct for_each_test +{ + for_each_test(int c) : count(c) {} + int count; + void operator()(int& i) {++i; ++count;} +}; + +int main() +{ + typedef input_iterator Iter; + int ia[] = {0, 1, 2, 3, 4, 5}; + const unsigned s = sizeof(ia)/sizeof(ia[0]); + + { + auto f = for_each_test(0); + Iter it = std::for_each_n(Iter(ia), 0, std::ref(f)); + assert(it == Iter(ia)); + assert(f.count == 0); + } + + { + auto f = for_each_test(0); + Iter it = std::for_each_n(Iter(ia), s, std::ref(f)); + + assert(it == Iter(ia+s)); + assert(f.count == s); + for (unsigned i = 0; i < s; ++i) + assert(ia[i] == static_cast(i+1)); + } + + { + auto f = for_each_test(0); + Iter it = std::for_each_n(Iter(ia), 1, std::ref(f)); + + assert(it == Iter(ia+1)); + assert(f.count == 1); + for (unsigned i = 0; i < 1; ++i) + assert(ia[i] == static_cast(i+2)); + } +} -- 2.7.4