From 4370fe46074470abf5b31d4bce4115689a7aebcc Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 7 Apr 2006 10:21:19 +0000 Subject: [PATCH] Added no_except docs. [SVN r33585] --- doc/Attic/basic_regex.html | 22 +++++++++++++++------- doc/Attic/syntax_option_type.html | 22 ++++++++++++++++++++++ doc/basic_regex.html | 22 +++++++++++++++------- doc/syntax_option_type.html | 22 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/doc/Attic/basic_regex.html b/doc/Attic/basic_regex.html index a2aa6f96..16774739 100644 --- a/doc/Attic/basic_regex.html +++ b/doc/Attic/basic_regex.html @@ -95,6 +95,7 @@ class basic_regex { static const regex_constants::syntax_option_type optimize = regex_constants::optimize; static const regex_constants::syntax_option_type collate = regex_constants::collate; static const regex_constants::syntax_option_type newline_alt = regex_constants::newline_alt; + static const regex_constants::syntax_option_type no_except = regex_constants::newline_alt; // construct/copy/destroy: explicit basic_regex (); @@ -134,6 +135,7 @@ class basic_regex { // const operations: flag_type flags() const; + int status()const; basic_string<charT> str() const; int compare(basic_regex&) const; // locale: @@ -264,7 +266,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta

Requires: p shall not be a null pointer.

Throws: bad_expression if p is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the null-terminated string p, and interpreted @@ -332,7 +334,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta 

basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);

Requires: p1 and p2 are not null pointers, p1 < p2.

Throws: bad_expression if [p1,p2) is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [p1,p2), and interpreted @@ -401,7 +403,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta

Requires: p shall not be a null pointer, len < max_size().

Throws: bad_expression if p is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [p, p+len), and interpreted @@ -529,7 +531,7 @@ template <class ST, class SA> basic_regex(const basic_string<charT, ST, SA>& s, flag_type f = regex_constants::normal);

Throws: bad_expression if s is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the string s, and interpreted according to the @@ -596,7 +598,7 @@ template <class ForwardIterator> basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);

Throws: bad_expression if the sequence [first, last) - is not a valid regular expression.

+ is not a valid regular expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [first, last), and @@ -672,7 +674,6 @@ template <class ST, class SA> basic_regex& operator=(const basic_string<charT, ST, SA>& p);

Effects: Returns the result of assign(p).

-

basic_regex iterators


 const_iterator begin() const;
@@ -720,7 +721,7 @@ basic_regex& assign(const charT* ptr, flag_type f = regex_constants::normal)
                     flag_type f = regex_constants::normal);

Throws: bad_expression if s is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Returns: *this.

Effects: Assigns the regular expression contained in the string s, interpreted according the option flags specified @@ -796,6 +797,13 @@ basic_regex& assign(InputIterator first, InputIterator last,

Effects: Returns a copy of the regular expression syntax flags that were passed to the object's constructor, or the last call to assign.

+ + 
int status() const;
+ +

Effects: Returns zero if the expression contains a valid + regular expression, otherwise an error code.  + This member function is retained for use in environments that cannot use + exception handling.

basic_string<charT> str() const;

Effects: Returns a copy of the character sequence passed to the object's diff --git a/doc/Attic/syntax_option_type.html b/doc/Attic/syntax_option_type.html index e346af32..fbd5cdbe 100644 --- a/doc/Attic/syntax_option_type.html +++ b/doc/Attic/syntax_option_type.html @@ -170,6 +170,12 @@ static const syntax_option_type collate; operator |.  Allows newline separated lists to be used as a list of alternatives. + + no_except + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. + no_mod_m No @@ -326,6 +332,14 @@ static const syntax_option_type collate; on by default for POSIX-Extended regular expressions, but can be unset to support for backreferences on. + + no_except +   + + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. +

Options for POSIX Basic Regular Expressions:

@@ -458,6 +472,14 @@ static const syntax_option_type collate; No When set then \| acts as the alternation operator. + + no_except + + + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. +

Options for Literal Strings:

diff --git a/doc/basic_regex.html b/doc/basic_regex.html index a2aa6f96..16774739 100644 --- a/doc/basic_regex.html +++ b/doc/basic_regex.html @@ -95,6 +95,7 @@ class basic_regex { static const regex_constants::syntax_option_type optimize = regex_constants::optimize; static const regex_constants::syntax_option_type collate = regex_constants::collate; static const regex_constants::syntax_option_type newline_alt = regex_constants::newline_alt; + static const regex_constants::syntax_option_type no_except = regex_constants::newline_alt; // construct/copy/destroy: explicit basic_regex (); @@ -134,6 +135,7 @@ class basic_regex { // const operations: flag_type flags() const; + int status()const; basic_string<charT> str() const; int compare(basic_regex&) const; // locale: @@ -264,7 +266,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta

Requires: p shall not be a null pointer.

Throws: bad_expression if p is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the null-terminated string p, and interpreted @@ -332,7 +334,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta 

basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);

Requires: p1 and p2 are not null pointers, p1 < p2.

Throws: bad_expression if [p1,p2) is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [p1,p2), and interpreted @@ -401,7 +403,7 @@ static const regex_constants::syntax_option_type newline_alt = regex_consta

Requires: p shall not be a null pointer, len < max_size().

Throws: bad_expression if p is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [p, p+len), and interpreted @@ -529,7 +531,7 @@ template <class ST, class SA> basic_regex(const basic_string<charT, ST, SA>& s, flag_type f = regex_constants::normal);

Throws: bad_expression if s is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the string s, and interpreted according to the @@ -596,7 +598,7 @@ template <class ForwardIterator> basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);

Throws: bad_expression if the sequence [first, last) - is not a valid regular expression.

+ is not a valid regular expression, unless the flag no_except is set in f.

Effects: Constructs an object of class basic_regex; the object's internal finite state machine is constructed from the regular expression contained in the sequence of characters [first, last), and @@ -672,7 +674,6 @@ template <class ST, class SA> basic_regex& operator=(const basic_string<charT, ST, SA>& p);

Effects: Returns the result of assign(p).

-

basic_regex iterators


 const_iterator begin() const;
@@ -720,7 +721,7 @@ basic_regex& assign(const charT* ptr, flag_type f = regex_constants::normal)
                     flag_type f = regex_constants::normal);

Throws: bad_expression if s is not a valid regular - expression.

+ expression, unless the flag no_except is set in f.

Returns: *this.

Effects: Assigns the regular expression contained in the string s, interpreted according the option flags specified @@ -796,6 +797,13 @@ basic_regex& assign(InputIterator first, InputIterator last,

Effects: Returns a copy of the regular expression syntax flags that were passed to the object's constructor, or the last call to assign.

+ + 
int status() const;
+ +

Effects: Returns zero if the expression contains a valid + regular expression, otherwise an error code.  + This member function is retained for use in environments that cannot use + exception handling.

basic_string<charT> str() const;

Effects: Returns a copy of the character sequence passed to the object's diff --git a/doc/syntax_option_type.html b/doc/syntax_option_type.html index e346af32..fbd5cdbe 100644 --- a/doc/syntax_option_type.html +++ b/doc/syntax_option_type.html @@ -170,6 +170,12 @@ static const syntax_option_type collate; operator |.  Allows newline separated lists to be used as a list of alternatives. + + no_except + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. + no_mod_m No @@ -326,6 +332,14 @@ static const syntax_option_type collate; on by default for POSIX-Extended regular expressions, but can be unset to support for backreferences on. + + no_except +   + + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. +

Options for POSIX Basic Regular Expressions:

@@ -458,6 +472,14 @@ static const syntax_option_type collate; No When set then \| acts as the alternation operator. + + no_except + + + No + Prevents basic_regex from throwing an exception when an invalid expression is + encountered. +

Options for Literal Strings: