FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/65420 (Enumerators in std::regex_constants should be constexpr variables instead)

Browse source 
PR libstdc++/65420
	* include/bits/regex_constants.h: Use constexpr variables for flags.
	* testsuite/28_regex/constants/constexpr.cc: New testcase.

From-SVN: r221750
This commit is contained in:
Tim Shen 2015-03-28 04:17:12 +00:00 • committed by Tim Shen
parent 5351658ccc
commit 2894311302
3 changed files with 251 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,9 @@
2015-03-28 Tim Shen <timshen@google.com>
PR libstdc++/65420
* include/bits/regex_constants.h: Use constexpr variables for flags.
* testsuite/28_regex/constants/constexpr.cc: New testcase.
2015-03-27 Jonathan Wakely <jwakely@redhat.com> 2015-03-27 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/65499 PR libstdc++/65499

351
libstdc++-v3/include/bits/regex_constants.h
View file

@ -77,88 +77,97 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* elements @c ECMAScript, @c basic, @c extended, @c awk, @c grep, @c egrep * elements @c ECMAScript, @c basic, @c extended, @c awk, @c grep, @c egrep
* %set. * %set.
*/ */
enum syntax_option_type : unsigned int enum syntax_option_type : unsigned int { };
{
/**
* Specifies that the matching of regular expressions against a character
* sequence shall be performed without regard to case.
*/
icase = 1 << _S_icase,
/** /**
* Specifies that when a regular expression is matched against a character * Specifies that the matching of regular expressions against a character
* container sequence, no sub-expression matches are to be stored in the * sequence shall be performed without regard to case.
* supplied match_results structure. */
*/ constexpr syntax_option_type icase =
nosubs = 1 << _S_nosubs, static_cast<syntax_option_type>(1 << _S_icase);
/** /**
* Specifies that the regular expression engine should pay more attention to * Specifies that when a regular expression is matched against a character
* the speed with which regular expressions are matched, and less to the * container sequence, no sub-expression matches are to be stored in the
* speed with which regular expression objects are constructed. Otherwise * supplied match_results structure.
* it has no detectable effect on the program output. */
*/ constexpr syntax_option_type nosubs =
optimize = 1 << _S_optimize, static_cast<syntax_option_type>(1 << _S_nosubs);
/** /**
* Specifies that character ranges of the form [a-b] should be locale * Specifies that the regular expression engine should pay more attention to
* sensitive. * the speed with which regular expressions are matched, and less to the
*/ * speed with which regular expression objects are constructed. Otherwise
collate = 1 << _S_collate, * it has no detectable effect on the program output.
*/
constexpr syntax_option_type optimize =
static_cast<syntax_option_type>(1 << _S_optimize);
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that character ranges of the form [a-b] should be locale
* that used by ECMAScript in ECMA-262 [Ecma International, ECMAScript * sensitive.
* Language Specification, Standard Ecma-262, third edition, 1999], as */
* modified in section [28.13]. This grammar is similar to that defined constexpr syntax_option_type collate =
* in the PERL scripting language but extended with elements found in the static_cast<syntax_option_type>(1 << _S_collate);
* POSIX regular expression grammar.
*/
ECMAScript = 1 << _S_ECMAScript,
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX basic regular expressions in IEEE Std 1003.1-2001, * that used by ECMAScript in ECMA-262 [Ecma International, ECMAScript
* Portable Operating System Interface (POSIX), Base Definitions and * Language Specification, Standard Ecma-262, third edition, 1999], as
* Headers, Section 9, Regular Expressions [IEEE, Information Technology -- * modified in section [28.13]. This grammar is similar to that defined
* Portable Operating System Interface (POSIX), IEEE Standard 1003.1-2001]. * in the PERL scripting language but extended with elements found in the
*/ * POSIX regular expression grammar.
basic = 1 << _S_basic, */
constexpr syntax_option_type ECMAScript =
static_cast<syntax_option_type>(1 << _S_ECMAScript);
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX extended regular expressions in IEEE Std 1003.1-2001, * that used by POSIX basic regular expressions in IEEE Std 1003.1-2001,
* Portable Operating System Interface (POSIX), Base Definitions and * Portable Operating System Interface (POSIX), Base Definitions and
* Headers, Section 9, Regular Expressions. * Headers, Section 9, Regular Expressions [IEEE, Information Technology --
*/ * Portable Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
extended = 1 << _S_extended, */
constexpr syntax_option_type basic =
static_cast<syntax_option_type>(1 << _S_basic);
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX utility awk in IEEE Std 1003.1-2001. This option is * that used by POSIX extended regular expressions in IEEE Std 1003.1-2001,
* identical to syntax_option_type extended, except that C-style escape * Portable Operating System Interface (POSIX), Base Definitions and
* sequences are supported. These sequences are: * Headers, Section 9, Regular Expressions.
* \\\\, \\a, \\b, \\f, \\n, \\r, \\t , \\v, \\&apos,, &apos,, */
* and \\ddd (where ddd is one, two, or three octal digits). constexpr syntax_option_type extended =
*/ static_cast<syntax_option_type>(1 << _S_extended);
awk = 1 << _S_awk,
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX utility grep in IEEE Std 1003.1-2001. This option is * that used by POSIX utility awk in IEEE Std 1003.1-2001. This option is
* identical to syntax_option_type basic, except that newlines are treated * identical to syntax_option_type extended, except that C-style escape
* as whitespace. * sequences are supported. These sequences are:
*/ * \\\\, \\a, \\b, \\f, \\n, \\r, \\t , \\v, \\&apos,, &apos,,
grep = 1 << _S_grep, * and \\ddd (where ddd is one, two, or three octal digits).
*/
constexpr syntax_option_type awk =
static_cast<syntax_option_type>(1 << _S_awk);
/** /**
* Specifies that the grammar recognized by the regular expression engine is * Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX utility grep when given the -E option in * that used by POSIX utility grep in IEEE Std 1003.1-2001. This option is
* IEEE Std 1003.1-2001. This option is identical to syntax_option_type * identical to syntax_option_type basic, except that newlines are treated
* extended, except that newlines are treated as whitespace. * as whitespace.
*/ */
egrep = 1 << _S_egrep, constexpr syntax_option_type grep =
}; static_cast<syntax_option_type>(1 << _S_grep);
/**
* Specifies that the grammar recognized by the regular expression engine is
* that used by POSIX utility grep when given the -E option in
* IEEE Std 1003.1-2001. This option is identical to syntax_option_type
* extended, except that newlines are treated as whitespace.
*/
constexpr syntax_option_type egrep =
static_cast<syntax_option_type>(1 << _S_egrep);
constexpr inline syntax_option_type constexpr inline syntax_option_type
operator&(syntax_option_type __a, syntax_option_type __b) operator&(syntax_option_type __a, syntax_option_type __b)
@ -233,111 +242,121 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* perform bitwise operations on these values and expect the right thing to * perform bitwise operations on these values and expect the right thing to
* happen. * happen.
*/ */
enum match_flag_type : unsigned int enum match_flag_type : unsigned int { };
{
/**
* The default matching rules.
*/
match_default = 0,
/** /**
* The first character in the sequence [first, last) is treated as though it * The default matching rules.
* is not at the beginning of a line, so the character (^) in the regular */
* expression shall not match [first, first). constexpr match_flag_type match_default = static_cast<match_flag_type>(0);
*/
match_not_bol = 1 << _S_not_bol,
/** /**
* The last character in the sequence [first, last) is treated as though it * The first 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 * is not at the beginning of a line, so the character (^) in the regular
* expression shall not match [last, last). * expression shall not match [first, first).
*/ */
match_not_eol = 1 << _S_not_eol, constexpr match_flag_type match_not_bol =
static_cast<match_flag_type>(1 << _S_not_bol);
/** /**
* The expression \\b is not matched against the sub-sequence * The last character in the sequence [first, last) is treated as though it
* [first,first). * is not at the end of a line, so the character ($) in the regular
*/ * expression shall not match [last, last).
match_not_bow = 1 << _S_not_bow, */
constexpr match_flag_type match_not_eol =
static_cast<match_flag_type>(1 << _S_not_eol);
/** /**
* The expression \\b should not be matched against the sub-sequence * The expression \\b is not matched against the sub-sequence
* [last,last). * [first,first).
*/ */
match_not_eow = 1 << _S_not_eow, constexpr match_flag_type match_not_bow =
static_cast<match_flag_type>(1 << _S_not_bow);
/** /**
* If more than one match is possible then any match is an acceptable * The expression \\b should not be matched against the sub-sequence
* result. * [last,last).
*/ */
match_any = 1 << _S_any, constexpr match_flag_type match_not_eow =
static_cast<match_flag_type>(1 << _S_not_eow);
/** /**
* The expression does not match an empty sequence. * If more than one match is possible then any match is an acceptable
*/ * result.
match_not_null = 1 << _S_not_null, */
constexpr match_flag_type match_any =
static_cast<match_flag_type>(1 << _S_any);
/** /**
* The expression only matches a sub-sequence that begins at first . * The expression does not match an empty sequence.
*/ */
match_continuous = 1 << _S_continuous, constexpr match_flag_type match_not_null =
static_cast<match_flag_type>(1 << _S_not_null);
/** /**
* --first is a valid iterator position. When this flag is set then the * The expression only matches a sub-sequence that begins at first .
* flags match_not_bol and match_not_bow are ignored by the regular */
* expression algorithms 28.11 and iterators 28.12. constexpr match_flag_type match_continuous =
*/ static_cast<match_flag_type>(1 << _S_continuous);
match_prev_avail = 1 << _S_prev_avail,
/** /**
* When a regular expression match is to be replaced by a new string, the * --first is a valid iterator position. When this flag is set then the
* new string is constructed using the rules used by the ECMAScript replace * flags match_not_bol and match_not_bow are ignored by the regular
* function in ECMA- 262 [Ecma International, ECMAScript Language * expression algorithms 28.11 and iterators 28.12.
* Specification, Standard Ecma-262, third edition, 1999], part 15.5.4.11 */
* String.prototype.replace. In addition, during search and replace constexpr match_flag_type match_prev_avail =
* operations all non-overlapping occurrences of the regular expression static_cast<match_flag_type>(1 << _S_prev_avail);
* are located and replaced, and sections of the input that did not match
* the expression are copied unchanged to the output string.
*
* Format strings (from ECMA-262 [15.5.4.11]):
* @li $$ The dollar-sign itself ($)
* @li $& The matched substring.
* @li $` The portion of @a string that precedes the matched substring.
* This would be match_results::prefix().
* @li $' The portion of @a string that follows the matched substring.
* This would be match_results::suffix().
* @li $n The nth capture, where n is in [1,9] and $n is not followed by a
* decimal digit. If n <= match_results::size() and the nth capture
* is undefined, use the empty string instead. If n >
* match_results::size(), the result is implementation-defined.
* @li $nn The nnth capture, where nn is a two-digit decimal number on
* [01, 99]. If nn <= match_results::size() and the nth capture is
* undefined, use the empty string instead. If
* nn > match_results::size(), the result is implementation-defined.
*/
format_default = 0,
/** /**
* When a regular expression match is to be replaced by a new string, the * When a regular expression match is to be replaced by a new string, the
* new string is constructed using the rules used by the POSIX sed utility * new string is constructed using the rules used by the ECMAScript replace
* in IEEE Std 1003.1- 2001 [IEEE, Information Technology -- Portable * function in ECMA- 262 [Ecma International, ECMAScript Language
* Operating System Interface (POSIX), IEEE Standard 1003.1-2001]. * Specification, Standard Ecma-262, third edition, 1999], part 15.5.4.11
*/ * String.prototype.replace. In addition, during search and replace
format_sed = 1 << _S_sed, * operations all non-overlapping occurrences of the regular expression
* are located and replaced, and sections of the input that did not match
* the expression are copied unchanged to the output string.
*
* Format strings (from ECMA-262 [15.5.4.11]):
* @li $$ The dollar-sign itself ($)
* @li $& The matched substring.
* @li $` The portion of @a string that precedes the matched substring.
* This would be match_results::prefix().
* @li $' The portion of @a string that follows the matched substring.
* This would be match_results::suffix().
* @li $n The nth capture, where n is in [1,9] and $n is not followed by a
* decimal digit. If n <= match_results::size() and the nth capture
* is undefined, use the empty string instead. If n >
* match_results::size(), the result is implementation-defined.
* @li $nn The nnth capture, where nn is a two-digit decimal number on
* [01, 99]. If nn <= match_results::size() and the nth capture is
* undefined, use the empty string instead. If
* nn > match_results::size(), the result is implementation-defined.
*/
constexpr match_flag_type format_default = static_cast<match_flag_type>(0);
/** /**
* During a search and replace operation, sections of the character * When a regular expression match is to be replaced by a new string, the
* container sequence being searched that do not match the regular * new string is constructed using the rules used by the POSIX sed utility
* expression shall not be copied to the output string. * in IEEE Std 1003.1- 2001 [IEEE, Information Technology -- Portable
*/ * Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
format_no_copy = 1 << _S_no_copy, */
constexpr match_flag_type format_sed =
static_cast<match_flag_type>(1 << _S_sed);
/** /**
* When specified during a search and replace operation, only the first * During a search and replace operation, sections of the character
* occurrence of the regular expression shall be replaced. * container sequence being searched that do not match the regular
*/ * expression shall not be copied to the output string.
format_first_only = 1 << _S_first_only, */
}; constexpr match_flag_type format_no_copy =
static_cast<match_flag_type>(1 << _S_no_copy);
/**
* When specified during a search and replace operation, only the first
* occurrence of the regular expression shall be replaced.
*/
constexpr match_flag_type format_first_only =
static_cast<match_flag_type>(1 << _S_first_only);
constexpr inline match_flag_type constexpr inline match_flag_type
operator&(match_flag_type __a, match_flag_type __b) operator&(match_flag_type __a, match_flag_type __b)

60
libstdc++-v3/testsuite/28_regex/constants/constexpr.cc Normal file
View file

@ -0,0 +1,60 @@
// { dg-options "-std=gnu++11" }
// { dg-do compile }
//
// Copyright (C) 2015 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// 28.5.4
#include <regex>
// libstdc++/65420
void
test01()
{
const std::regex_constants::syntax_option_type* option __attribute__((unused));
option = &std::regex_constants::icase;
option = &std::regex_constants::nosubs;
option = &std::regex_constants::optimize;
option = &std::regex_constants::collate;
option = &std::regex_constants::ECMAScript;
option = &std::regex_constants::basic;
option = &std::regex_constants::extended;
option = &std::regex_constants::awk;
option = &std::regex_constants::grep;
option = &std::regex_constants::egrep;
const std::regex_constants::match_flag_type* flag __attribute__((unused));
flag = &std::regex_constants::match_not_bol;
flag = &std::regex_constants::match_not_eol;
flag = &std::regex_constants::match_not_bow;
flag = &std::regex_constants::match_not_eow;
flag = &std::regex_constants::match_any;
flag = &std::regex_constants::match_not_null;
flag = &std::regex_constants::match_continuous;
flag = &std::regex_constants::match_prev_avail;
flag = &std::regex_constants::format_default;
flag = &std::regex_constants::format_sed;
flag = &std::regex_constants::format_no_copy;
flag = &std::regex_constants::format_first_only;
}
int main()
{
test01();
return 0;
}