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

Fix case that differs from Perl behavior.

Browse Source
This commit is contained in:
jzmaddock
2014-09-25 11:45:26 +01:00
parent 7bdb2122d4
commit 05b582761d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/regex/v4/basic_regex_parser.hpp
View File

@ -346,8 +346,13 @@ bool basic_regex_parser<charT, traits>::parse_extended()
++m_position; ++m_position;
return parse_repeat_range(false); return parse_repeat_range(false);
case regex_constants::syntax_close_brace: case regex_constants::syntax_close_brace:
if((this->flags() & regbase::no_perl_ex) == regbase::no_perl_ex)
{
fail(regex_constants::error_brace, this->m_position - this->m_base, "Found a closing repetition operator } with no corresponding {."); fail(regex_constants::error_brace, this->m_position - this->m_base, "Found a closing repetition operator } with no corresponding {.");
return false; return false;
}
result = parse_literal();
break;
case regex_constants::syntax_or: case regex_constants::syntax_or:
return parse_alt(); return parse_alt();
case regex_constants::syntax_open_set: case regex_constants::syntax_open_set:

4
test/regress/test_simple_repeats.cpp
View File

@ -172,6 +172,10 @@ void test_simple_repeats()
TEST_REGEX_SEARCH("^a{0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2)); TEST_REGEX_SEARCH("^a{0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
TEST_REGEX_SEARCH("^(?:a){0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2)); TEST_REGEX_SEARCH("^(?:a){0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
TEST_REGEX_SEARCH("^a(?:bc)?", perl, "abcbc", match_any|match_all, make_array(-2, -2)); TEST_REGEX_SEARCH("^a(?:bc)?", perl, "abcbc", match_any|match_all, make_array(-2, -2));
TEST_REGEX_SEARCH("a}", perl, "a}", match_default, make_array(0, 2, -2, -2));
TEST_REGEX_SEARCH("a{12b", perl, "a{12bc", match_default, make_array(0, 5, -2, -2));
TEST_INVALID_REGEX("a{b", extended);
TEST_INVALID_REGEX("a}b", extended);
test_simple_repeats2(); test_simple_repeats2();
} }