feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Revert to old behavior for find_iterator; will not find overlapping matches. Fixes #9063

Browse Source 
[SVN r86206]
This commit is contained in:
Marshall Clow
2013-10-08 17:59:44 +00:00
parent 4b9a073780
commit b44dff3a5b
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/algorithm/string/find_iterator.hpp
View File

@ -132,12 +132,7 @@ namespace boost {
// increment // increment
void increment() void increment()
{ {
if(m_Match.begin() == m_Match.end()) m_Match=this->do_find(m_Match.end(),m_End);
m_Match=this->do_find(m_Match.end(),m_End);
else {
input_iterator_type last = m_Match.begin();
m_Match=this->do_find(++last,m_End);
}
} }
// comparison // comparison

28
string/test/find_test.cpp
View File

@ -181,6 +181,21 @@ void find_test()
( (cv_result.begin()-str1.begin()) == 3) && ( (cv_result.begin()-str1.begin()) == 3) &&
( (cv_result.end()-str1.begin()) == 6) ); ( (cv_result.end()-str1.begin()) == 6) );
string s1("abc def ghi jkl");
find_iterator<string::iterator> fEnd;
find_iterator<string::iterator> fxIt = make_find_iterator(s1,
token_finder(is_alnum(), token_compress_on));
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
++fxIt;
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
++fxIt;
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
++fxIt;
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
++fxIt;
BOOST_CHECK(fxIt == fEnd);
nc_result=find_token( str1, is_any_of("abc"), token_compress_off ); nc_result=find_token( str1, is_any_of("abc"), token_compress_off );
BOOST_CHECK( BOOST_CHECK(
( (nc_result.begin()-str1.begin()) == 3) && ( (nc_result.begin()-str1.begin()) == 3) &&
@ -251,19 +266,6 @@ void find_test()
osstr << find_first( str1, "abc" ); osstr << find_first( str1, "abc" );
BOOST_CHECK( osstr.str()=="abc" ); BOOST_CHECK( osstr.str()=="abc" );
// Empty string test
BOOST_TEST_CHECKPOINT( "overlapping" );
std::string overlap_target("aaaa");
std::vector<boost::iterator_range<std::string::iterator> > overlap_results;
boost::algorithm::find_all(overlap_results, overlap_target, string("aaa"));
BOOST_CHECK( overlap_results.size() == 2 );
std::string overlap_target2("aaaabbbbaaaa");
boost::algorithm::find_all(overlap_results, overlap_target2, string("bb"));
BOOST_CHECK( overlap_results.size() == 3 );
boost::algorithm::find_all(overlap_results, overlap_target2, string("aa"));
BOOST_CHECK( overlap_results.size() == 6 );
} }
// test main // test main