[gcc r12-5975] libstdc++: Simplify definition of std::regex_constants variables
Jonathan Wakely
redi@gcc.gnu.org
Tue Dec 14 21:47:25 GMT 2021
https://gcc.gnu.org/g:63bb98e1c1eabaa9a68e8a6270663f2dfff047d8
commit r12-5975-g63bb98e1c1eabaa9a68e8a6270663f2dfff047d8
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Dec 14 13:31:11 2021 +0000
libstdc++: Simplify definition of std::regex_constants variables
This removes the __syntax_option and __match_flag enumeration types,
which are only used to define enumerators with successive values that
are then used to initialize the std::regex_constants global variables.
By defining enumerators in the syntax_option_type and match_flag_type
enumeration types with the correct values for the globals we get rid of
two useless enumeration types that just count from 0 to N, and we
improve the debugging experience. Because the enumeration types now have
enumerators defined, GDB will print values in terms of those enumerators
e.g.
$6 = (std::regex_constants::_S_ECMAScript | std::regex_constants::_S_multiline)
Previously this would have been shown as simply 0x810 because there were
no enumerators of that type.
This changes the type and value of enumerators such as _S_grep, but
users should never be referring to them directly anyway.
libstdc++-v3/ChangeLog:
* include/bits/regex_constants.h (__syntax_option, __match_flag):
Remove.
(syntax_option_type, match_flag_type): Define enumerators.
Use to initialize globals. Add constexpr to compound assignment
operators.
* include/bits/regex_error.h (error_type): Add comment.
* testsuite/28_regex/constants/constexpr.cc: Remove comment.
* testsuite/28_regex/constants/error_type.cc: Improve comment.
* testsuite/28_regex/constants/match_flag_type.cc: Check bitmask
requirements.
* testsuite/28_regex/constants/syntax_option_type.cc: Likewise.
Diff:
---
libstdc++-v3/include/bits/regex_constants.h | 148 +++++++++------------
libstdc++-v3/include/bits/regex_error.h | 2 +-
.../testsuite/28_regex/constants/constexpr.cc | 2 -
.../testsuite/28_regex/constants/error_type.cc | 2 +-
.../28_regex/constants/match_flag_type.cc | 25 +++-
.../28_regex/constants/syntax_option_type.cc | 26 +++-
6 files changed, 114 insertions(+), 91 deletions(-)
diff --git a/libstdc++-v3/include/bits/regex_constants.h b/libstdc++-v3/include/bits/regex_constants.h
index 0fd2879c817..9be14292519 100644
--- a/libstdc++-v3/include/bits/regex_constants.h
+++ b/libstdc++-v3/include/bits/regex_constants.h
@@ -51,21 +51,6 @@ namespace regex_constants
* @name 5.1 Regular Expression Syntax Options
*/
///@{
- enum __syntax_option
- {
- _S_icase,
- _S_nosubs,
- _S_optimize,
- _S_collate,
- _S_ECMAScript,
- _S_basic,
- _S_extended,
- _S_awk,
- _S_grep,
- _S_egrep,
- _S_polynomial,
- _S_multiline
- };
/**
* @brief This is a bitmask type indicating how to interpret the regex.
@@ -78,22 +63,34 @@ namespace regex_constants
* elements @c ECMAScript, @c basic, @c extended, @c awk, @c grep, @c egrep
* %set.
*/
- enum syntax_option_type : unsigned int { };
+ enum syntax_option_type : unsigned int
+ {
+ _S_icase = 1 << 0,
+ _S_nosubs = 1 << 1,
+ _S_optimize = 1 << 2,
+ _S_collate = 1 << 3,
+ _S_ECMAScript = 1 << 4,
+ _S_basic = 1 << 5,
+ _S_extended = 1 << 6,
+ _S_awk = 1 << 7,
+ _S_grep = 1 << 8,
+ _S_egrep = 1 << 9,
+ _S_polynomial = 1 << 10,
+ _S_multiline = 1 << 11
+ };
/**
* Specifies that the matching of regular expressions against a character
* sequence shall be performed without regard to case.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type icase =
- static_cast<syntax_option_type>(1 << _S_icase);
+ _GLIBCXX17_INLINE constexpr syntax_option_type icase = _S_icase;
/**
* Specifies that when a regular expression is matched against a character
* container sequence, no sub-expression matches are to be stored in the
* supplied match_results structure.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type nosubs =
- static_cast<syntax_option_type>(1 << _S_nosubs);
+ _GLIBCXX17_INLINE constexpr syntax_option_type nosubs = _S_nosubs;
/**
* Specifies that the regular expression engine should pay more attention to
@@ -101,15 +98,13 @@ namespace regex_constants
* speed with which regular expression objects are constructed. Otherwise
* it has no detectable effect on the program output.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type optimize =
- static_cast<syntax_option_type>(1 << _S_optimize);
+ _GLIBCXX17_INLINE constexpr syntax_option_type optimize = _S_optimize;
/**
* Specifies that character ranges of the form [a-b] should be locale
* sensitive.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type collate =
- static_cast<syntax_option_type>(1 << _S_collate);
+ _GLIBCXX17_INLINE constexpr syntax_option_type collate = _S_collate;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -119,8 +114,7 @@ namespace regex_constants
* in the PERL scripting language but extended with elements found in the
* POSIX regular expression grammar.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type ECMAScript =
- static_cast<syntax_option_type>(1 << _S_ECMAScript);
+ _GLIBCXX17_INLINE constexpr syntax_option_type ECMAScript = _S_ECMAScript;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -129,8 +123,7 @@ namespace regex_constants
* Headers, Section 9, Regular Expressions [IEEE, Information Technology --
* Portable Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type basic =
- static_cast<syntax_option_type>(1 << _S_basic);
+ _GLIBCXX17_INLINE constexpr syntax_option_type basic = _S_basic;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -138,8 +131,7 @@ namespace regex_constants
* Portable Operating System Interface (POSIX), Base Definitions and
* Headers, Section 9, Regular Expressions.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type extended =
- static_cast<syntax_option_type>(1 << _S_extended);
+ _GLIBCXX17_INLINE constexpr syntax_option_type extended = _S_extended;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -149,8 +141,7 @@ namespace regex_constants
* \\\\, \\a, \\b, \\f, \\n, \\r, \\t , \\v, \\&apos,, &apos,,
* and \\ddd (where ddd is one, two, or three octal digits).
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type awk =
- static_cast<syntax_option_type>(1 << _S_awk);
+ _GLIBCXX17_INLINE constexpr syntax_option_type awk = _S_awk;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -158,8 +149,7 @@ namespace regex_constants
* identical to syntax_option_type basic, except that newlines are treated
* as whitespace.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type grep =
- static_cast<syntax_option_type>(1 << _S_grep);
+ _GLIBCXX17_INLINE constexpr syntax_option_type grep = _S_grep;
/**
* Specifies that the grammar recognized by the regular expression engine is
@@ -167,8 +157,7 @@ namespace regex_constants
* IEEE Std 1003.1-2001. This option is identical to syntax_option_type
* extended, except that newlines are treated as whitespace.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type egrep =
- static_cast<syntax_option_type>(1 << _S_egrep);
+ _GLIBCXX17_INLINE constexpr syntax_option_type egrep = _S_egrep;
#if __cplusplus >= 201703L || !defined __STRICT_ANSI__
// _GLIBCXX_RESOLVE_LIB_DEFECTS
@@ -180,13 +169,11 @@ namespace regex_constants
* Valid for the ECMAScript syntax, ignored otherwise.
* @since C++17
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type multiline =
- static_cast<syntax_option_type>(1 << _S_multiline);
+ _GLIBCXX17_INLINE constexpr syntax_option_type multiline = _S_multiline;
#endif
/// Extension: Equivalent to regex_constants::multiline for C++11 and C++14.
- _GLIBCXX17_INLINE constexpr syntax_option_type __multiline =
- static_cast<syntax_option_type>(1 << _S_multiline);
+ _GLIBCXX17_INLINE constexpr syntax_option_type __multiline = _S_multiline;
/**
* Extension: Ensure both space complexity of compiled regex and
@@ -194,8 +181,7 @@ namespace regex_constants
* If specified in a regex with back-references, the exception
* regex_constants::error_complexity will be thrown.
*/
- _GLIBCXX17_INLINE constexpr syntax_option_type __polynomial =
- static_cast<syntax_option_type>(1 << _S_polynomial);
+ _GLIBCXX17_INLINE constexpr syntax_option_type __polynomial = _S_polynomial;
constexpr inline syntax_option_type
operator&(syntax_option_type __a, syntax_option_type __b)
@@ -222,14 +208,17 @@ namespace regex_constants
operator~(syntax_option_type __a)
{ return (syntax_option_type)(~static_cast<unsigned int>(__a)); }
+ _GLIBCXX14_CONSTEXPR
inline syntax_option_type&
operator&=(syntax_option_type& __a, syntax_option_type __b)
{ return __a = __a & __b; }
+ _GLIBCXX14_CONSTEXPR
inline syntax_option_type&
operator|=(syntax_option_type& __a, syntax_option_type __b)
{ return __a = __a | __b; }
+ _GLIBCXX14_CONSTEXPR
inline syntax_option_type&
operator^=(syntax_option_type& __a, syntax_option_type __b)
{ return __a = __a ^ __b; }
@@ -247,22 +236,6 @@ namespace regex_constants
*/
///@{
- enum __match_flag
- {
- _S_not_bol,
- _S_not_eol,
- _S_not_bow,
- _S_not_eow,
- _S_any,
- _S_not_null,
- _S_continuous,
- _S_prev_avail,
- _S_sed,
- _S_no_copy,
- _S_first_only,
- _S_match_flag_last
- };
-
/**
* @brief This is a bitmask type indicating regex matching rules.
*
@@ -270,62 +243,69 @@ namespace regex_constants
* perform bitwise operations on these values and expect the right thing to
* happen.
*/
- enum match_flag_type : unsigned int { };
+ enum match_flag_type : unsigned int
+ {
+ _S_default,
+ _S_not_bol = 1 << 0,
+ _S_not_eol = 1 << 1,
+ _S_not_bow = 1 << 2,
+ _S_not_eow = 1 << 3,
+ _S_any = 1 << 4,
+ _S_not_null = 1 << 5,
+ _S_continuous = 1 << 6,
+ _S_prev_avail = 1 << 7,
+ _S_sed = 1 << 8,
+ _S_no_copy = 1 << 9,
+ _S_first_only = 1 << 10,
+ _S_match_flag_last = 1 << 11
+ };
/**
* The default matching rules.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_default =
- static_cast<match_flag_type>(0);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_default = _S_default;
/**
* The first character in the sequence [first, last) is treated as though it
* is not at the beginning of a line, so the character (^) in the regular
* expression shall not match [first, first).
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_not_bol =
- static_cast<match_flag_type>(1 << _S_not_bol);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_not_bol = _S_not_bol;
/**
* The last character in the sequence [first, last) is treated as though it
* is not at the end of a line, so the character ($) in the regular
* expression shall not match [last, last).
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_not_eol =
- static_cast<match_flag_type>(1 << _S_not_eol);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_not_eol = _S_not_eol;
/**
* The expression \\b is not matched against the sub-sequence
* [first,first).
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_not_bow =
- static_cast<match_flag_type>(1 << _S_not_bow);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_not_bow = _S_not_bow;
/**
* The expression \\b should not be matched against the sub-sequence
* [last,last).
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_not_eow =
- static_cast<match_flag_type>(1 << _S_not_eow);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_not_eow = _S_not_eow;
/**
* If more than one match is possible then any match is an acceptable
* result.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_any =
- static_cast<match_flag_type>(1 << _S_any);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_any = _S_any;
/**
* The expression does not match an empty sequence.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_not_null =
- static_cast<match_flag_type>(1 << _S_not_null);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_not_null = _S_not_null;
/**
* The expression only matches a sub-sequence that begins at first .
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_continuous =
- static_cast<match_flag_type>(1 << _S_continuous);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_continuous = _S_continuous;
/**
* `--first` is a valid iterator position. When this flag is set then the
@@ -333,8 +313,7 @@ namespace regex_constants
* `regex_match`, `regex_search`, and `regex_replace`, and by the iterators
* `regex_iterator` and `regex_token_iterator`.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type match_prev_avail =
- static_cast<match_flag_type>(1 << _S_prev_avail);
+ _GLIBCXX17_INLINE constexpr match_flag_type match_prev_avail = _S_prev_avail;
/**
* When a regular expression match is to be replaced by a new string, the
@@ -362,8 +341,7 @@ namespace regex_constants
* undefined, use the empty string instead. If
* nn > match_results::size(), the result is implementation-defined.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type format_default =
- static_cast<match_flag_type>(0);
+ _GLIBCXX17_INLINE constexpr match_flag_type format_default = _S_default;
/**
* When a regular expression match is to be replaced by a new string, the
@@ -371,23 +349,20 @@ namespace regex_constants
* in IEEE Std 1003.1- 2001 [IEEE, Information Technology -- Portable
* Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
*/
- _GLIBCXX17_INLINE constexpr match_flag_type format_sed =
- static_cast<match_flag_type>(1 << _S_sed);
+ _GLIBCXX17_INLINE constexpr match_flag_type format_sed = _S_sed;
/**
* During a search and replace operation, sections of the character
* container sequence being searched that do not match the regular
* expression shall not be copied to the output string.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type format_no_copy =
- static_cast<match_flag_type>(1 << _S_no_copy);
+ _GLIBCXX17_INLINE constexpr match_flag_type format_no_copy = _S_no_copy;
/**
* When specified during a search and replace operation, only the first
* occurrence of the regular expression shall be replaced.
*/
- _GLIBCXX17_INLINE constexpr match_flag_type format_first_only =
- static_cast<match_flag_type>(1 << _S_first_only);
+ _GLIBCXX17_INLINE constexpr match_flag_type format_first_only = _S_first_only;
constexpr inline match_flag_type
operator&(match_flag_type __a, match_flag_type __b)
@@ -414,14 +389,17 @@ namespace regex_constants
operator~(match_flag_type __a)
{ return (match_flag_type)(~static_cast<unsigned int>(__a)); }
+ _GLIBCXX14_CONSTEXPR
inline match_flag_type&
operator&=(match_flag_type& __a, match_flag_type __b)
{ return __a = __a & __b; }
+ _GLIBCXX14_CONSTEXPR
inline match_flag_type&
operator|=(match_flag_type& __a, match_flag_type __b)
{ return __a = __a | __b; }
+ _GLIBCXX14_CONSTEXPR
inline match_flag_type&
operator^=(match_flag_type& __a, match_flag_type __b)
{ return __a = __a ^ __b; }
diff --git a/libstdc++-v3/include/bits/regex_error.h b/libstdc++-v3/include/bits/regex_error.h
index e7b7b420ec4..b447f2b6b02 100644
--- a/libstdc++-v3/include/bits/regex_error.h
+++ b/libstdc++-v3/include/bits/regex_error.h
@@ -48,7 +48,7 @@ namespace regex_constants
enum error_type
{
- _S_error_collate,
+ _S_error_collate, // XXX should have been a non-zero value
_S_error_ctype,
_S_error_escape,
_S_error_backref,
diff --git a/libstdc++-v3/testsuite/28_regex/constants/constexpr.cc b/libstdc++-v3/testsuite/28_regex/constants/constexpr.cc
index 3bf6c1af9b4..818a57c951c 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/constexpr.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/constexpr.cc
@@ -18,8 +18,6 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// 28.5.4
-
#include <regex>
// libstdc++/65420
diff --git a/libstdc++-v3/testsuite/28_regex/constants/error_type.cc b/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
index e8a9c1397ed..48407e77bd8 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
@@ -20,7 +20,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// 28.5.3
+// C++11 28.5.3 [re.err]
#include <regex>
diff --git a/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc b/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
index 0f00dbe4cc6..a3dc06ba45e 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
@@ -20,9 +20,10 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// 28.5.1
+// C++11 28.5.2 [re.matchflag]
#include <regex>
+#include <testsuite_common_types.h>
void
test01()
@@ -43,6 +44,28 @@ test01()
flag |= std::regex_constants::format_first_only;
}
+#if __cplusplus >= 201402L
+static_assert(
+ __gnu_test::test_bitmask_values( {
+ std::regex_constants::match_not_bol,
+ std::regex_constants::match_not_eol,
+ std::regex_constants::match_not_bow,
+ std::regex_constants::match_not_eow,
+ std::regex_constants::match_any,
+ std::regex_constants::match_not_null,
+ std::regex_constants::match_continuous,
+ std::regex_constants::match_prev_avail,
+ std::regex_constants::format_sed,
+ std::regex_constants::format_no_copy,
+ std::regex_constants::format_first_only
+ },
+ {
+ std::regex_constants::match_default,
+ std::regex_constants::format_default
+ }),
+ "std::regex_constants::match_flag_type bitmask elements are distinct" );
+#endif
+
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/28_regex/constants/syntax_option_type.cc b/libstdc++-v3/testsuite/28_regex/constants/syntax_option_type.cc
index 8706df4cdfa..0ed17208a05 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/syntax_option_type.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/syntax_option_type.cc
@@ -20,10 +20,11 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// 28.5.1
+// C++11 28.5.1 [re.synopt]
#include <regex>
#include <testsuite_hooks.h>
+#include <testsuite_common_types.h>
void
test01()
@@ -92,6 +93,29 @@ test05()
VERIFY(re.mark_count() == 0);
}
+#if __cplusplus >= 201402L
+static_assert(
+ __gnu_test::test_bitmask_values( {
+ std::regex_constants::icase,
+ std::regex_constants::nosubs,
+ std::regex_constants::optimize,
+ std::regex_constants::collate,
+ std::regex_constants::ECMAScript,
+ std::regex_constants::basic,
+ std::regex_constants::extended,
+ std::regex_constants::awk,
+ std::regex_constants::grep,
+ std::regex_constants::egrep,
+ std::regex_constants::__multiline,
+ std::regex_constants::__polynomial
+ }, {
+#if __cplusplus >= 201703L
+ std::regex_constants::multiline // equal to __multiline
+#endif
+ }),
+ "std::regex_constants::syntax_option_type bitmask elements are distinct" );
+#endif
+
int main()
{
test01();
More information about the Libstdc++-cvs
mailing list