[libcxx][iterator] adds `std::ranges::prev`

[cjdb]

Summary

Implements part of P0896 'The One Ranges Proposal'.
Implements [range.iter.op.prev].

Depends on D102563.

[zoecarver]

Do we need to mark anything down in the status?

libcxx/include/__iterator/prev.h

36

FWIW I think it makes sense to have nodiscard here because it might be confusing to users that think next behaves like advance (advance takes a reference, this one doesn't).

libcxx/include/iterator

492

Synopsis update.

[Mordante]

SGTM, but I would like to know what our way forward will be with [[nodiscard]] before approving.

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/prev.pass.cpp

13 ↗

(On Diff #345659)

next -> prev

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/prev.verify.cpp

13 ↗

(On Diff #345659)

next -> prev

43 ↗

(On Diff #345659)

@zoecarver wasn't expected-error@*:* an issue with older versions of Clang?

[cjdb]

In D102564#2766837, @Mordante wrote:

SGTM, but I would like to know what our way forward will be with [[nodiscard]] before approving.

I think this patch was put up for review after several days of no opposition to my proposal, but before your reply (which I need to reply to).

[• Quuxplusone]

libcxx/include/__iterator/prev.h

36

Yes, _LIBCPP_NODISCARD_EXT plz, being as this is an extension to the Standard. (The Standard doesn't have [[nodiscard]] here: http://eel.is/c++draft/range.iter.op.prev )

@cjdb wrote: "my proposal" — FWIW, I haven't seen anything on the Discord, or the Slack, or libcxx-dev, related to nodiscard. (Maybe I'm not on libcxx-dev? I also sent two emails to libcxx-dev about how debug iterators are totally broken, and never received any replies.) How about you post on the Discord, and/or send an email to the-relevant-people-directly? I would think at least Louis/Zoe/myself/Mark/EricWF. I'll also go poke the Discord right now.

[Mordante]

LGTM after updating the synopsis, the small comment changes and adjusting the [[nodiscard]] after discussing it on Discord.

[cjdb]

Applies @ldionne's feedback (from D102563, since these two patches are siblings):

• removes [[nodiscard]] from ranges::next (per offline discussion: things not explicitly marked [[nodiscard]] in the wording to be on hold till after P2351R0 and P2377R0 are discussed in Library Evolution)
• removes [[nodiscard]] from tests
• splits single next.pass.cpp into four files, one for each overload

[cjdb]

rebases to activate CI

libcxx/include/CMakeLists.txt

set(files
   __functional_base_03
   __hash_table
   __iterator/advance.h
   __iterator/concepts.h
   __iterator/incrementable_traits.h
   __iterator/iter_move.h
   __iterator/iterator_traits.h
   __iterator/next.h
+  __iterator/prev.h
   __iterator/readable_traits.h
   __libcpp_version
   __locale
   __memory/addressof.h
   __memory/allocation_guard.h
   __memory/allocator.h
   __memory/allocator_traits.h
   __memory/auto_ptr.h

libcxx/include/__iterator/prev.h

+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ITERATOR_PREV_H
+#define _LIBCPP___ITERATOR_PREV_H
+
+#include <__config>
+#include <__function_like.h>
+#include <__iterator/advance.h>
+#include <__iterator/concepts.h>
+#include <__iterator/incrementable_traits.h>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+#if !defined(_LIBCPP_HAS_NO_RANGES)
+
+namespace ranges {
+struct __prev_fn final : private __function_like {
+  constexpr explicit __prev_fn(__tag __x) noexcept : __function_like(__x) {}
+
+  template <bidirectional_iterator _Ip>
+  constexpr _Ip operator()(_Ip __x) const {
+    --__x;
+    return __x;
+  }
+
+  template <bidirectional_iterator _Ip>
+  constexpr _Ip operator()(_Ip __x, iter_difference_t<_Ip> __n) const {
+    ranges::advance(__x, -__n);
+    return __x;
+  }
+
+  template <bidirectional_iterator _Ip>
+  constexpr _Ip operator()(_Ip __x, iter_difference_t<_Ip> __n, _Ip __bound) const {
+    ranges::advance(__x, -__n, __bound);
+    return __x;
+  }
+};
+
+inline constexpr auto prev = __prev_fn(__function_like::__tag());
+} // namespace ranges
+
+#endif // !defined(_LIBCPP_HAS_NO_RANGES)
+
+_LIBCPP_END_NAMESPACE_STD
+
+_LIBCPP_POP_MACROS
+
+#endif // _LIBCPP___ITERATOR_PREV_H

libcxx/include/iterator

 #include <__debug>
 #include <__functional_base>
 #include <__iterator/advance.h>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 #include <__iterator/iter_move.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/next.h>
+#include <__iterator/prev.h>
 #include <__iterator/readable_traits.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
 #include <compare>
 #include <concepts> // Mandated by the Standard.
 #include <cstddef>
 #include <initializer_list>
 #include <iosfwd> // for forward declarations of vector and string

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/check_round_trip.h

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+#ifndef LIBCXX_TEST_PREV_CHECK_ROUND_TRIP_H
+#define LIBCXX_TEST_PREV_CHECK_ROUND_TRIP_H
+
+#include "test_iterators.h"
+
+template <std::input_or_output_iterator I>
+constexpr void check_round_trip(stride_counting_iterator<I> const& i, std::ptrdiff_t const n) {
+  auto const distance = n < 0 ? -n : n;
+  assert(i.stride_count() == distance);
+  assert(i.stride_displacement() == -n);
+}
+
+template <std::random_access_iterator I>
+constexpr void check_round_trip(stride_counting_iterator<I> const& i, std::ptrdiff_t const n) {
+  assert(i.stride_count() <= 1);
+  assert(i.stride_displacement() == n < 0 ? -1 : 1);
+}
+
+#endif // LIBCXX_TEST_PREV_CHECK_ROUND_TRIP_H

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/constraints.verify.cpp

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: gcc-10
+
+// ranges::prev
+
+#include <iterator>
+
+#include <array>
+
+#include "test_iterators.h"
+
+void proper_constraints() {
+  auto a = std::array{0, 1, 2};
+  (void)std::ranges::prev(forward_iterator(a.begin()));    // expected-error {{no matching function for call}}
+  (void)std::ranges::prev(forward_iterator(a.begin()), 5); // expected-error {{no matching function for call}}
+  (void)std::ranges::prev(forward_iterator(a.begin()), 7); // expected-error {{no matching function for call}}
+}

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: gcc-10
+
+// ranges::prev(iterator)
+
+#include <iterator>
+
+#include <array>
+#include <cassert>
+
+#include "check_round_trip.h"
+#include "test_iterators.h"
+
+constexpr bool check_iterator() {
+  constexpr auto range = std::array{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  assert(std::ranges::prev(bidirectional_iterator(&range[4])) == bidirectional_iterator(&range[3]));
+  assert(std::ranges::prev(random_access_iterator(&range[5])) == random_access_iterator(&range[4]));
+  assert(std::ranges::prev(contiguous_iterator(&range[6])) == contiguous_iterator(&range[5]));
+  return true;
+}
+
+int main(int, char**) {
+  static_assert(check_iterator());
+  check_iterator();
+  return 0;
+}

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator_count.pass.cpp

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: gcc-10
+
+// ranges::prev(iterator, count)
+
+#include <iterator>
+
+#include <array>
+#include <cassert>
+
+#include "check_round_trip.h"
+#include "test_iterators.h"
+
+using range_t = std::array<int, 10>;
+
+template <std::input_or_output_iterator I>
+constexpr void iterator_count_impl(I first, std::ptrdiff_t const n, range_t::const_iterator const expected) {
+  auto result = std::ranges::prev(stride_counting_iterator(std::move(first)), n);
+  assert(std::move(result).base().base() == expected);
+  check_round_trip(result, n);
+}
+
+constexpr bool check_iterator_count() {
+  constexpr auto range = range_t{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  iterator_count_impl(bidirectional_iterator(&range[8]), 6, &range[2]);
+  iterator_count_impl(random_access_iterator(&range[7]), 4, &range[3]);
+  iterator_count_impl(contiguous_iterator(&range[5]), 5, &range[0]);
+
+  iterator_count_impl(bidirectional_iterator(&range[2]), 0, &range[2]);
+  iterator_count_impl(random_access_iterator(&range[3]), 0, &range[3]);
+  iterator_count_impl(contiguous_iterator(&range[0]), 0, &range[0]);
+
+  iterator_count_impl(bidirectional_iterator(&range[3]), -5, &range[8]);
+  iterator_count_impl(random_access_iterator(&range[3]), -3, &range[6]);
+  iterator_count_impl(contiguous_iterator(&range[3]), -1, &range[4]);
+  return true;
+}
+
+int main(int, char**) {
+  static_assert(check_iterator_count());
+  check_iterator_count();
+  return 0;
+}

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator_count_sentinel.pass.cpp

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: gcc-10
+
+// ranges::prev(iterator, count, sentinel)
+
+#include <iterator>
+
+#include <array>
+#include <cassert>
+
+#include "check_round_trip.h"
+#include "test_iterators.h"
+
+template <std::input_or_output_iterator I>
+constexpr void check_iterator_count_sentinel_impl(I first, std::ptrdiff_t const steps, I const last) {
+  auto result = std::ranges::prev(stride_counting_iterator(first), steps, stride_counting_iterator(last));
+  assert(result == last);
+  check_round_trip(result, steps);
+}
+
+constexpr bool check_iterator_count_sentinel() {
+  constexpr auto range = std::array{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  check_iterator_count_sentinel_impl(bidirectional_iterator(&range[8]), 6, bidirectional_iterator(&range[2]));
+  check_iterator_count_sentinel_impl(random_access_iterator(&range[5]), 2, random_access_iterator(&range[3]));
+  check_iterator_count_sentinel_impl(contiguous_iterator(&range[5]), 5, contiguous_iterator(&range[0]));
+
+  check_iterator_count_sentinel_impl(bidirectional_iterator(&range[2]), 0, bidirectional_iterator(&range[2]));
+  check_iterator_count_sentinel_impl(random_access_iterator(&range[3]), 0, random_access_iterator(&range[3]));
+  check_iterator_count_sentinel_impl(contiguous_iterator(&range[0]), 0, contiguous_iterator(&range[0]));
+
+  check_iterator_count_sentinel_impl(bidirectional_iterator(&range[5]), -1, bidirectional_iterator(&range[6]));
+  check_iterator_count_sentinel_impl(random_access_iterator(&range[5]), -2, random_access_iterator(&range[7]));
+  check_iterator_count_sentinel_impl(contiguous_iterator(&range[5]), -3, contiguous_iterator(&range[8]));
+  return true;
+}
+
+int main(int, char**) {
+  static_assert(check_iterator_count_sentinel());
+  assert(check_iterator_count_sentinel());
+
+  return 0;
+}

libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/special_function.compile.pass.cpp

+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: gcc-10
+
+// ranges::next
+
+#include <iterator>
+
+#include "test_iterators.h"
+#include "test_standard_function.h"
+
+static_assert(is_function_like<decltype(std::ranges::prev)>());
+
+namespace std::ranges {
+class fake_bidirectional_iterator {
+public:
+  using value_type = int;
+  using difference_type = std::ptrdiff_t;
+  using iterator_category = std::bidirectional_iterator_tag;
+
+  fake_bidirectional_iterator() = default;
+
+  value_type operator*() const;
+  fake_bidirectional_iterator& operator++();
+  fake_bidirectional_iterator operator++(int);
+  fake_bidirectional_iterator& operator--();
+  fake_bidirectional_iterator operator--(int);
+
+  bool operator==(fake_bidirectional_iterator const&) const = default;
+};
+} // namespace std::ranges
+
+// The function templates defined in [range.iter.ops] are not found by argument-dependent name lookup ([basic.lookup.argdep]).
+template <class I, class... Args>
+constexpr bool unqualified_lookup_works = requires(I i, Args... args) {
+  prev(i, args...);
+};
+
+static_assert(!unqualified_lookup_works<std::ranges::fake_bidirectional_iterator>);
+static_assert(!unqualified_lookup_works<std::ranges::fake_bidirectional_iterator, std::ptrdiff_t>);
+static_assert(!unqualified_lookup_works<std::ranges::fake_bidirectional_iterator, std::ptrdiff_t,
+                                        std::ranges::fake_bidirectional_iterator>);
+
+namespace test {
+template <class>
+class bidirectional_iterator {
+public:
+  using value_type = int;
+  using difference_type = std::ptrdiff_t;
+  using iterator_category = std::bidirectional_iterator_tag;
+
+  bidirectional_iterator() = default;
+
+  value_type operator*() const;
+  bidirectional_iterator& operator++();
+  bidirectional_iterator operator++(int);
+  bidirectional_iterator& operator--();
+  bidirectional_iterator operator--(int);
+
+  bool operator==(bidirectional_iterator const&) const = default;
+};
+
+template <class I>
+void prev(bidirectional_iterator<I>) {
+  static_assert(std::same_as<I, I*>);
+}
+
+template <class I>
+void prev(bidirectional_iterator<I>, std::ptrdiff_t) {
+  static_assert(std::same_as<I, I*>);
+}
+
+template <class I>
+void prev(bidirectional_iterator<I>, std::ptrdiff_t, bidirectional_iterator<I>) {
+  static_assert(std::same_as<I, I*>);
+}
+} // namespace test
+
+// When found by unqualified ([basic.lookup.unqual]) name lookup for the postfix-expression in a
+// function call ([expr.call]), they inhibit argument-dependent name lookup.
+void adl_inhibition() {
+  test::bidirectional_iterator<int*> x;
+
+  using std::ranges::prev;
+
+  (void)prev(x);
+  (void)prev(x, 5);
+  (void)prev(x, 6, x);
+}