Merge regex changes from Trunk.

[SVN r76192]
This commit is contained in:
John Maddock
2011-12-26 18:28:30 +00:00
parent e0fe0863ad
commit 090520dbb4
47 changed files with 1551 additions and 1524 deletions

View File

@ -31,17 +31,17 @@
Boost-Extended format strings treat all characters as literals except for
'$', '\', '(', ')', '?', and ':'.
</p>
<a name="boost_regex.format.boost_format_syntax.grouping"></a><h5>
<a name="boost_regex.format.boost_format_syntax.grouping-heading"></a>
<a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.grouping">Grouping</a>
<h5>
<a name="boost_regex.format.boost_format_syntax.h0"></a>
<span><a name="boost_regex.format.boost_format_syntax.grouping"></a></span><a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.grouping">Grouping</a>
</h5>
<p>
The characters '(' and ')' perform lexical grouping, so use \( and \) if
you want a to output literal parenthesis.
</p>
<a name="boost_regex.format.boost_format_syntax.conditionals"></a><h5>
<a name="boost_regex.format.boost_format_syntax.conditionals-heading"></a>
<a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.conditionals">Conditionals</a>
<h5>
<a name="boost_regex.format.boost_format_syntax.h1"></a>
<span><a name="boost_regex.format.boost_format_syntax.conditionals"></a></span><a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.conditionals">Conditionals</a>
</h5>
<p>
The character '?' begins a conditional expression, the general form is:
@ -78,9 +78,9 @@
<p>
?{NAME}true-expression:false-expression
</p>
<a name="boost_regex.format.boost_format_syntax.placeholder_sequences"></a><h5>
<a name="boost_regex.format.boost_format_syntax.placeholder_sequences-heading"></a>
<a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.placeholder_sequences">Placeholder
<h5>
<a name="boost_regex.format.boost_format_syntax.h2"></a>
<span><a name="boost_regex.format.boost_format_syntax.placeholder_sequences"></a></span><a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.placeholder_sequences">Placeholder
Sequences</a>
</h5>
<p>
@ -318,9 +318,9 @@
Any $-placeholder sequence not listed above, results in '$' being treated
as a literal.
</p>
<a name="boost_regex.format.boost_format_syntax.escape_sequences"></a><h5>
<a name="boost_regex.format.boost_format_syntax.escape_sequences-heading"></a>
<a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.escape_sequences">Escape
<h5>
<a name="boost_regex.format.boost_format_syntax.h3"></a>
<span><a name="boost_regex.format.boost_format_syntax.escape_sequences"></a></span><a class="link" href="boost_format_syntax.html#boost_regex.format.boost_format_syntax.escape_sequences">Escape
Sequences</a>
</h5>
<p>