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

regex_automaton.h (__detail::_State, [...]): Remove redundant _CharT template parameters. 

* include/bits/regex_automaton.h (__detail::_State, __detail::_NFA,
	__detail::_StateSeq): Remove redundant _CharT template parameters.
	* include/bits/regex_automaton.tcc: Likewise.
	* include/bits/regex_compiler.h (__detail::_Compiler): Likewise.
	(__compile_nfa): Add object generator for _Compiler.
	* include/bits/regex_compiler.tcc: Remove _CharT template parameters.
	* include/bits/regex_executor.h: Likewise.
	* include/bits/regex_executor.tcc: Likewise.
	* include/bits/regex.h (basic_regex): Assert char_type matches. Use
	__compile_nfa object generator. Remove _CharT template parameter.

From-SVN: r204572
This commit is contained in:
Jonathan Wakely 2013-11-08 14:30:29 +00:00 committed by Jonathan Wakely
parent 7d9d218516
commit 68e69ce27f
8 changed files with 80 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -12,6 +12,17 @@
* include/bits/regex_executor.h (__detail::_Executor::_M_is_word): Use * include/bits/regex_executor.h (__detail::_Executor::_M_is_word): Use
array, so past-the-end iterator is valid. array, so past-the-end iterator is valid.
* include/bits/regex_automaton.h (__detail::_State, __detail::_NFA,
__detail::_StateSeq): Remove redundant _CharT template parameters.
* include/bits/regex_automaton.tcc: Likewise.
* include/bits/regex_compiler.h (__detail::_Compiler): Likewise.
(__compile_nfa): Add object generator for _Compiler.
* include/bits/regex_compiler.tcc: Remove _CharT template parameters.
* include/bits/regex_executor.h: Likewise.
* include/bits/regex_executor.tcc: Likewise.
* include/bits/regex.h (basic_regex): Assert char_type matches. Use
__compile_nfa object generator. Remove _CharT template parameter.
2013-11-06 Jonathan Wakely <jwakely.gcc@gmail.com> 2013-11-06 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/regex_automaton.h (_S_opcode_word_boundry): Rename to * include/bits/regex_automaton.h (_S_opcode_word_boundry): Rename to

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

@ -377,10 +377,13 @@ _GLIBCXX_END_NAMESPACE_VERSION
* Storage for the regular expression is allocated and deallocated as * Storage for the regular expression is allocated and deallocated as
* necessary by the member functions of this class. * necessary by the member functions of this class.
*/ */
template<typename _Ch_type, typename _Rx_traits = regex_traits<_Ch_type> > template<typename _Ch_type, typename _Rx_traits = regex_traits<_Ch_type>>
class basic_regex class basic_regex
{ {
public: public:
static_assert(is_same<_Ch_type, typename _Rx_traits::char_type>::value,
"regex traits class must have the same char_type");
// types: // types:
typedef _Ch_type value_type; typedef _Ch_type value_type;
typedef _Rx_traits traits_type; typedef _Rx_traits traits_type;
@ -498,8 +501,8 @@ _GLIBCXX_END_NAMESPACE_VERSION
basic_regex(_FwdIter __first, _FwdIter __last, basic_regex(_FwdIter __first, _FwdIter __last,
flag_type __f = ECMAScript) flag_type __f = ECMAScript)
: _M_flags(__f), : _M_flags(__f),
_M_automaton(__detail::_Compiler<_FwdIter, _Ch_type, _Rx_traits> _M_automaton(__detail::__compile_nfa(__first, __last, _M_traits,
(__first, __last, _M_traits, _M_flags)._M_get_nfa()) _M_flags))
{ } { }
/** /**
@ -634,9 +637,8 @@ _GLIBCXX_END_NAMESPACE_VERSION
flag_type __flags = ECMAScript) flag_type __flags = ECMAScript)
{ {
_M_flags = __flags; _M_flags = __flags;
_M_automaton = _M_automaton = __detail::__compile_nfa(__s.begin(), __s.end(),
__detail::_Compiler<decltype(__s.begin()), _Ch_type, _Rx_traits> _M_traits, _M_flags);
(__s.begin(), __s.end(), _M_traits, _M_flags)._M_get_nfa();
return *this; return *this;
} }
@ -730,8 +732,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
#endif #endif
protected: protected:
typedef std::shared_ptr<__detail::_NFA<_Ch_type, _Rx_traits>> typedef std::shared_ptr<__detail::_NFA<_Rx_traits>> _AutomatonPtr;
_AutomatonPtr;
template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, template<typename _Bp, typename _Ap, typename _Cp, typename _Rp,
__detail::_RegexExecutorPolicy, bool> __detail::_RegexExecutorPolicy, bool>

16
libstdc++-v3/include/bits/regex_automaton.h
View File

@ -103,10 +103,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif #endif
}; };
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
struct _State : _State_base struct _State : _State_base
{ {
typedef _Matcher<_CharT> _MatcherT; typedef _Matcher<typename _TraitsT::char_type> _MatcherT;
_MatcherT _M_matches; // for _S_opcode_match _MatcherT _M_matches; // for _S_opcode_match
@ -155,12 +155,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool _M_has_backref; bool _M_has_backref;
}; };
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
struct _NFA struct _NFA
: _NFA_base, std::vector<_State<_CharT, _TraitsT>> : _NFA_base, std::vector<_State<_TraitsT>>
{ {
typedef _State<_CharT, _TraitsT> _StateT; typedef _State<_TraitsT> _StateT;
typedef _Matcher<_CharT> _MatcherT; typedef _Matcher<typename _TraitsT::char_type> _MatcherT;
using _NFA_base::_NFA_base; using _NFA_base::_NFA_base;
@ -268,11 +268,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Describes a sequence of one or more %_State, its current start /// Describes a sequence of one or more %_State, its current start
/// and end(s). This structure contains fragments of an NFA during /// and end(s). This structure contains fragments of an NFA during
/// construction. /// construction.
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
class _StateSeq class _StateSeq
{ {
public: public:
typedef _NFA<_CharT, _TraitsT> _RegexT; typedef _NFA<_TraitsT> _RegexT;
public: public:
_StateSeq(_RegexT& __nfa, _StateIdT __s) _StateSeq(_RegexT& __nfa, _StateIdT __s)

18
libstdc++-v3/include/bits/regex_automaton.tcc
View File

@ -129,9 +129,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __ostr; return __ostr;
} }
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
std::ostream& std::ostream&
_NFA<_CharT, _TraitsT>::_M_dot(std::ostream& __ostr) const _NFA<_TraitsT>::_M_dot(std::ostream& __ostr) const
{ {
__ostr << "digraph _Nfa {\n" __ostr << "digraph _Nfa {\n"
" rankdir=LR;\n"; " rankdir=LR;\n";
@ -142,9 +142,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
#endif #endif
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
_StateIdT _StateIdT
_NFA<_CharT, _TraitsT>::_M_insert_backref(size_t __index) _NFA<_TraitsT>::_M_insert_backref(size_t __index)
{ {
// To figure out whether a backref is valid, a stack is used to store // To figure out whether a backref is valid, a stack is used to store
// unfinished sub-expressions. For example, when parsing // unfinished sub-expressions. For example, when parsing
@ -164,9 +164,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return _M_insert_state(std::move(__tmp)); return _M_insert_state(std::move(__tmp));
} }
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
void void
_NFA<_CharT, _TraitsT>::_M_eliminate_dummy() _NFA<_TraitsT>::_M_eliminate_dummy()
{ {
for (auto& __it : *this) for (auto& __it : *this)
{ {
@ -182,9 +182,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// Just apply DFS on the sequence and re-link their links. // Just apply DFS on the sequence and re-link their links.
template<typename _CharT, typename _TraitsT> template<typename _TraitsT>
_StateSeq<_CharT, _TraitsT> _StateSeq<_TraitsT>
_StateSeq<_CharT, _TraitsT>::_M_clone() _StateSeq<_TraitsT>::_M_clone()
{ {
std::map<_StateIdT, _StateIdT> __m; std::map<_StateIdT, _StateIdT> __m;
std::stack<_StateIdT> __stack; std::stack<_StateIdT> __stack;

16
libstdc++-v3/include/bits/regex_compiler.h
View File

@ -43,12 +43,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct _BracketMatcher; struct _BracketMatcher;
/// Builds an NFA from an input iterator interval. /// Builds an NFA from an input iterator interval.
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
class _Compiler class _Compiler
{ {
public: public:
typedef typename _TraitsT::string_type _StringT; typedef typename _TraitsT::string_type _StringT;
typedef _NFA<_CharT, _TraitsT> _RegexT; typedef _NFA<_TraitsT> _RegexT;
typedef regex_constants::syntax_option_type _FlagT; typedef regex_constants::syntax_option_type _FlagT;
_Compiler(_FwdIter __b, _FwdIter __e, _Compiler(_FwdIter __b, _FwdIter __e,
@ -59,9 +59,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return make_shared<_RegexT>(std::move(_M_nfa)); } { return make_shared<_RegexT>(std::move(_M_nfa)); }
private: private:
typedef typename _TraitsT::char_type _CharT;
typedef _Scanner<_FwdIter> _ScannerT; typedef _Scanner<_FwdIter> _ScannerT;
typedef typename _ScannerT::_TokenT _TokenT; typedef typename _ScannerT::_TokenT _TokenT;
typedef _StateSeq<_CharT, _TraitsT> _StateSeqT; typedef _StateSeq<_TraitsT> _StateSeqT;
typedef std::stack<_StateSeqT, std::vector<_StateSeqT>> _StackT; typedef std::stack<_StateSeqT, std::vector<_StateSeqT>> _StackT;
typedef _BracketMatcher<_CharT, _TraitsT> _BMatcherT; typedef _BracketMatcher<_CharT, _TraitsT> _BMatcherT;
typedef std::ctype<_CharT> _CtypeT; typedef std::ctype<_CharT> _CtypeT;
@ -129,6 +130,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_StackT _M_stack; _StackT _M_stack;
}; };
template<typename _FwdIter, typename _TraitsT>
inline std::shared_ptr<_NFA<_TraitsT>>
__compile_nfa(_FwdIter __first, _FwdIter __last, const _TraitsT& __traits,
regex_constants::syntax_option_type __flags)
{
using _Cmplr = _Compiler<_FwdIter, _TraitsT>;
return _Cmplr(__first, __last, __traits, __flags)._M_get_nfa();
}
template<typename _CharT, typename _TraitsT> template<typename _CharT, typename _TraitsT>
struct _AnyMatcher struct _AnyMatcher
{ {

50
libstdc++-v3/include/bits/regex_compiler.tcc
View File

@ -59,8 +59,8 @@ namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_Compiler(_FwdIter __b, _FwdIter __e, _Compiler(_FwdIter __b, _FwdIter __e,
const _TraitsT& __traits, _FlagT __flags) const _TraitsT& __traits, _FlagT __flags)
: _M_flags((__flags : _M_flags((__flags
@ -73,7 +73,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
? __flags ? __flags
: __flags | regex_constants::ECMAScript), : __flags | regex_constants::ECMAScript),
_M_traits(__traits), _M_traits(__traits),
_M_ctype(std::use_facet<std::ctype<_CharT>>(_M_traits.getloc())), _M_ctype(std::use_facet<_CtypeT>(_M_traits.getloc())),
_M_scanner(__b, __e, _M_flags, _M_traits.getloc()), _M_scanner(__b, __e, _M_flags, _M_traits.getloc()),
_M_nfa(_M_flags) _M_nfa(_M_flags)
{ {
@ -89,9 +89,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_nfa._M_eliminate_dummy(); _M_nfa._M_eliminate_dummy();
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
void void
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_disjunction() _M_disjunction()
{ {
this->_M_alternative(); this->_M_alternative();
@ -110,9 +110,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
void void
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_alternative() _M_alternative()
{ {
if (this->_M_term()) if (this->_M_term())
@ -126,9 +126,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_stack.push(_StateSeqT(_M_nfa, _M_nfa._M_insert_dummy())); _M_stack.push(_StateSeqT(_M_nfa, _M_nfa._M_insert_dummy()));
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_term() _M_term()
{ {
if (this->_M_assertion()) if (this->_M_assertion())
@ -141,9 +141,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return false; return false;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_assertion() _M_assertion()
{ {
if (_M_match_token(_ScannerT::_S_token_line_begin)) if (_M_match_token(_ScannerT::_S_token_line_begin))
@ -172,9 +172,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return true; return true;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
void void
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_quantifier() _M_quantifier()
{ {
bool __neg = (_M_flags & regex_constants::ECMAScript); bool __neg = (_M_flags & regex_constants::ECMAScript);
@ -278,9 +278,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_atom() _M_atom()
{ {
if (_M_match_token(_ScannerT::_S_token_anychar)) if (_M_match_token(_ScannerT::_S_token_anychar))
@ -329,9 +329,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return true; return true;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_bracket_expression() _M_bracket_expression()
{ {
bool __neg = bool __neg =
@ -346,9 +346,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return true; return true;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
void void
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_expression_term(_BMatcherT& __matcher) _M_expression_term(_BMatcherT& __matcher)
{ {
if (_M_match_token(_ScannerT::_S_token_collsymbol)) if (_M_match_token(_ScannerT::_S_token_collsymbol))
@ -383,9 +383,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__throw_regex_error(regex_constants::error_brack); __throw_regex_error(regex_constants::error_brack);
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_try_char() _M_try_char()
{ {
bool __is_char = false; bool __is_char = false;
@ -404,9 +404,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __is_char; return __is_char;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
bool bool
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_match_token(_TokenT token) _M_match_token(_TokenT token)
{ {
if (token == _M_scanner._M_get_token()) if (token == _M_scanner._M_get_token())
@ -418,9 +418,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return false; return false;
} }
template<typename _FwdIter, typename _CharT, typename _TraitsT> template<typename _FwdIter, typename _TraitsT>
int int
_Compiler<_FwdIter, _CharT, _TraitsT>:: _Compiler<_FwdIter, _TraitsT>::
_M_cur_int_value(int __radix) _M_cur_int_value(int __radix)
{ {
long __v = 0; long __v = 0;

6
libstdc++-v3/include/bits/regex_executor.h
View File

@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef std::vector<sub_match<_BiIter>, _Alloc> _ResultsVec; typedef std::vector<sub_match<_BiIter>, _Alloc> _ResultsVec;
typedef regex_constants::match_flag_type _FlagT; typedef regex_constants::match_flag_type _FlagT;
typedef typename _TraitsT::char_class_type _ClassT; typedef typename _TraitsT::char_class_type _ClassT;
typedef _NFA<_CharT, _TraitsT> _NFAT; typedef _NFA<_TraitsT> _NFAT;
public: public:
_Executor(_BiIter __begin, _Executor(_BiIter __begin,
@ -138,10 +138,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
bool bool
_M_word_boundary(_State<_CharT, _TraitsT> __state) const; _M_word_boundary(_State<_TraitsT> __state) const;
bool bool
_M_lookahead(_State<_CharT, _TraitsT> __state); _M_lookahead(_State<_TraitsT> __state);
public: public:
_ResultsVec _M_cur_results; _ResultsVec _M_cur_results;

5
libstdc++-v3/include/bits/regex_executor.tcc
View File

@ -143,8 +143,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _BiIter, typename _Alloc, typename _TraitsT, template<typename _BiIter, typename _Alloc, typename _TraitsT,
bool __dfs_mode> bool __dfs_mode>
bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
_M_lookahead(_State<_Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: _M_lookahead(_State<_TraitsT> __state)
_CharT, _TraitsT> __state)
{ {
_ResultsVec __what(_M_cur_results.size()); _ResultsVec __what(_M_cur_results.size());
auto __sub = std::unique_ptr<_Executor>(new _Executor(_M_current, auto __sub = std::unique_ptr<_Executor>(new _Executor(_M_current,
@ -348,7 +347,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _BiIter, typename _Alloc, typename _TraitsT, template<typename _BiIter, typename _Alloc, typename _TraitsT,
bool __dfs_mode> bool __dfs_mode>
bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
_M_word_boundary(_State<_CharT, _TraitsT> __state) const _M_word_boundary(_State<_TraitsT> __state) const
{ {
// By definition. // By definition.
bool __ans = false; bool __ans = false;