OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ctype_base::blank in regex_traits.

Browse Source 
* include/bits/regex.h (regex_traits::_RegexMask): Remove _S_blank and
	adjust _S_valid_mask.
	* include/bits/regex.tcc (regex_traits::lookup_classname): Use
	ctype_base::blank.

From-SVN: r217066
This commit is contained in:
Jonathan Wakely 2014-11-04 02:49:30 +00:00 committed by Jonathan Wakely
parent 9bcb72e0b0
commit ac6f071ad9
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -6,6 +6,11 @@
* include/std/functional (_Bind_simple): Simplify construction.
* include/bits/regex.h (regex_traits::_RegexMask): Remove _S_blank and
adjust _S_valid_mask.
* include/bits/regex.tcc (regex_traits::lookup_classname): Use
ctype_base::blank.
2014-11-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/algo.h: Do not use default arguments in function

7
libstdc++-v3/include/bits/regex.h
View File

@ -97,14 +97,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
private:
struct _RegexMask
{
typedef typename std::ctype<char_type>::mask _BaseType;
typedef std::ctype_base::mask _BaseType;
_BaseType _M_base;
unsigned char _M_extended;
static constexpr unsigned char _S_under = 1 << 0;
// FIXME: _S_blank should be removed in the future,
// when locale's complete.
static constexpr unsigned char _S_blank = 1 << 1;
static constexpr unsigned char _S_valid_mask = 0x3;
static constexpr unsigned char _S_valid_mask = 0x1;
constexpr _RegexMask(_BaseType __base = 0,
unsigned char __extended = 0)

8
libstdc++-v3/include/bits/regex.tcc
View File

@ -335,7 +335,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{"s", ctype_base::space},
{"alnum", ctype_base::alnum},
{"alpha", ctype_base::alpha},
{"blank", {0, _RegexMask::_S_blank}},
{"blank", ctype_base::blank},
{"cntrl", ctype_base::cntrl},
{"digit", ctype_base::digit},
{"graph", ctype_base::graph},
@ -377,11 +377,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __fctyp.is(__f._M_base, __c)
// [[:w:]]
|| ((__f._M_extended & _RegexMask::_S_under)
&& __c == __fctyp.widen('_'))
// [[:blank:]]
|| ((__f._M_extended & _RegexMask::_S_blank)
&& (__c == __fctyp.widen(' ')
|| __c == __fctyp.widen('\t')));
&& __c == __fctyp.widen('_'));
}
template<typename _Ch_type>