boostorg/range
1
0
Fork 1
mirror of https://github.com/boostorg/range.git synced 2025-07-19 15:42:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
[SVN r24999]
This commit is contained in:
Thorsten Jørgen Ottosen
2004-09-10 11:43:36 +00:00
parent 58eee2c6ef
commit da43d13564
4 changed files with 157 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
test/TODO
View File

@ -1,6 +1,111 @@
16. change header types.hpp to metafunctions.hpp
17. post-review question: should Range mean lowest common denominator? or 17. post-review question: should Range mean lowest common denominator? or
perhaps Forward Range? problem with not being explicit. 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<string> sub = ...;
if( sub == "foo" )
/*
namespace range_detail
{
template< class Range >
inline iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::type >
make_sub_range_impl( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end )
{
BOOST_ASSERT( advance_begin >= 0 );
BOOST_ASSERT( advance_end >= 0 );
BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::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<Range>::type >
make_super_range_impl( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end )
{
BOOST_ASSERT( advance_begin >= 0 );
BOOST_ASSERT( advance_end >= 0 );
BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::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<Range>::type >
make_sub_range( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::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<Range>::type >
make_super_range( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::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<Range>::type >
make_sub_range( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::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<Range>::type >
make_sub_range( const Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::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<Range>::type >
make_super_range( Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::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<Range>::type >
make_super_range( const Range& r,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end = 0 )
{
return range_detail::make_super_range_impl( r, advance_begin, advance_end );
}*/

14
test/iterator_range.cpp
View File

@ -80,6 +80,20 @@ void check_iterator_range()
string res = copy_range<string>( r ); string res = copy_range<string>( r );
BOOST_CHECK( equal( res.begin(), res.end(), r.begin() ) ); 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 ) );
} }

22
test/string.cpp
View File

@ -57,7 +57,7 @@ void check_char()
const char* char_s = "a string"; const char* char_s = "a string";
char my_string[] = "another string"; char my_string[] = "another string";
const unsigned my_string_length = 14; const unsigned my_string_length = 14;
char* char_s2 = "a string";
BOOST_STATIC_ASSERT(( is_same< range_value<char_iterator_t>::type, BOOST_STATIC_ASSERT(( is_same< range_value<char_iterator_t>::type,
detail::iterator_traits<char_iterator_t>::value_type>::value )); detail::iterator_traits<char_iterator_t>::value_type>::value ));
@ -85,7 +85,14 @@ void check_char()
BOOST_CHECK_EQUAL( end( char_s ), end1 ); BOOST_CHECK_EQUAL( end( char_s ), end1 );
BOOST_CHECK_EQUAL( empty( char_s ), (char_s == 0 || char_s[0] == char()) ); BOOST_CHECK_EQUAL( empty( char_s ), (char_s == 0 || char_s[0] == char()) );
BOOST_CHECK_EQUAL( sz, std::char_traits<char>::length( char_s ) ); BOOST_CHECK_EQUAL( sz, std::char_traits<char>::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<char>::length( char_s2 ) );
*/
BOOST_CHECK_EQUAL( begin( my_string ), my_string ); BOOST_CHECK_EQUAL( begin( my_string ), my_string );
range_iterator<char_array_t>::type end2 = begin( my_string ) + size( my_string ); range_iterator<char_array_t>::type end2 = begin( my_string ) + size( my_string );
range_iterator<char_array_t>::type end3 = end( my_string ); range_iterator<char_array_t>::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 ), my_string_length );
BOOST_CHECK_EQUAL( size( my_string ), std::char_traits<char>::length( my_string ) ); BOOST_CHECK_EQUAL( size( my_string ), std::char_traits<char>::length( my_string ) );
char to_search = 'n'; char to_search = 'n';
BOOST_CHECK( find( char_s, to_search ) != end( char_s ) ); BOOST_CHECK( find( char_s, to_search ) != end( char_s ) );
BOOST_CHECK( find( my_string, to_search ) != end( my_string ) ); BOOST_CHECK( find( my_string, to_search ) != end( my_string ) );
@ -114,6 +120,7 @@ void check_string()
typedef wchar_t* wchar_iterator_t; typedef wchar_t* wchar_iterator_t;
const wchar_t* char_ws = L"a wide string"; const wchar_t* char_ws = L"a wide string";
wchar_t my_wstring[] = L"another 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<wchar_iterator_t>::type, BOOST_STATIC_ASSERT(( is_same< range_value<wchar_iterator_t>::type,
detail::iterator_traits<wchar_iterator_t>::value_type>::value )); detail::iterator_traits<wchar_iterator_t>::value_type>::value ));
@ -130,7 +137,13 @@ void check_string()
BOOST_CHECK_EQUAL( end( char_ws ), (begin( char_ws ) + sz) ); 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( empty( char_ws ), (char_ws == 0 || char_ws[0] == wchar_t()) );
BOOST_CHECK_EQUAL( sz, std::char_traits<wchar_t>::length( char_ws ) ); BOOST_CHECK_EQUAL( sz, std::char_traits<wchar_t>::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<wchar_t>::length( char_ws2 ) );
*/
wchar_t to_search = L'n'; wchar_t to_search = L'n';
BOOST_CHECK( find( char_ws, to_search ) != end( char_ws ) ); BOOST_CHECK( find( char_ws, to_search ) != end( char_ws ) );
@ -147,6 +160,7 @@ void check_string()
#include <boost/test/included/unit_test_framework.hpp> #include <boost/test/included/unit_test_framework.hpp>
using boost::unit_test_framework::test_suite; using boost::unit_test_framework::test_suite;

16
test/sub_range.cpp
View File

@ -123,6 +123,22 @@ void check_iterator_range()
BOOST_CHECK( empty( singular_irange ) ); BOOST_CHECK( empty( singular_irange ) );
BOOST_CHECK( empty( singular_srange ) ); 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 ) );
} }