diff options
| author | timshen <timshen@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-24 02:05:00 +0000 |
|---|---|---|
| committer | timshen <timshen@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-24 02:05:00 +0000 |
| commit | 463f6239114ff5b2eaec0ff6d1996c280dbfc378 (patch) | |
| tree | f337d8cd5418382592d93b47f24f42a62224bd74 /libstdc++-v3/include/bits/regex_compiler.h | |
| parent | 4cac359414a2dc6f27d3068ef3f51f5f253125e9 (diff) | |
| download | ppe42-gcc-463f6239114ff5b2eaec0ff6d1996c280dbfc378.tar.gz ppe42-gcc-463f6239114ff5b2eaec0ff6d1996c280dbfc378.zip | |
2013-09-24 Tim Shen <timshen91@gmail.com>
* include/Makefile.am: Add regex.tcc.
* include/Makefile.in: Regenerate.
* include/bits/regex.h: Remove definitions to regex.tcc.
* include/bits/regex.tcc: New.
(match_results::format, regex_replace): Implement;
* include/bits/regex_compiler.h: Move _M_flags to the top of class
member list, because other members' initialization depend on it.
* include/bits/regex_compiler.tcc
(_Compiler<>::_Compiler): Adjust member initializations.
(_Compiler<>::_M_quantifier): Fix ungreedy interval quantifier.
* include/bits/regex_executor.h: Remove _RegexT from _*Executor classes.
In the future, all regex classes may refactor to *Impl style.
* include/bits/regex_executor.tcc (_Executor::_M_set_results):
Merge identical code from _*Executor classes.
* testsuite/28_regex/algorithms/regex_match/extended/
string_dispatch_01.cc (fake_match<>): Adjust the hacking-style testcase
caller for new __get_executors interface.
* testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc:
New.
* testsuite/28_regex/match_results/format.cc: New.
* testsuite/28_regex/traits/char/lookup_collatename.cc: Remove digraph
testcase.
* testsuite/28_regex/traits/wchar_t/lookup_collatename.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202858 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/regex_compiler.h')
| -rw-r--r-- | libstdc++-v3/include/bits/regex_compiler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h index 3b85d3a46c3..4e393e7be9a 100644 --- a/libstdc++-v3/include/bits/regex_compiler.h +++ b/libstdc++-v3/include/bits/regex_compiler.h @@ -120,13 +120,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return ret; } + _FlagT _M_flags; const _TraitsT& _M_traits; const _CtypeT& _M_ctype; _ScannerT _M_scanner; _RegexT _M_nfa; _StringT _M_value; _StackT _M_stack; - _FlagT _M_flags; }; template<typename _CharT, typename _TraitsT> @@ -207,7 +207,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __s.data() + __s.size()); if (__st.empty()) __throw_regex_error(regex_constants::error_collate); - // TODO: digraph _M_char_set.insert(_M_translate(__st[0])); } |
