some more updates

njoy · May 7, 2024 · 4932d9b · 4932d9b
1 parent 3292329
commit 4932d9b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/src/tools/std23/views/stride.hpp b/src/tools/std23/views/stride.hpp
@@ -245,6 +245,20 @@ struct stride_view : std20::ranges::view_interface< stride_view< R > > {
 
       return -( right - left );
     }
+
+    friend constexpr std20::ranges::range_rvalue_reference_t< Base >
+    iter_move( const iterator& iter ) noexcept(noexcept( std20::ranges::iter_move( iter.current_ ) ) ) {
+
+      return std20::ranges::iter_move( iter.current_ );
+    }
+
+    template < typename B = Base >
+    friend constexpr auto iter_swap( const iterator& left, const iterator& right )
+        noexcept(noexcept(std20::ranges::iter_swap( left.current_, right.current_ )))
+    -> std::enable_if_t<std20::ranges::indirectly_swappable< B > > {
+
+        std20::ranges::iter_swap( left.current_, right.current_ );
+    }
   };
 
 public:

diff --git a/src/tools/std23/views/test/chunk.test.cpp b/src/tools/std23/views/test/chunk.test.cpp
@@ -30,6 +30,8 @@ SCENARIO( "chunk_view" ) {
 
       THEN( "the chunk_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( ! std20::ranges::sized_range< Range > );
@@ -70,6 +72,8 @@ SCENARIO( "chunk_view" ) {
 
       THEN( "the chunk_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( std20::ranges::sized_range< Range > );
@@ -122,6 +126,8 @@ SCENARIO( "chunk_view" ) {
 
       THEN( "the chunk_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( std20::ranges::sized_range< Range > );

diff --git a/src/tools/std23/views/test/chunk_by.test.cpp b/src/tools/std23/views/test/chunk_by.test.cpp
@@ -29,6 +29,8 @@ SCENARIO( "chunk_by_view" ) {
 
       THEN( "the chunk_by_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( ! std20::ranges::sized_range< Range > );
@@ -75,6 +77,8 @@ SCENARIO( "chunk_by_view" ) {
 
       THEN( "the chunk_by_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( ! std20::ranges::sized_range< Range > );
@@ -137,6 +141,8 @@ SCENARIO( "chunk_by_view" ) {
 
       THEN( "the chunk_by_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( ! std20::ranges::sized_range< Range > );

diff --git a/src/tools/std23/views/test/stride.test.cpp b/src/tools/std23/views/test/stride.test.cpp
@@ -29,6 +29,8 @@ SCENARIO( "stride_view" ) {
 
       THEN( "the stride_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( ! std20::ranges::sized_range< Range > );
@@ -63,6 +65,8 @@ SCENARIO( "stride_view" ) {
 
       THEN( "the stride_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( std20::ranges::sized_range< Range > );
@@ -100,6 +104,8 @@ SCENARIO( "stride_view" ) {
 
       THEN( "the stride_view satisfies the required concepts" ) {
 
+        CHECK( std20::ranges::viewable_range< Range > );
+
         CHECK( std20::ranges::range< Range > );
         CHECK( std20::ranges::view< Range > );
         CHECK( std20::ranges::sized_range< Range > );