[llvm] r284037 - Revert "[ADT] Zip range adapter"
Mehdi Amini via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 12 12:54:08 PDT 2016
Author: mehdi_amini
Date: Wed Oct 12 14:54:08 2016
New Revision: 284037
URL: http://llvm.org/viewvc/llvm-project?rev=284037&view=rev
Log:
Revert "[ADT] Zip range adapter"
This reverts commit r284035, which breaks with MSVC 2013.
Modified:
llvm/trunk/include/llvm/ADT/STLExtras.h
llvm/trunk/unittests/ADT/IteratorTest.cpp
Modified: llvm/trunk/include/llvm/ADT/STLExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/STLExtras.h?rev=284037&r1=284036&r2=284037&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/STLExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/STLExtras.h Wed Oct 12 14:54:08 2016
@@ -341,95 +341,6 @@ make_filter_range(RangeT &&Range, Predic
FilterIteratorT(std::end(std::forward<RangeT>(Range))));
}
-// forward declarations required by zip_shortest/zip_first
-template <typename R, class UnaryPredicate>
-bool all_of(R &&range, UnaryPredicate &&P);
-
-template <size_t... I> struct index_sequence;
-
-template <class... Ts> struct index_sequence_for;
-
-namespace detail {
-template <typename... Iters> class zip_first {
-public:
- typedef std::input_iterator_tag iterator_category;
- typedef std::tuple<decltype(*std::declval<Iters>())...> value_type;
- std::tuple<Iters...> iterators;
-
-private:
- template <size_t... Ns> value_type deres(index_sequence<Ns...>) {
- return value_type(*std::get<Ns>(iterators)...);
- }
-
- template <size_t... Ns> decltype(iterators) tup_inc(index_sequence<Ns...>) {
- return std::tuple<Iters...>(std::next(std::get<Ns>(iterators))...);
- }
-
-public:
- value_type operator*() { return deres(index_sequence_for<Iters...>{}); }
-
- void operator++() { iterators = tup_inc(index_sequence_for<Iters...>{}); }
-
- bool operator!=(const zip_first<Iters...> &other) const {
- return std::get<0>(iterators) != std::get<0>(other.iterators);
- }
- zip_first(Iters &&... ts) : iterators(std::forward<Iters>(ts)...) {}
-};
-
-template <typename... Iters> class zip_shortest : public zip_first<Iters...> {
- template <size_t... Ns>
- bool test(const zip_first<Iters...> &other, index_sequence<Ns...>) const {
- return all_of(std::initializer_list<bool>{std::get<Ns>(this->iterators) !=
- std::get<Ns>(other.iterators)...},
- identity<bool>{});
- }
-
-public:
- bool operator!=(const zip_first<Iters...> &other) const {
- return test(other, index_sequence_for<Iters...>{});
- }
- zip_shortest(Iters &&... ts)
- : zip_first<Iters...>(std::forward<Iters>(ts)...) {}
-};
-
-template <template <typename...> class ItType, typename... Args> class zippy {
-public:
- typedef ItType<decltype(std::begin(std::declval<Args>()))...> iterator;
-
-private:
- std::tuple<Args...> ts;
-
- template <size_t... Ns> iterator begin_impl(index_sequence<Ns...>) {
- return iterator(std::begin(std::get<Ns>(ts))...);
- }
- template <size_t... Ns> iterator end_impl(index_sequence<Ns...>) {
- return iterator(std::end(std::get<Ns>(ts))...);
- }
-
-public:
- iterator begin() { return begin_impl(index_sequence_for<Args...>{}); }
- iterator end() { return end_impl(index_sequence_for<Args...>{}); }
- zippy(Args &&... ts_) : ts(std::forward<Args>(ts_)...) {}
-};
-} // End detail namespace
-
-/// zip iterator for two or more iteratable types.
-template <typename T, typename U, typename... Args>
-detail::zippy<detail::zip_shortest, T, U, Args...> zip(T &&t, U &&u,
- Args &&... args) {
- return detail::zippy<detail::zip_shortest, T, U, Args...>(
- std::forward<T>(t), std::forward<U>(u), std::forward<Args>(args)...);
-}
-
-/// zip iterator that, for the sake of efficiency, assumes the first iteratee to
-/// be the shortest.
-template <typename T, typename U, typename... Args>
-detail::zippy<detail::zip_first, T, U, Args...> zip_first(T &&t, U &&u,
- Args &&... args) {
- return detail::zippy<detail::zip_first, T, U, Args...>(
- std::forward<T>(t), std::forward<U>(u), std::forward<Args>(args)...);
-}
-
//===----------------------------------------------------------------------===//
// Extra additions to <utility>
//===----------------------------------------------------------------------===//
Modified: llvm/trunk/unittests/ADT/IteratorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/IteratorTest.cpp?rev=284037&r1=284036&r2=284037&view=diff
==============================================================================
--- llvm/trunk/unittests/ADT/IteratorTest.cpp (original)
+++ llvm/trunk/unittests/ADT/IteratorTest.cpp Wed Oct 12 14:54:08 2016
@@ -209,67 +209,4 @@ TEST(PointerIterator, Const) {
EXPECT_EQ(A + 4, std::next(*Begin, 4));
}
-TEST(ZipIteratorTest, Basic) {
- using namespace std;
- const SmallVector<unsigned, 6> pi{3, 1, 4, 1, 5, 9};
- SmallVector<bool, 6> odd{1, 1, 0, 1, 1, 1};
- const char message[] = "yynyyy\0";
-
- for (auto tup : zip(pi, odd, message)) {
- EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
- EXPECT_EQ(get<0>(tup) & 0x01 ? 'y' : 'n', get<2>(tup));
- }
-
- // note the rvalue
- for (auto tup : zip(pi, SmallVector<bool, 0>{1, 1, 0, 1, 1})) {
- EXPECT_EQ(get<0>(tup) & 0x01, get<1>(tup));
- }
-}
-
-TEST(ZipIteratorTest, ZipFirstBasic) {
- using namespace std;
- const SmallVector<unsigned, 6> pi{3, 1, 4, 1, 5, 9};
- unsigned iters = 0;
-
- for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
- EXPECT_EQ(get<0>(tup), get<1>(tup) & 0x01);
- iters += 1;
- }
-
- EXPECT_EQ(iters, 4u);
-}
-
-TEST(ZipIteratorTest, Mutability) {
- using namespace std;
- const SmallVector<unsigned, 4> pi{3, 1, 4, 1, 5, 9};
- char message[] = "hello zip\0";
-
- for (auto tup : zip(pi, message, message)) {
- EXPECT_EQ(get<1>(tup), get<2>(tup));
- get<2>(tup) = get<0>(tup) & 0x01 ? 'y' : 'n';
- }
-
- // note the rvalue
- for (auto tup : zip(message, "yynyyyzip\0")) {
- EXPECT_EQ(get<0>(tup), get<1>(tup));
- }
-}
-
-TEST(ZipIteratorTest, ZipFirstMutability) {
- using namespace std;
- vector<unsigned> pi{3, 1, 4, 1, 5, 9};
- unsigned iters = 0;
-
- for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
- get<1>(tup) = get<0>(tup);
- iters += 1;
- }
-
- EXPECT_EQ(iters, 4u);
-
- for (auto tup : zip_first(SmallVector<bool, 0>{1, 1, 0, 1}, pi)) {
- EXPECT_EQ(get<0>(tup), get<1>(tup));
- }
-}
-
} // anonymous namespace
More information about the llvm-commits
mailing list