Index: libs/regex/doc/configuration.qbk =================================================================== --- libs/regex/doc/configuration.qbk (revision 86295) +++ libs/regex/doc/configuration.qbk (working copy) @@ -68,10 +68,10 @@ [table [[macro][description]] [[BOOST_REGEX_BLOCKSIZE][In non-recursive mode, Boost.Regex uses largish blocks of memory to act as a stack for the state machine, the larger the block size then the fewer allocations that will take place. This defaults to 4096 bytes, which is large enough to match the vast majority of regular expressions without further allocations, however, you can choose smaller or larger values depending upon your platforms characteristics.]] -[[BOOST_REGEX_MAX_BLOCKS][Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use. If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error. Defaults to 1024, don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.]] +[[BOOST_REGEX_MAX_BLOCKS][Tells Boost.Regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is permitted to use. If this value is exceeded then Boost.Regex will stop trying to find a match and throw a std::runtime_error. Defaults to 1024, don't forget to tweak this value if you alter BOOST_REGEX_BLOCKSIZE by much.]] [[BOOST_REGEX_MAX_CACHE_BLOCKS][Tells Boost.Regex how many memory blocks to store in it's internal cache - memory blocks are taken from this cache rather than by calling - ::operator new. Generally speeking this can be an order of magnitude faster than + ::operator new. Generally speaking this can be an order of magnitude faster than calling ::opertator new each time a memory block is required, but has the downside that Boost.Regex can end up caching a large chunk of memory (by default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size). If memory is tight then try Index: libs/regex/doc/old_regex.qbk =================================================================== --- libs/regex/doc/old_regex.qbk (revision 86295) +++ libs/regex/doc/old_regex.qbk (working copy) @@ -18,7 +18,7 @@ The class RegEx provides a high level simplified interface to the regular expression library, this class only handles narrow character strings, and regular expressions always follow the "normal" syntax - that is the -same as the perl / ECMAScript synatx. +same as the perl / ECMAScript syntax. typedef bool (*GrepCallback)(const RegEx& expression); typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression); @@ -229,7 +229,7 @@ to determine what gets matched, and how the format string should be treated. If /copy/ is true then all unmatched sections of input are copied unchanged to output, if the flag /format_first_only/ is set then - only the first occurance of the pattern found is replaced. + only the first occurrence of the pattern found is replaced. Returns the new string. See also [link boost_regex.format format string syntax], and [match_flag_type].]] [[`std::string Merge(const char* in, const char* fmt, bool copy = true, boost::match_flag_type flags = match_default);`] @@ -239,7 +239,7 @@ what gets matched, and how the format string should be treated. If /copy/ is true then all unmatched sections of input are copied unchanged to output, if the flag /format_first_only/ is set then only - the first occurance of the pattern found is replaced. Returns + the first occurrence of the pattern found is replaced. Returns the new string. See also [link boost_regex.format format string syntax], and [match_flag_type].]] [[`unsigned Split(std::vector& v, std::string& s, boost::match_flag_type flags = match_default, unsigned max_count = ~0);`] [Splits the input string and pushes each one onto the vector. Index: libs/regex/doc/syntax_perl.qbk =================================================================== --- libs/regex/doc/syntax_perl.qbk (revision 86295) +++ libs/regex/doc/syntax_perl.qbk (working copy) @@ -146,7 +146,7 @@ [h4 Possessive repeats] By default when a repeated pattern does not match then the engine will backtrack until -a match is found. However, this behaviour can sometime be undesireable so there are +a match is found. However, this behaviour can sometime be undesirable so there are also "possessive" repeats: these match as much as possible and do not then allow backtracking if the rest of the expression fails to match. @@ -436,13 +436,13 @@ (?expression) -Which can be then be refered to by the name /NAME/. Alternatively you can delimit the name +Which can be then be referred to by the name /NAME/. Alternatively you can delimit the name using 'NAME' as in: (?'NAME'expression) -These named subexpressions can be refered to in a backreference using either [^\g{NAME}] or [^\k] -and can also be refered to by name in a [perl_format] format string for search and replace operations, or in the +These named subexpressions can be referred to in a backreference using either [^\g{NAME}] or [^\k] +and can also be referred to by name in a [perl_format] format string for search and replace operations, or in the [match_results] member functions. [h5 Comments] @@ -557,7 +557,7 @@ * [^(?(R&['name])yes-pattern|no-pattern)] Executes /yes-pattern/ if we are executing inside a recursion to named sub-expression /name/, otherwise executes /no-pattern/. * [^(?(DEFINE)never-exectuted-pattern)] Defines a block of code that is never executed and matches no characters: -this is usually used to define one or more named sub-expressions which are refered to from elsewhere in the pattern. +this is usually used to define one or more named sub-expressions which are referred to from elsewhere in the pattern. [h4 Operator precedence] Index: libs/regex/doc/basic_regex.qbk =================================================================== --- libs/regex/doc/basic_regex.qbk (revision 86295) +++ libs/regex/doc/basic_regex.qbk (working copy) @@ -487,7 +487,7 @@ size_type mark_count() const; -[*Effects]: Returns the number of marked sub-expressions within the regular expresion. +[*Effects]: Returns the number of marked sub-expressions within the regular expression. [#boost_regex.basic_regex.assign1] Index: libs/regex/doc/concepts.qbk =================================================================== --- libs/regex/doc/concepts.qbk (revision 86295) +++ libs/regex/doc/concepts.qbk (working copy) @@ -38,7 +38,7 @@ [section:traits_concept Traits Class Requirements] There are two sets of requirements for the `traits` template argument to -[basic_regex]: a mininal interface (which is part of the regex standardization proposal), +[basic_regex]: a minimal interface (which is part of the regex standardization proposal), and an optional Boost-specific enhanced interface. [h4 Minimal requirements.] @@ -77,7 +77,7 @@ The following additional requirements are strictly optional, however in order for [basic_regex] to take advantage of these additional interfaces, all of the following requirements must be met; [basic_regex] -will detect the presence or absense of the member `boost_extensions_tag` and +will detect the presence or absence of the member `boost_extensions_tag` and configure itself appropriately. @@ -89,8 +89,8 @@ [[v.translate(c, b)][X::char_type][Returns a character d such that: for any character d that is to be considered equivalent to c then `v.translate(c,false)==v.translate(d,false)`. Likewise for all characters C that are to be considered equivalent to c when comparisons are to be performed without regard to case, then `v.translate(c,true)==v.translate(C,true)`.]] [[v.toi(I1, I2, i)][An integer type capable of holding either a charT or an int.][Behaves as follows: if `p == q` or if `*p` is not a digit character then returns -1. Otherwise performs formatted numeric input on the sequence \[p,q) and returns the result as an int. Postcondition: either p == q or *p is a non-digit character.]] [[v.error_string(I)][std::string][Returns a human readable error string for the error condition i, where i is one of the values enumerated by type regex_constants::error_type. If the value /I/ is not recognized then returns the string "Unknown error" or a localized equivalent.]] -[[v.tolower(c)][X::char_type][Converts c to lower case, used for Perl-style \l and \L formating operations.]] -[[v.toupper(c)][X::char_type][Converts c to upper case, used for Perl-style \u and \U formating operations.]] +[[v.tolower(c)][X::char_type][Converts c to lower case, used for Perl-style \l and \L formatting operations.]] +[[v.toupper(c)][X::char_type][Converts c to upper case, used for Perl-style \u and \U formatting operations.]] ] [endsect] Index: libs/regex/doc/introduction.qbk =================================================================== --- libs/regex/doc/introduction.qbk (revision 86295) +++ libs/regex/doc/introduction.qbk (working copy) @@ -135,7 +135,7 @@ takes the result of a match and a format string, and produces a new string by merging the two. -For iterating through all occurences of an expression within a text, +For iterating through all occurrences of an expression within a text, there are two iterator types: [regex_iterator] will enumerate over the [match_results] objects found, while [regex_token_iterator] will enumerate a series of strings (similar to perl style split operations). Index: libs/regex/doc/unicode_iterators.qbk =================================================================== --- libs/regex/doc/unicode_iterators.qbk (revision 86295) +++ libs/regex/doc/unicode_iterators.qbk (working copy) @@ -63,7 +63,7 @@ The three-arg constructor of this class takes the start and end of the underlying sequence as well as the position to start iteration from. This constructor validates that the -underlying sequence has validly encoded endpoints: this prevents accidently incrementing/decrementing +underlying sequence has validly encoded endpoints: this prevents accidentally incrementing/decrementing past the end of the underlying sequence as a result of invalid UTF16 code sequences at the endpoints of the underlying range. @@ -94,7 +94,7 @@ The three-arg constructor of this class takes the start and end of the underlying sequence as well as the position to start iteration from. This constructor validates that the -underlying sequence has validly encoded endpoints: this prevents accidently incrementing/decrementing +underlying sequence has validly encoded endpoints: this prevents accidentally incrementing/decrementing past the end of the underlying sequence as a result of invalid UTF8 code sequences at the endpoints of the underlying range. Index: libs/regex/doc/regex_token_iterator.qbk =================================================================== --- libs/regex/doc/regex_token_iterator.qbk (revision 86295) +++ libs/regex/doc/regex_token_iterator.qbk (working copy) @@ -378,7 +378,7 @@ char c; while(is.get(c)) { - // use logarithmic growth stategy, in case + // use logarithmic growth strategy, in case // in_avail (above) returned zero: if(s.capacity() == s.size()) s.reserve(s.capacity() * 3); Index: libs/regex/doc/regex_split.qbk =================================================================== --- libs/regex/doc/regex_split.qbk (revision 86295) +++ libs/regex/doc/regex_split.qbk (working copy) @@ -87,7 +87,7 @@ char c; while(is.get(c)) { - // use logarithmic growth stategy, in case + // use logarithmic growth strategy, in case // in_avail (above) returned zero: if(s.capacity() == s.size()) s.reserve(s.capacity() * 3); Index: libs/regex/doc/syntax_basic.qbk =================================================================== --- libs/regex/doc/syntax_basic.qbk (revision 86295) +++ libs/regex/doc/syntax_basic.qbk (working copy) @@ -173,7 +173,7 @@ [h5 Equivalence classes:] -An expression of theform `[[=col=]]`, matches any character or collating +An expression of the form `[[=col=]]`, matches any character or collating element whose primary sort key is the same as that for collating element /col/, as with collating elements the name /col/ may be a [link boost_regex.syntax.collating_names collating symbolic name]. Index: libs/regex/doc/icu_strings.qbk =================================================================== --- libs/regex/doc/icu_strings.qbk (revision 86295) +++ libs/regex/doc/icu_strings.qbk (working copy) @@ -65,25 +65,25 @@ = boost::regex_constants::perl); [*Effects]: Creates a regular expression object from the Null-terminated -UTF-8 characater sequence /p/. +UTF-8 character sequence /p/. u32regex make_u32regex(const unsigned char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated UTF-8 characater sequence p. +[*Effects]: Creates a regular expression object from the Null-terminated UTF-8 character sequence p. u32regex make_u32regex(const wchar_t* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated characater sequence p. The character encoding of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32. +[*Effects]: Creates a regular expression object from the Null-terminated character sequence p. The character encoding of the sequence is determined based upon sizeof(wchar_t): 1 implies UTF-8, 2 implies UTF-16, and 4 implies UTF-32. u32regex make_u32regex(const UChar* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl); -[*Effects]: Creates a regular expression object from the Null-terminated UTF-16 characater sequence p. +[*Effects]: Creates a regular expression object from the Null-terminated UTF-16 character sequence p. template u32regex make_u32regex(const std::basic_string& s, Index: libs/regex/doc/history.qbk =================================================================== --- libs/regex/doc/history.qbk (revision 86295) +++ libs/regex/doc/history.qbk (working copy) @@ -119,9 +119,9 @@ * Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when using /Zc:wchar_t. * Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler can cope. * Added needed standard library #includes to fileiter.hpp, regex_workaround.hpp and cpp_regex_traits.hpp. -* Fixed a bug where non-greedy repeats could in certain strange curcumstances repeat more times than their maximum value. +* Fixed a bug where non-greedy repeats could in certain strange circumstances repeat more times than their maximum value. * Fixed the value returned by basic_regex<>::empty() from a default constructed object. -* Changed the deffinition of regex_error to make it backwards compatible with Boost-1.32.0. +* Changed the definition of regex_error to make it backwards compatible with Boost-1.32.0. * Disabled external templates for Intel C++ 8.0 and earlier - otherwise unresolved references can occur. * Rewritten extern template code for gcc so that only specific member functions are exported: otherwise strange unresolved references can occur when linking and mixing debug and non-debug code. * Initialise all the data members of the unicode_iterators: this keeps gcc from issuing needless warnings. Index: libs/regex/doc/character_class_names.qbk =================================================================== --- libs/regex/doc/character_class_names.qbk (revision 86295) +++ libs/regex/doc/character_class_names.qbk (working copy) @@ -8,7 +8,7 @@ [section:character_classes Character Class Names] -[section:std_char_clases Character Classes that are Always Supported] +[section:std_char_classes Character Classes that are Always Supported] The following character class names are always supported by Boost.Regex: Index: libs/regex/doc/regex_replace.qbk =================================================================== --- libs/regex/doc/regex_replace.qbk (revision 86295) +++ libs/regex/doc/regex_replace.qbk (working copy) @@ -43,8 +43,8 @@ Formatter fmt, match_flag_type flags = match_default); -Enumerates all the occurences of expression /e/ in the sequence \[first, last), -replacing each occurence with the string that results by merging the +Enumerates all the occurrences of expression /e/ in the sequence \[first, last), +replacing each occurrence with the string that results by merging the match found with the format string /fmt/, and copies the resulting string to /out/. In the case that /fmt/ is a unary, binary or ternary function object, then the character sequence generated by that object is copied unchanged to the output when performing @@ -54,9 +54,9 @@ text are not copied to output. If the flag `format_first_only` is set in flags then only the first -occurence of /e/ is replaced. +occurrence of /e/ is replaced. -The manner in which the format string /fmt/ is interpretted, along with the +The manner in which the format string /fmt/ is interpreted, along with the rules used for finding matches, are determined by the flags set in /flags/: see [match_flag_type]. @@ -251,7 +251,7 @@ const char* header_text = "\n\n" - "Auto-generated html formated source\n" + "Auto-generated html formatted source\n" "\n" "\n" "\n" Index: libs/regex/doc/syntax_extended.qbk =================================================================== --- libs/regex/doc/syntax_extended.qbk (revision 86295) +++ libs/regex/doc/syntax_extended.qbk (working copy) @@ -209,7 +209,7 @@ An expression of the form `[[=col=]]`, matches any character or collating element whose primary sort key is the same as that for collating element /col/, -as with colating elements the name /col/ may be a +as with collating elements the name /col/ may be a [link boost_regex.syntax.collating_names symbolic name]. A primary sort key is one that ignores case, accentation, or locale-specific tailorings; so for example `[[=a=]]` matches any of the characters: @@ -257,7 +257,7 @@ [[\\xdd][A hexadecimal escape sequence - matches the single character whose code point is 0xdd.]] [[\\x{dddd}][A hexadecimal escape sequence - matches the single character whose code point is 0xdddd.]] [[\\0ddd][An octal escape sequence - matches the single character whose code point is 0ddd.]] -[[\\N{Name}][Matches the single character which has the symbolic name name. For example `\\N{newline}` matches the single character \\n.]] +[[\\N{Name}][Matches the single character which has the symbolic name Name. For example `\\N{newline}` matches the single character \\n.]] ] [h5 "Single character" character classes:] Index: libs/regex/doc/regex_iterator.qbk =================================================================== --- libs/regex/doc/regex_iterator.qbk (revision 86295) +++ libs/regex/doc/regex_iterator.qbk (working copy) @@ -203,7 +203,7 @@ const basic_regex& e, regex_constants::match_flag_type m = regex_constants::match_default); -[*Effects]: returns an iterator that enumerates all occurences of expression /e/ +[*Effects]: returns an iterator that enumerates all occurrences of expression /e/ in text /p/ using [match_flag_type] /m/. [h4 Examples] Index: libs/regex/doc/format_sed_syntax.qbk =================================================================== --- libs/regex/doc/format_sed_syntax.qbk (revision 86295) +++ libs/regex/doc/format_sed_syntax.qbk (working copy) @@ -13,7 +13,7 @@ [table [[character][description]] [[&][The ampersand character is replaced in the output stream by - the the whole of what matched the regular expression. Use + the whole of what matched the regular expression. Use \\& to output a literal '&' character.]] [[\\][Specifies an escape sequence.]] ] Index: libs/regex/doc/locale.qbk =================================================================== --- libs/regex/doc/locale.qbk (revision 86295) +++ libs/regex/doc/locale.qbk (working copy) @@ -165,7 +165,7 @@ [[150][The character which when preceded by an escape character represents any single character.]["C" ]] [[151][The character which when preceded by an escape character represents end of buffer operator.]["Z" ]] [[152][The character which when preceded by an escape character represents the continuation assertion.]["G" ]] - [[153][The character which when preceeded by (? indicates a zero width negated forward lookahead assert.][! ]] + [[153][The character which when preceded by (? indicates a zero width negated forward lookahead assert.][! ]] ] Custom error messages are loaded as follows: Index: libs/regex/doc/regex_traits.qbk =================================================================== --- libs/regex/doc/regex_traits.qbk (revision 86295) +++ libs/regex/doc/regex_traits.qbk (working copy) @@ -29,7 +29,7 @@ [h4 Description] -The class `regex_traits` is just a thin wrapper around an actual implemention +The class `regex_traits` is just a thin wrapper around an actual implementation class, which may be one of: * `c_regex_traits`: this class is deprecated, it wraps the C locale, and is used as the default implementation when the platform is not Win32, and the C++ locale is not available.