feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fix begin() and end() members and add tests.

Browse Source 
Fixes #6346.

[SVN r79340]
This commit is contained in:
John Maddock
2012-07-07 18:36:25 +00:00
parent 3bfba1a7cf
commit ab6b0d9971
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/history.qbk
View File

@ -19,7 +19,7 @@ All issues including closed ones can be viewed [@https://svn.boost.org/trac/boos
Fixed issues: Fixed issues:
[@https://svn.boost.org/trac/boost/ticket/589 #589], [@https://svn.boost.org/trac/boost/ticket/7084 #7084], [@https://svn.boost.org/trac/boost/ticket/589 #589], [@https://svn.boost.org/trac/boost/ticket/7084 #7084],
[@https://svn.boost.org/trac/boost/ticket/7032 #7032]. [@https://svn.boost.org/trac/boost/ticket/7032 #7032], [@https://svn.boost.org/trac/boost/ticket/6346 #6346].
[h4 Boost-1.50] [h4 Boost-1.50]

4
include/boost/regex/v4/basic_regex.hpp
View File

@ -243,11 +243,11 @@ public:
// begin, end: // begin, end:
const_iterator BOOST_REGEX_CALL begin()const const_iterator BOOST_REGEX_CALL begin()const
{ {
return (!this->m_status ? 0 : this->m_expression); return (this->m_status ? 0 : this->m_expression);
} }
const_iterator BOOST_REGEX_CALL end()const const_iterator BOOST_REGEX_CALL end()const
{ {
return (!this->m_status ? 0 : this->m_expression + this->m_expression_len); return (this->m_status ? 0 : this->m_expression + this->m_expression_len);
} }
flag_type BOOST_REGEX_CALL flags()const flag_type BOOST_REGEX_CALL flags()const
{ {

4
test/regress/test_not_regex.hpp
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); 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> template<class charT, class traits>

4
test/regress/test_regex_search.hpp
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); 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_simple_search(r);
test_regex_iterator(r); test_regex_iterator(r);
test_regex_token_iterator(r); test_regex_token_iterator(r);