Uncomment tests'

Author: ldionne

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

@@ -62,57 +62,57 @@ constexpr bool test() {
     static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&>);
     static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&&>);
   }
-  // {
-  //   // Sized range (unsized sentinel type), non-copyable iterator type, rvalue-ref-qualified begin()
-  //   using It = cpp20_input_iterator<int*>;
-  //   using Sent = sentinel_wrapper<cpp20_input_iterator<int*>>;
-  //   using R = std::ranges::subrange<It, Sent, std::ranges::subrange_kind::sized>;
+  {
+    // Sized range (unsized sentinel type), non-copyable iterator type, rvalue-ref-qualified begin()
+    using It = cpp20_input_iterator<int*>;
+    using Sent = sentinel_wrapper<cpp20_input_iterator<int*>>;
+    using R = std::ranges::subrange<It, Sent, std::ranges::subrange_kind::sized>;
 
-  //   int a[] = {1, 2, 3};
-  //   {
-  //     auto r = R(It(a), Sent(It(a + 3)), 3);
-  //     assert(std::ranges::distance(r) == 3);
-  //   }
-  //   {
-  //     auto r = R(It(a), Sent(It(a + 3)), 3);
-  //     assert(std::ranges::distance(static_cast<R&&>(r)) == 3);
-  //   }
-  //   static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&>);
-  //   static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&&>);
-  // }
-  // {
-  //   // Sized range (sized sentinel type), non-copyable iterator type
-  //   test_ordinary<cpp20_input_iterator<int*>, sized_sentinel<cpp20_input_iterator<int*>>>();
-  // }
-  // test_ordinary<cpp17_input_iterator<int*>, sentinel_wrapper<cpp17_input_iterator<int*>>>();
-  // test_ordinary<cpp20_input_iterator<int*>, sentinel_wrapper<cpp20_input_iterator<int*>>>();
-  // test_ordinary<cpp17_output_iterator<int*>, sentinel_wrapper<cpp17_output_iterator<int*>>>();
-  // test_ordinary<forward_iterator<int*>, sentinel_wrapper<forward_iterator<int*>>>();
-  // test_ordinary<bidirectional_iterator<int*>, sentinel_wrapper<bidirectional_iterator<int*>>>();
-  // test_ordinary<random_access_iterator<int*>, sentinel_wrapper<random_access_iterator<int*>>>();
-  // test_ordinary<contiguous_iterator<int*>, sentinel_wrapper<contiguous_iterator<int*>>>();
-  // test_ordinary<int*, sentinel_wrapper<int*>>();
+    int a[] = {1, 2, 3};
+    {
+      auto r = R(It(a), Sent(It(a + 3)), 3);
+      assert(std::ranges::distance(r) == 3);
+    }
+    {
+      auto r = R(It(a), Sent(It(a + 3)), 3);
+      assert(std::ranges::distance(static_cast<R&&>(r)) == 3);
+    }
+    static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&>);
+    static_assert(!std::is_invocable_v<decltype(std::ranges::distance), const R&&>);
+  }
+  {
+    // Sized range (sized sentinel type), non-copyable iterator type
+    test_ordinary<cpp20_input_iterator<int*>, sized_sentinel<cpp20_input_iterator<int*>>>();
+  }
+  test_ordinary<cpp17_input_iterator<int*>, sentinel_wrapper<cpp17_input_iterator<int*>>>();
+  test_ordinary<cpp20_input_iterator<int*>, sentinel_wrapper<cpp20_input_iterator<int*>>>();
+  test_ordinary<cpp17_output_iterator<int*>, sentinel_wrapper<cpp17_output_iterator<int*>>>();
+  test_ordinary<forward_iterator<int*>, sentinel_wrapper<forward_iterator<int*>>>();
+  test_ordinary<bidirectional_iterator<int*>, sentinel_wrapper<bidirectional_iterator<int*>>>();
+  test_ordinary<random_access_iterator<int*>, sentinel_wrapper<random_access_iterator<int*>>>();
+  test_ordinary<contiguous_iterator<int*>, sentinel_wrapper<contiguous_iterator<int*>>>();
+  test_ordinary<int*, sentinel_wrapper<int*>>();
 
-  // test_ordinary<cpp17_input_iterator<int*>, sized_sentinel<cpp17_input_iterator<int*>>>();
-  // test_ordinary<cpp20_input_iterator<int*>, sized_sentinel<cpp20_input_iterator<int*>>>();
-  // test_ordinary<cpp17_output_iterator<int*>, sized_sentinel<cpp17_output_iterator<int*>>>();
-  // test_ordinary<forward_iterator<int*>, sized_sentinel<forward_iterator<int*>>>();
-  // test_ordinary<bidirectional_iterator<int*>, sized_sentinel<bidirectional_iterator<int*>>>();
-  // test_ordinary<random_access_iterator<int*>, sized_sentinel<random_access_iterator<int*>>>();
-  // test_ordinary<contiguous_iterator<int*>, sized_sentinel<contiguous_iterator<int*>>>();
-  // test_ordinary<int*, sized_sentinel<int*>>();
-  // test_ordinary<int*, int*>();
+  test_ordinary<cpp17_input_iterator<int*>, sized_sentinel<cpp17_input_iterator<int*>>>();
+  test_ordinary<cpp20_input_iterator<int*>, sized_sentinel<cpp20_input_iterator<int*>>>();
+  test_ordinary<cpp17_output_iterator<int*>, sized_sentinel<cpp17_output_iterator<int*>>>();
+  test_ordinary<forward_iterator<int*>, sized_sentinel<forward_iterator<int*>>>();
+  test_ordinary<bidirectional_iterator<int*>, sized_sentinel<bidirectional_iterator<int*>>>();
+  test_ordinary<random_access_iterator<int*>, sized_sentinel<random_access_iterator<int*>>>();
+  test_ordinary<contiguous_iterator<int*>, sized_sentinel<contiguous_iterator<int*>>>();
+  test_ordinary<int*, sized_sentinel<int*>>();
+  test_ordinary<int*, int*>();
 
-  // // Calling it on a non-range isn't allowed.
-  // static_assert(!std::is_invocable_v<decltype(std::ranges::distance), int>);
-  // static_assert(!std::is_invocable_v<decltype(std::ranges::distance), int*>);
+  // Calling it on a non-range isn't allowed.
+  static_assert(!std::is_invocable_v<decltype(std::ranges::distance), int>);
+  static_assert(!std::is_invocable_v<decltype(std::ranges::distance), int*>);
 
   return true;
 }
 
 int main(int, char**) {
   test();
-  // static_assert(test());
+  static_assert(test());
 
   return 0;
 }