Merge branch 'develop'

doc/html/boost_regex/syntax/perl_syntax.html

@@ -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:

doc/html/index.html

@@ -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>

doc/syntax_perl.qbk

@@ -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:
 

include/boost/regex/v4/basic_regex_parser.hpp

@@ -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 {.");
+      if((this->flags() & regbase::no_perl_ex) == regbase::no_perl_ex)
-      return false;
+      {
+         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:

meta/libraries.json

@@ -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>"
+    ]
+}

test/regress/test_simple_repeats.cpp

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