Merge bug fixes from Trunk - see history for full details.

[SVN r58234]
This commit is contained in:
John Maddock
2009-12-08 12:42:33 +00:00
parent 95ddff1f01
commit ae79f29895
133 changed files with 1893 additions and 933 deletions

View File

@ -21,15 +21,10 @@ The algorithm `regex_format` takes the results of a match and creates a
new string based upon a format string, `regex_format` can be used for
search and replace operations:
template <class OutputIterator, class iterator, class Allocator, class charT>
template <class OutputIterator, class iterator, class Allocator, class Formatter>
OutputIterator regex_format(OutputIterator out,
const match_results<iterator, Allocator>& m,
const charT* fmt,
match_flag_type flags = 0);
template <class OutputIterator, class iterator, class Allocator, class charT>
OutputIterator regex_format(OutputIterator out,
const match_results<iterator, Allocator>& m,
const std::basic_string<charT>& fmt,
Formatter fmt,
match_flag_type flags = 0);
The library also defines the following convenience variation of
@ -39,16 +34,10 @@ than outputting to an iterator.
[note This version may not be available, or may be available in a more limited
form, depending upon your compilers capabilities]
template <class iterator, class Allocator, class charT>
template <class iterator, class Allocator, class Formatter>
std::basic_string<charT> regex_format
(const match_results<iterator, Allocator>& m,
const charT* fmt,
match_flag_type flags = 0);
template <class iterator, class Allocator, class charT>
std::basic_string<charT> regex_format
(const match_results<iterator, Allocator>& m,
const std::basic_string<charT>& fmt,
Formatter fmt,
match_flag_type flags = 0);
Parameters to the main version of the function are passed as follows:
@ -57,7 +46,7 @@ Parameters to the main version of the function are passed as follows:
[[Parameter][Description]]
[[`OutputIterator out`][An output iterator type, the output string is sent to this iterator. Typically this would be a std::ostream_iterator. ]]
[[`const match_results<iterator, Allocator>& m`][An instance of [match_results] obtained from one of the matching algorithms above, and denoting what matched. ]]
[[`const charT* fmt`][A format string that determines how the match is transformed into the new string. ]]
[[`Formatter fmt`][Either a format string that determines how the match is transformed into the new string, or a functor that computes the new string from /m/ - see [match_results_format]. ]]
[[`unsigned flags`][Optional flags which describe how the format string is to be interpreted. ]]
]