fixup! WIP: [libc++][ranges] Implement ranges::stride_view.

Refactor and add additional tests.

Signed-off-by: Will Hawkins <[email protected]>

Author: hawkinsw

libcxx/test/libcxx/ranges/range.adaptors/range.stride.view/iterator/operator.nodiscard.verify.cpp

@@ -17,10 +17,10 @@
 constexpr bool test_non_forward_operator_minus() {
   int arr[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
 
-  using Base = BasicTestView<SizedInputIterator, SizedInputIterator>;
+  using Base = BasicTestView<SizedInputIter, SizedInputIter>;
 
-  auto base_view_offset_zero             = Base(SizedInputIterator(arr), SizedInputIterator(arr + 10));
-  auto base_view_offset_one              = Base(SizedInputIterator(arr + 1), SizedInputIterator(arr + 10));
+  auto base_view_offset_zero             = Base(SizedInputIter(arr), SizedInputIter(arr + 10));
+  auto base_view_offset_one              = Base(SizedInputIter(arr + 1), SizedInputIter(arr + 10));
   auto stride_view_over_base_zero_offset = std::ranges::stride_view(base_view_offset_zero, 3);
   auto stride_view_over_base_one_offset  = std::ranges::stride_view(base_view_offset_one, 3);
 

libcxx/test/std/ranges/range.adaptors/range.stride.view/adaptor.pass.cpp

@@ -25,7 +25,7 @@ using RandomAccessStrideView = std::ranges::stride_view<BasicTestView<random_acc
 
 using SizedForwardStrideView =
     std::ranges::stride_view<BasicTestView<random_access_iterator<int*>, random_access_iterator<int*>>>;
-using SizedInputStrideView = std::ranges::stride_view<BasicTestView<SizedInputIterator, SizedInputIterator>>;
+using SizedInputStrideView = std::ranges::stride_view<BasicTestView<SizedInputIter, SizedInputIter>>;
 
 static_assert(std::ranges::forward_range<ForwardStrideView>);
 static_assert(std::ranges::bidirectional_range<BidirStrideView>);

libcxx/test/std/ranges/range.adaptors/range.stride.view/iterator/base.pass.cpp

@@ -53,13 +53,13 @@ bool base_move() {
   int move_counter = 0;
   int copy_counter = 0;
 
-  auto start         = SizedInputIterator();
+  auto start         = SizedInputIter();
   start.move_counter = &move_counter;
   start.copy_counter = &copy_counter;
-  auto stop          = SizedInputIterator();
+  auto stop          = SizedInputIter();
 
-  auto view = BasicTestView<SizedInputIterator>{start, stop};
-  auto sv   = std::ranges::stride_view<BasicTestView<SizedInputIterator>>(view, 1);
+  auto view = BasicTestView<SizedInputIter>{start, stop};
+  auto sv   = std::ranges::stride_view<BasicTestView<SizedInputIter>>(view, 1);
   auto svi  = sv.begin();
 
   // Reset the move/copy counters so that they reflect *only* whether the
@@ -78,20 +78,20 @@ bool base_copy() {
   // See above.
   int move_counter = 0;
   int copy_counter = 0;
-  auto start       = SizedInputIterator();
+  auto start       = SizedInputIter();
 
   start.move_counter = &move_counter;
   start.copy_counter = &copy_counter;
-  auto stop          = SizedInputIterator();
+  auto stop          = SizedInputIter();
 
-  auto view                 = BasicTestView<SizedInputIterator>{start, stop};
-  auto sv                   = std::ranges::stride_view<BasicTestView<SizedInputIterator>>(view, 1);
+  auto view                 = BasicTestView<SizedInputIter>{start, stop};
+  auto sv                   = std::ranges::stride_view<BasicTestView<SizedInputIter>>(view, 1);
   [[maybe_unused]] auto svi = sv.begin();
 
   // See above.
   move_counter                                      = 0;
   copy_counter                                      = 0;
-  [[maybe_unused]] const SizedInputIterator& result = svi.base();
+  [[maybe_unused]] const SizedInputIter& result = svi.base();
 
   // Ensure that base did _not_ std::move'd the iterator.
   assert(*result.move_counter == 0);

libcxx/test/std/ranges/range.adaptors/range.stride.view/iterator/ctor.copy.pass.cpp

@@ -25,7 +25,7 @@ struct NotSimpleViewConstIterEnd;
 template <bool, bool>
 struct NotSimpleViewConstIterBegin;
 
-struct NotSimpleViewIterBegin : InputIterBase<NotSimpleViewIterBegin> {
+struct NotSimpleViewIterBegin : InputIter<NotSimpleViewIterBegin> {
   template <bool CopyConvertible, bool MoveConvertible>
   friend constexpr bool
   operator==(const NotSimpleViewIterBegin&, const NotSimpleViewConstIterEnd<CopyConvertible, MoveConvertible>&) {
@@ -39,7 +39,7 @@ struct NotSimpleViewIterBegin : InputIterBase<NotSimpleViewIterBegin> {
 };
 
 template <bool CopyConvertible, bool MoveConvertible>
-struct NotSimpleViewConstIterBegin : InputIterBase<NotSimpleViewConstIterBegin<CopyConvertible, MoveConvertible>> {
+struct NotSimpleViewConstIterBegin : InputIter<NotSimpleViewConstIterBegin<CopyConvertible, MoveConvertible>> {
   constexpr NotSimpleViewConstIterBegin()                                              = default;
   constexpr NotSimpleViewConstIterBegin(NotSimpleViewConstIterBegin&&)                 = default;
   constexpr NotSimpleViewConstIterBegin& operator=(const NotSimpleViewConstIterBegin&) = default;
@@ -63,7 +63,7 @@ struct NotSimpleViewConstIterBegin : InputIterBase<NotSimpleViewConstIterBegin<C
   }
 };
 
-struct NotSimpleViewIterEnd : InputIterBase<NotSimpleViewIterEnd> {
+struct NotSimpleViewIterEnd : InputIter<NotSimpleViewIterEnd> {
   template <bool CopyConvertible, bool MoveConvertible>
   friend constexpr bool
   operator==(const NotSimpleViewIterEnd&, const NotSimpleViewConstIterBegin<CopyConvertible, MoveConvertible>&) {
@@ -79,7 +79,7 @@ struct NotSimpleViewIterEnd : InputIterBase<NotSimpleViewIterEnd> {
 };
 
 template <bool CopyConvertible, bool MoveConvertible>
-struct NotSimpleViewConstIterEnd : InputIterBase<NotSimpleViewConstIterEnd<CopyConvertible, MoveConvertible>> {
+struct NotSimpleViewConstIterEnd : InputIter<NotSimpleViewConstIterEnd<CopyConvertible, MoveConvertible>> {
   constexpr NotSimpleViewConstIterEnd()                                            = default;
   constexpr NotSimpleViewConstIterEnd(NotSimpleViewConstIterEnd&&)                 = default;
   constexpr NotSimpleViewConstIterEnd& operator=(const NotSimpleViewConstIterEnd&) = default;

libcxx/test/std/ranges/range.adaptors/range.stride.view/iterator/ctor.default.verify.cpp

@@ -16,7 +16,7 @@
 #include "../types.h"
 #include "test_iterators.h"
 
-struct NonDefaultConstructibleIterator : InputIterBase<NonDefaultConstructibleIterator> {
+struct NonDefaultConstructibleIterator : InputIter<NonDefaultConstructibleIterator> {
   NonDefaultConstructibleIterator() = delete;
   constexpr NonDefaultConstructibleIterator(int) {}
 };