diff options
Diffstat (limited to 'libs/algorithm/string')
-rw-r--r-- | libs/algorithm/string/doc/concept.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/credits.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/design.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/environment.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/intro.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/quickref.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/rationale.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/release_notes.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/string_algo.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/doc/usage.xml | 2 | ||||
-rw-r--r-- | libs/algorithm/string/test/find_test.cpp | 28 | ||||
-rw-r--r-- | libs/algorithm/string/test/split_test.cpp | 4 |
12 files changed, 27 insertions, 25 deletions
diff --git a/libs/algorithm/string/doc/concept.xml b/libs/algorithm/string/doc/concept.xml index 4f17b43a0..8e9c4a877 100644 --- a/libs/algorithm/string/doc/concept.xml +++ b/libs/algorithm/string/doc/concept.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.concept" last-revision="$Date: 2012-12-28 10:19:25 -0800 (Fri, 28 Dec 2012) $"> +<section id="string_algo.concept" last-revision="$Date$"> <title>Concepts</title> <using-namespace name="boost"/> diff --git a/libs/algorithm/string/doc/credits.xml b/libs/algorithm/string/doc/credits.xml index c8959e9ab..6acdf7427 100644 --- a/libs/algorithm/string/doc/credits.xml +++ b/libs/algorithm/string/doc/credits.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.credits" last-revision="$Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $"> +<section id="string_algo.credits" last-revision="$Date$"> <title>Credits</title> <section id="string_algo.ack"> <title>Acknowledgments</title> diff --git a/libs/algorithm/string/doc/design.xml b/libs/algorithm/string/doc/design.xml index 2d614a563..e6db25d1c 100644 --- a/libs/algorithm/string/doc/design.xml +++ b/libs/algorithm/string/doc/design.xml @@ -8,7 +8,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.design" last-revision="$Date: 2010-04-21 16:00:35 -0700 (Wed, 21 Apr 2010) $"> +<section id="string_algo.design" last-revision="$Date$"> <title>Design Topics</title> <using-namespace name="boost"/> diff --git a/libs/algorithm/string/doc/environment.xml b/libs/algorithm/string/doc/environment.xml index 3b65ce99d..4fef5d96d 100644 --- a/libs/algorithm/string/doc/environment.xml +++ b/libs/algorithm/string/doc/environment.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.env" last-revision="$Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $"> +<section id="string_algo.env" last-revision="$Date$"> <title>Environment</title> <section> <title>Build</title> diff --git a/libs/algorithm/string/doc/intro.xml b/libs/algorithm/string/doc/intro.xml index b2afe661c..47a7e18f1 100644 --- a/libs/algorithm/string/doc/intro.xml +++ b/libs/algorithm/string/doc/intro.xml @@ -8,7 +8,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.intro" last-revision="$Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $"> +<section id="string_algo.intro" last-revision="$Date$"> <title>Introduction</title> <para> diff --git a/libs/algorithm/string/doc/quickref.xml b/libs/algorithm/string/doc/quickref.xml index 8f495bc01..fe267e718 100644 --- a/libs/algorithm/string/doc/quickref.xml +++ b/libs/algorithm/string/doc/quickref.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.quickref" last-revision="$Date: 2012-01-15 08:49:25 -0800 (Sun, 15 Jan 2012) $"> +<section id="string_algo.quickref" last-revision="$Date$"> <title>Quick Reference</title> <using-namespace name="boost"/> diff --git a/libs/algorithm/string/doc/rationale.xml b/libs/algorithm/string/doc/rationale.xml index fe4e8f1c3..e2d1ab11a 100644 --- a/libs/algorithm/string/doc/rationale.xml +++ b/libs/algorithm/string/doc/rationale.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.rationale" last-revision="$Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $"> +<section id="string_algo.rationale" last-revision="$Date$"> <title>Rationale</title> <using-namespace name="boost"/> diff --git a/libs/algorithm/string/doc/release_notes.xml b/libs/algorithm/string/doc/release_notes.xml index ba2a39c5d..dd412d555 100644 --- a/libs/algorithm/string/doc/release_notes.xml +++ b/libs/algorithm/string/doc/release_notes.xml @@ -7,7 +7,7 @@ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) --> -<section id="string_algo.release_notes" last-revision="$Date: 2012-12-28 10:19:25 -0800 (Fri, 28 Dec 2012) $"> +<section id="string_algo.release_notes" last-revision="$Date$"> <using-namespace name="boost"/> <using-namespace name="boost::algorithm"/> diff --git a/libs/algorithm/string/doc/string_algo.xml b/libs/algorithm/string/doc/string_algo.xml index 1eb4a2c8d..bbf1fe0a0 100644 --- a/libs/algorithm/string/doc/string_algo.xml +++ b/libs/algorithm/string/doc/string_algo.xml @@ -8,7 +8,7 @@ --> <library name="String Algorithms" dirname="algorithm/string" xmlns:xi="http://www.w3.org/2001/XInclude" - id="string_algo" last-revision="$Date: 2010-07-10 13:29:03 -0700 (Sat, 10 Jul 2010) $"> + id="string_algo" last-revision="$Date$"> <libraryinfo> <author> <firstname>Pavol</firstname> diff --git a/libs/algorithm/string/doc/usage.xml b/libs/algorithm/string/doc/usage.xml index 4d14ee16c..56fd3acd7 100644 --- a/libs/algorithm/string/doc/usage.xml +++ b/libs/algorithm/string/doc/usage.xml @@ -9,7 +9,7 @@ --> -<section id="string_algo.usage" last-revision="$Date: 2013-05-22 08:10:49 -0700 (Wed, 22 May 2013) $"> +<section id="string_algo.usage" last-revision="$Date$"> <title>Usage</title> <using-namespace name="boost"/> diff --git a/libs/algorithm/string/test/find_test.cpp b/libs/algorithm/string/test/find_test.cpp index 85facb0a7..8439b3c10 100644 --- a/libs/algorithm/string/test/find_test.cpp +++ b/libs/algorithm/string/test/find_test.cpp @@ -181,6 +181,21 @@ void find_test() ( (cv_result.begin()-str1.begin()) == 3) && ( (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 ); BOOST_CHECK( ( (nc_result.begin()-str1.begin()) == 3) && @@ -251,19 +266,6 @@ void find_test() osstr << find_first( str1, "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 diff --git a/libs/algorithm/string/test/split_test.cpp b/libs/algorithm/string/test/split_test.cpp index 429f3c4f6..582472b8b 100644 --- a/libs/algorithm/string/test/split_test.cpp +++ b/libs/algorithm/string/test/split_test.cpp @@ -46,7 +46,7 @@ void iterator_test() const char* pch1="xx-abc--xx-abb"; vector<string> tokens; vector< vector<int> > vtokens; - + // find_all tests find_all( tokens, @@ -182,7 +182,7 @@ void iterator_test() BOOST_CHECK(siter==split_iterator<string::iterator>()); // Make sure we work with forward iterators -// See bug #7989 +// See bug #7989 list<char> l1; find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx")); } |