diff --git a/test/TODO b/test/TODO index 58aba11..8f2767d 100644 --- a/test/TODO +++ b/test/TODO @@ -1,6 +1,111 @@ -16. change header types.hpp to metafunctions.hpp - 17. post-review question: should Range mean lowest common denominator? or perhaps Forward Range? problem with not being explicit. -18) change use of types.hpp -> metefunctions.hpp +18. maybe iterator_range operator==() should be defined when rhs or lhs + take a forward range argument; this comparison function should + then call std::lexigraphical_compare(....). Example: + + sub_range sub = ...; + if( sub == "foo" ) + + /* + namespace range_detail + { + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator::type > + make_sub_range_impl( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end ) + { + BOOST_ASSERT( advance_begin >= 0 ); + BOOST_ASSERT( advance_end >= 0 ); + + BOOST_DEDUCED_TYPENAME range_result_iterator::type + new_begin = begin( r ), + new_end = end( r ); + std::advance( new_begin, advance_begin ); + std::advance( new_end, -advance_end ); + return make_iterator_range( new_begin, new_end ); + } + + + + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator::type > + make_super_range_impl( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end ) + { + BOOST_ASSERT( advance_begin >= 0 ); + BOOST_ASSERT( advance_end >= 0 ); + + BOOST_DEDUCED_TYPENAME range_result_iterator::type + new_begin = begin( r ), + new_end = end( r ); + std::advance( new_begin, -advance_begin ); + std::advance( new_end, advance_end ); + return make_iterator_range( new_begin, new_end ); + } + + }*/ + + /* + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator::type > + make_sub_range( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_sub_range_impl( r, advance_begin, advance_end ); + } + + + + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator::type > + make_super_range( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_super_range_impl( r, advance_begin, advance_end ); + }*/ + /* + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator::type > + make_sub_range( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_sub_range_impl( r, advance_begin, advance_end ); + } + + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_const_iterator::type > + make_sub_range( const Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_sub_range_impl( r, advance_begin, advance_end ); + } + + + + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator::type > + make_super_range( Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_super_range_impl( r, advance_begin, advance_end ); + } + + + template< class Range > + inline iterator_range< BOOST_DEDUCED_TYPENAME range_const_iterator::type > + make_super_range( const Range& r, + BOOST_DEDUCED_TYPENAME range_difference::type advance_begin, + BOOST_DEDUCED_TYPENAME range_difference::type advance_end = 0 ) + { + return range_detail::make_super_range_impl( r, advance_begin, advance_end ); + }*/ + diff --git a/test/iterator_range.cpp b/test/iterator_range.cpp index f285b87..a6b3c12 100755 --- a/test/iterator_range.cpp +++ b/test/iterator_range.cpp @@ -80,6 +80,20 @@ void check_iterator_range() string res = copy_range( r ); BOOST_CHECK( equal( res.begin(), res.end(), r.begin() ) ); + irange rr = make_iterator_range( str ); + BOOST_CHECK( rr.equal( r ) ); + + rr = make_iterator_range( str.begin(), str.begin() + 5 ); + BOOST_CHECK( rr == "hello" ); + BOOST_CHECK( rr != "hell" ); + BOOST_CHECK( rr < "hello dude" ); + BOOST_CHECK( "hello" == rr ); + BOOST_CHECK( "hell" != rr ); + BOOST_CHECK( ! ("hello dude" < rr ) ); + irange rrr = rr; + BOOST_CHECK( rrr == rr ); + BOOST_CHECK( !( rrr != rr ) ); + BOOST_CHECK( !( rrr < rr ) ); } diff --git a/test/string.cpp b/test/string.cpp index 564c02f..65ec780 100755 --- a/test/string.cpp +++ b/test/string.cpp @@ -57,7 +57,7 @@ void check_char() const char* char_s = "a string"; char my_string[] = "another string"; const unsigned my_string_length = 14; - + char* char_s2 = "a string"; BOOST_STATIC_ASSERT(( is_same< range_value::type, detail::iterator_traits::value_type>::value )); @@ -85,7 +85,14 @@ void check_char() BOOST_CHECK_EQUAL( end( char_s ), end1 ); BOOST_CHECK_EQUAL( empty( char_s ), (char_s == 0 || char_s[0] == char()) ); BOOST_CHECK_EQUAL( sz, std::char_traits::length( char_s ) ); - +/* + BOOST_CHECK_EQUAL( begin( char_s2 ), char_s2 ); + std::size_t sz2 = size( char_s2 ); + const char* end12 = begin( char_s2 ) + sz; + BOOST_CHECK_EQUAL( end( char_s2 ), end12 ); + BOOST_CHECK_EQUAL( empty( char_s2 ), (char_s2 == 0 || char_s2[0] == char()) ); + BOOST_CHECK_EQUAL( sz2, std::char_traits::length( char_s2 ) ); +*/ BOOST_CHECK_EQUAL( begin( my_string ), my_string ); range_iterator::type end2 = begin( my_string ) + size( my_string ); range_iterator::type end3 = end( my_string ); @@ -94,7 +101,6 @@ void check_char() BOOST_CHECK_EQUAL( size( my_string ), my_string_length ); BOOST_CHECK_EQUAL( size( my_string ), std::char_traits::length( my_string ) ); - char to_search = 'n'; BOOST_CHECK( find( char_s, to_search ) != end( char_s ) ); BOOST_CHECK( find( my_string, to_search ) != end( my_string ) ); @@ -114,7 +120,8 @@ void check_string() typedef wchar_t* wchar_iterator_t; const wchar_t* char_ws = L"a wide string"; wchar_t my_wstring[] = L"another wide string"; - + wchar_t* char_ws2 = L"a wide string"; + BOOST_STATIC_ASSERT(( is_same< range_value::type, detail::iterator_traits::value_type>::value )); BOOST_STATIC_ASSERT(( is_same< range_iterator::type, wchar_iterator_t >::value )); @@ -130,7 +137,13 @@ void check_string() BOOST_CHECK_EQUAL( end( char_ws ), (begin( char_ws ) + sz) ); BOOST_CHECK_EQUAL( empty( char_ws ), (char_ws == 0 || char_ws[0] == wchar_t()) ); BOOST_CHECK_EQUAL( sz, std::char_traits::length( char_ws ) ); - + /* + std::size_t sz2 = size( char_ws2 ); + BOOST_CHECK_EQUAL( begin( char_ws2 ), char_ws2 ); + BOOST_CHECK_EQUAL( end( char_ws2 ), (begin( char_ws2 ) + sz2) ); + BOOST_CHECK_EQUAL( empty( char_ws2 ), (char_ws2 == 0 || char_ws2[0] == wchar_t()) ); + BOOST_CHECK_EQUAL( sz2, std::char_traits::length( char_ws2 ) ); + */ wchar_t to_search = L'n'; BOOST_CHECK( find( char_ws, to_search ) != end( char_ws ) ); @@ -147,6 +160,7 @@ void check_string() + #include using boost::unit_test_framework::test_suite; diff --git a/test/sub_range.cpp b/test/sub_range.cpp index cba6c14..f62ec31 100755 --- a/test/sub_range.cpp +++ b/test/sub_range.cpp @@ -123,6 +123,22 @@ void check_iterator_range() BOOST_CHECK( empty( singular_irange ) ); BOOST_CHECK( empty( singular_srange ) ); + + srange rr = make_iterator_range( str ); + BOOST_CHECK( rr.equal( r ) ); + + rr = make_iterator_range( str.begin(), str.begin() + 5 ); + BOOST_CHECK( rr == "hello" ); + BOOST_CHECK( rr != "hell" ); + BOOST_CHECK( rr < "hello dude" ); + BOOST_CHECK( "hello" == rr ); + BOOST_CHECK( "hell" != rr ); + BOOST_CHECK( ! ("hello dude" < rr ) ); + + irange rrr = rr; + BOOST_CHECK( rrr == rr ); + BOOST_CHECK( !( rrr != rr ) ); + BOOST_CHECK( !( rrr < rr ) ); }