Merge collected bug fixes from Trunk:

Refs #589.
Refs #7032.
Refs #7084.
Refs #6346.

[SVN r79556]
This commit is contained in:
John Maddock
2012-07-16 08:38:23 +00:00
parent 8aa4a1225a
commit a26d66b688
16 changed files with 64 additions and 10 deletions

View File

@ -48,6 +48,10 @@ void test_empty(boost::basic_regex<charT, traits>& r)
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::status().", charT);
}
if(r.begin() != r.end())
{
BOOST_REGEX_TEST_ERROR("Invalid value returned from basic_regex<>::begin().", charT);
}
}
template<class charT, class traits>

View File

@ -482,6 +482,10 @@ void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
{
BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
}
if(expression != std::basic_string<charT>(r.begin(), r.end()))
{
BOOST_REGEX_TEST_ERROR("Stored expression string was incorrect", charT);
}
test_simple_search(r);
test_regex_iterator(r);
test_regex_token_iterator(r);

View File

@ -190,5 +190,9 @@ void test_replace()
TEST_REGEX_REPLACE("(?:(?<one>a)|(?<one>b))", perl, " ...b,,", match_default, "$1.$2.$+{one}", " ....b.b,,");
TEST_REGEX_REPLACE("(?:(?<one>a)(?<one>b))", perl, " ...ab,,", match_default, "$1.$2.$+{one}", " ...a.b.a,,");
// See https://svn.boost.org/trac/boost/ticket/589
TEST_REGEX_REPLACE("(a*)", perl, "aabb", match_default, "{$1}", "{aa}{}b{}b{}");
TEST_REGEX_REPLACE("(a*)", extended, "aabb", match_default, "{$1}", "{aa}{}b{}b{}");
TEST_REGEX_REPLACE("(a*)", extended, "aabb", match_default|match_posix, "{$1}", "{aa}b{}b{}");
}