boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-29 20:17:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
jzmaddock
2014-10-18 16:54:49 +01:00
parent b61c07c264 a50c438d77
commit 741e684ac3
6 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/html/boost_regex/syntax/perl_syntax.html
View File

@ -176,6 +176,13 @@
<pre class="programlisting"><span class="identifier">a</span>
<span class="identifier">aaaa</span>
</pre>
<p>
Note that the "{" and "}" characters will treated as
ordinary literals when used in a context that is not a repeat: this matches
Perl 5.x behavior. For example in the expressions "ab{1", "ab1}"
and "a{b}c" the curly brackets are all treated as literals and
<span class="emphasis"><em>no error will be raised</em></span>.
</p>
<p>
It is an error to use a repeat operator, if the preceding construct can not
be repeated, for example:

2
doc/html/index.html
View File

@ -198,7 +198,7 @@
</p>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: May 23, 2014 at 12:15:55 GMT</small></p></td>
<td align="left"><p><small>Last revised: September 25, 2014 at 10:52:51 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

5
doc/syntax_perl.qbk
View File

@ -115,6 +115,11 @@ But neither of:
a
aaaa
Note that the "{" and "}" characters will treated as ordinary literals when used
in a context that is not a repeat: this matches Perl 5.x behavior. For example in
the expressions "ab{1", "ab1}" and "a{b}c" the curly brackets are all treated as
literals and ['no error will be raised].
It is an error to use a repeat operator, if the preceding construct can not
be repeated, for example:

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

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

17
meta/libraries.json Normal file
View File

@ -0,0 +1,17 @@
{
"key": "regex",
"name": "Regex",
"authors": [
"John Maddock"
],
"description": "Regular expression library.",
"std": [
"tr1"
],
"category": [
"String"
],
"maintainers": [
"John Maddock <john -at- johnmaddock.co.uk>"
]
}

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(?: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();
}