[Boost-commit] svn:boost r69775 - in trunk: boost/regex/v4 libs/regex/test/regress

Subject: [Boost-commit] svn:boost r69775 - in trunk: boost/regex/v4 libs/regex/test/regress
From: john_at_[hidden]
Date: 2011-03-09 13:12:23

Author: johnmaddock
Date: 2011-03-09 13:12:18 EST (Wed, 09 Mar 2011)
New Revision: 69775
URL: http://svn.boost.org/trac/boost/changeset/69775

Log:
Fix bug that prevents turning off multiple Perl-modifiers at once.
Fixes #5223.
Text files modified: 
   trunk/boost/regex/v4/basic_regex_parser.hpp    |     2 ++                                      
   trunk/libs/regex/test/regress/test_perl_ex.cpp |     1 +                                       
   2 files changed, 3 insertions(+), 0 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex_parser.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_parser.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex_parser.hpp	2011-03-09 13:12:18 EST (Wed, 09 Mar 2011)
@@ -2711,6 +2711,8 @@
       }
    }
    while(!breakout);
+   
+   breakout = false;
 
    if(*m_position == static_cast<charT>('-'))
    {

Modified: trunk/libs/regex/test/regress/test_perl_ex.cpp
==============================================================================
--- trunk/libs/regex/test/regress/test_perl_ex.cpp	(original)
+++ trunk/libs/regex/test/regress/test_perl_ex.cpp	2011-03-09 13:12:18 EST (Wed, 09 Mar 2011)
@@ -337,6 +337,7 @@
    TEST_REGEX_SEARCH("(?s).", perl, "\n", match_default|match_not_dot_newline, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("(?-s).", perl, "\n", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("(?-s).", perl, "\n", match_default|match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-xism)d", perl, "d", match_default, make_array(0, 1, -2, -2));
    test_options3();
 }