Merge branch 'feature/std23-reference' into 'develop'

Feature/std23 reference

See merge request njoy/tools!4

CMakeLists.txt

@@ -10,7 +10,7 @@ if( DEFINED PROJECT_NAME )
 endif()
 
 project( tools
-  VERSION 0.5.0
+  VERSION 0.4.1
   LANGUAGES CXX
 )
 

ReleaseNotes.md

@@ -1,7 +1,10 @@
 # Release Notes—tools
 Given here are some release notes for tools.
 
-## [tools v0.5.0](https://github.com/njoy/tools/pull/xx)
+## tools v0.4.1
+Bug fixes:
+  - iterator guards were added to the disco parser to avoid valgrind errors in ENDFtk.
+  - the stride_view iterator was missing the reference type, which is required to create vectors using these stride view iterators in C++17.
 
 ## [tools v0.4.0](https://github.com/njoy/tools/pull/44)
 New features:

src/tools/std23/views/stride.hpp

@@ -65,6 +65,7 @@ struct stride_view : std20::ranges::view_interface< stride_view< R > > {
                                           std20::ranges::forward_range< Base >,
                                           std20::forward_iterator_tag,
                                           std20::input_iterator_tag > > >;
+    using reference = std20::ranges::iter_reference_t< std20::ranges::iterator_t< Base > >;
 
     iterator() = default;
 

src/tools/std23/views/test/stride.test.cpp

@@ -41,6 +41,17 @@ SCENARIO( "stride_view" ) {
         CHECK( std20::ranges::common_range< Range > );
       }
 
+      THEN( "the stride_view range and iterator associated types are correct" ) {
+
+        CHECK( std20::same_as< std20::ranges::range_value_t< Range >, int > );
+        CHECK( std20::same_as< std20::ranges::range_reference_t< Range >, int& > );
+        CHECK( std20::same_as< std20::ranges::range_difference_t< Range >, std::ptrdiff_t > );
+
+        CHECK( std20::same_as< std20::ranges::iter_value_t< Iterator >, int > );
+        CHECK( std20::same_as< std20::ranges::iter_reference_t< Iterator >, int& > );
+        CHECK( std20::same_as< std20::ranges::iter_difference_t< Iterator >, std::ptrdiff_t > );
+      }
+
       THEN( "a stride_view can be constructed and members can be tested" ) {
 
         CHECK( false == chunk.empty() );
@@ -90,6 +101,17 @@ SCENARIO( "stride_view" ) {
         CHECK( std20::ranges::common_range< Range > );
       }
 
+      THEN( "the stride_view range and iterator associated types are correct" ) {
+
+        CHECK( std20::same_as< std20::ranges::range_value_t< Range >, int > );
+        CHECK( std20::same_as< std20::ranges::range_reference_t< Range >, int& > );
+        CHECK( std20::same_as< std20::ranges::range_difference_t< Range >, std::ptrdiff_t > );
+
+        CHECK( std20::same_as< std20::ranges::iter_value_t< Iterator >, int > );
+        CHECK( std20::same_as< std20::ranges::iter_reference_t< Iterator >, int& > );
+        CHECK( std20::same_as< std20::ranges::iter_difference_t< Iterator >, std::ptrdiff_t > );
+      }
+
       THEN( "a stride_view can be constructed and members can be tested" ) {
 
         CHECK( 5 == chunk.size() );
@@ -154,6 +176,17 @@ SCENARIO( "stride_view" ) {
         CHECK( std20::ranges::common_range< Range > );
       }
 
+      THEN( "the stride_view range and iterator associated types are correct" ) {
+
+        CHECK( std20::same_as< std20::ranges::range_value_t< Range >, int > );
+        CHECK( std20::same_as< std20::ranges::range_reference_t< Range >, int& > );
+        CHECK( std20::same_as< std20::ranges::range_difference_t< Range >, std::ptrdiff_t > );
+
+        CHECK( std20::same_as< std20::ranges::iter_value_t< Iterator >, int > );
+        CHECK( std20::same_as< std20::ranges::iter_reference_t< Iterator >, int& > );
+        CHECK( std20::same_as< std20::ranges::iter_difference_t< Iterator >, std::ptrdiff_t > );
+      }
+
       THEN( "a stride_view can be constructed and members can be tested" ) {
 
         CHECK( 5 == chunk.size() );