diff -u -r a/regex/doc/history.qbk b/regex/doc/history.qbk
a
|
b
|
|
25 | 25 | * Fixed documentation typos from [@https://svn.boost.org/trac/boost/ticket/9283 #9283]. |
26 | 26 | * Fixed bug in collation code that failed if the locale generated collation strings with embedded nul's, |
27 | 27 | see [@https://svn.boost.org/trac/boost/ticket/9451 #9451]. |
28 | | * Apply patch for unusual thread usage (no statically initiallized mutexes), see [@https://svn.boost.org/trac/boost/ticket/9461 #9461]. |
| 28 | * Apply patch for unusual thread usage (no statically initialized mutexes), see [@https://svn.boost.org/trac/boost/ticket/9461 #9461]. |
29 | 29 | * Added better checks for invalid UTF-8 sequences, see [@https://svn.boost.org/trac/boost/ticket/9473 #9473]. |
30 | 30 | |
31 | 31 | [h4 Boost-1.54] |
… |
… |
|
153 | 153 | * Breaking Change: POSIX-extended and POSIX-basic regular expressions now enforce the letter of the POSIX standard much more closely than before. |
154 | 154 | * Added support for (?imsx-imsx) constructs. |
155 | 155 | * Added support for lookbehind expressions (?<=positive-lookbehind) and (?<!negative-lookbehind). |
156 | | * Added support for conditional expressions (?(assertion)true-expresion|false-expression). |
| 156 | * Added support for conditional expressions (?(assertion)true-expression|false-expression). |
157 | 157 | * Added MFC/ATL string wrappers. |
158 | 158 | * Added Unicode support; based on ICU. |
159 | 159 | * Changed newline support to recognise \\f as a line separator (all character types), and \\x85 as a line separator for wide characters / Unicode only. |
diff -u -r a/regex/doc/install.qbk b/regex/doc/install.qbk
a
|
b
|
|
43 | 43 | |
44 | 44 | - has_icu builds : yes |
45 | 45 | |
46 | | Whick means that ICU has been found, and support for it will be enabled |
| 46 | Which means that ICU has been found, and support for it will be enabled |
47 | 47 | in the library build. |
48 | 48 | |
49 | 49 | [tip If you don't want the regex library to use ICU then build with the |
diff -u -r a/regex/doc/introduction.qbk b/regex/doc/introduction.qbk
a
|
b
|
|
69 | 69 | the escape is seen once by the C++ compiler, before it gets to be seen by |
70 | 70 | the regular expression engine, consequently escapes in regular expressions |
71 | 71 | have to be doubled up when embedding them in C/C++ code. Also note that |
72 | | all the examples assume that your compiler supports argument-dependent-lookup |
| 72 | all the examples assume that your compiler supports argument-dependent |
73 | 73 | lookup, if yours doesn't (for example VC6), then you will have to add some |
74 | 74 | `boost::` prefixes to some of the function calls in the examples. |
75 | 75 | |
diff -u -r a/regex/doc/locale.qbk b/regex/doc/locale.qbk
a
|
b
|
|
165 | 165 | [[150][The character which when preceded by an escape character represents any single character.]["C" ]] |
166 | 166 | [[151][The character which when preceded by an escape character represents end of buffer operator.]["Z" ]] |
167 | 167 | [[152][The character which when preceded by an escape character represents the continuation assertion.]["G" ]] |
168 | | [[153][The character which when preceeded by (? indicates a zero width negated forward lookahead assert.][! ]] |
| 168 | [[153][The character which when preceded by (? indicates a zero width negated forward lookahead assert.][! ]] |
169 | 169 | ] |
170 | 170 | |
171 | 171 | Custom error messages are loaded as follows: |
diff -u -r a/regex/doc/non_std_strings.qbk b/regex/doc/non_std_strings.qbk
a
|
b
|
|
17 | 17 | with it's length, can be converted into a pair of pointers (which can be |
18 | 18 | used as iterators). |
19 | 19 | |
20 | | Some non-standard string types are sufficiently common that wappers have been |
| 20 | Some non-standard string types are sufficiently common that wrappers have been |
21 | 21 | provided for them already: currently this includes the ICU and MFC string class |
22 | 22 | types. |
23 | 23 | |
diff -u -r a/regex/doc/old_regex.qbk b/regex/doc/old_regex.qbk
a
|
b
|
|
109 | 109 | `SetExpression(p, false)`. Throws [bad_expression] on failure. ]] |
110 | 110 | [[`RegEx& operator=(const std::string& s);`][Assignment operator, equivalent to |
111 | 111 | calling `SetExpression(s, false)`. Throws [bad_expression] on failure. ]] |
112 | | [[`unsigned int SetExpression(constchar* p, bool icase = false);`][Sets the |
| 112 | [[`unsigned int SetExpression(const char* p, bool icase = false);`][Sets the |
113 | 113 | current expression to /p/, if /icase/ is true then matching is |
114 | 114 | insensitive to case, otherwise it is sensitive to case. |
115 | 115 | Throws [bad_expression] on failure. ]] |
… |
… |
|
165 | 165 | [match_flag_type] /flags/. For each match pushes the starting index of what |
166 | 166 | matched onto /v/. Returns the number of matches found. ]] |
167 | 167 | [[`unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, boost::match_flag_type flags = match_default);`] |
168 | | [Finds all matches of the current expression in the files files using |
| 168 | [Finds all matches of the current expression in the files /files/ using |
169 | 169 | the [match_flag_type] /flags/. For each match calls the call-back function cb. |
170 | 170 | If the call-back returns false then the algorithm returns without |
171 | 171 | considering further matches in the current file, or any further files. |
… |
… |
|
178 | 178 | |
179 | 179 | May throw an exception derived from `std::runtime_error` if file io fails.]] |
180 | 180 | [[`unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, bool recurse = false, boost::match_flag_type flags = match_default);`] |
181 | | [Finds all matches of the current expression in the files files using the |
| 181 | [Finds all matches of the current expression in the files /files/ using the |
182 | 182 | [match_flag_type] /flags/. For each match calls the call-back function cb. |
183 | 183 | |
184 | 184 | If the call-back returns false then the algorithm returns without |
… |
… |
|
229 | 229 | to determine what gets matched, and how the format string should be |
230 | 230 | treated. If /copy/ is true then all unmatched sections of input are |
231 | 231 | copied unchanged to output, if the flag /format_first_only/ is set then |
232 | | only the first occurance of the pattern found is replaced. |
| 232 | only the first occurrence of the pattern found is replaced. |
233 | 233 | Returns the new string. See also |
234 | 234 | [link boost_regex.format format string syntax], and [match_flag_type].]] |
235 | 235 | [[`std::string Merge(const char* in, const char* fmt, bool copy = true, boost::match_flag_type flags = match_default);`] |
… |
… |
|
239 | 239 | what gets matched, and how the format string should be treated. |
240 | 240 | If /copy/ is true then all unmatched sections of input are copied |
241 | 241 | unchanged to output, if the flag /format_first_only/ is set then only |
242 | | the first occurance of the pattern found is replaced. Returns |
| 242 | the first occurrence of the pattern found is replaced. Returns |
243 | 243 | the new string. See also [link boost_regex.format format string syntax], and [match_flag_type].]] |
244 | 244 | [[`unsigned Split(std::vector<std::string>& v, std::string& s, boost::match_flag_type flags = match_default, unsigned max_count = ~0);`] |
245 | 245 | [Splits the input string and pushes each one onto the vector. |
diff -u -r a/regex/doc/regex_split.qbk b/regex/doc/regex_split.qbk
a
|
b
|
|
87 | 87 | char c; |
88 | 88 | while(is.get(c)) |
89 | 89 | { |
90 | | // use logarithmic growth stategy, in case |
| 90 | // use logarithmic growth strategy, in case |
91 | 91 | // in_avail (above) returned zero: |
92 | 92 | if(s.capacity() == s.size()) |
93 | 93 | s.reserve(s.capacity() * 3); |
diff -u -r a/regex/doc/syntax_basic.qbk b/regex/doc/syntax_basic.qbk
a
|
b
|
|
156 | 156 | A collating element is any single character, or any sequence of |
157 | 157 | characters that collates as a single unit. Collating elements may also |
158 | 158 | be used as the end point of a range, for example: `[[.ae.]-c]` matches |
159 | | the character sequence "ae", plus any single character in the rangle "ae"-c, |
| 159 | the character sequence "ae", plus any single character in the range "ae"-c, |
160 | 160 | assuming that "ae" is treated as a single collating element in the current locale. |
161 | 161 | |
162 | 162 | Collating elements may be used in place of escapes (which are not |
diff -u -r a/regex/include/boost/regex/v4/regex_workaround.hpp b/regex/include/boost/regex/v4/regex_workaround.hpp
a
|
b
|
|
71 | 71 | |
72 | 72 | /***************************************************************************** |
73 | 73 | * |
74 | | * Fix broken broken namespace support: |
| 74 | * Fix broken namespace support: |
75 | 75 | * |
76 | 76 | ****************************************************************************/ |
77 | 77 | |