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

regex_automaton.h (_S_opcode_word_boundry): Rename to _S_opcode_word_boundary.

Browse Source 
* include/bits/regex_automaton.h (_S_opcode_word_boundry): Rename to
	_S_opcode_word_boundary.
	* include/bits/regex_automaton.tcc: Likewise.
	* include/bits/regex_executor.h (__detail::_Executor::_M_word_boundry):
	Rename to _M_word_boundary.
	* include/bits/regex_executor.tcc: Likewise.

From-SVN: r204449
This commit is contained in:
Jonathan Wakely 2013-11-06 09:47:51 +00:00 committed by Jonathan Wakely
parent 1ee5839865
commit f054ff5b7c
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2013-11-06 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/regex_automaton.h (_S_opcode_word_boundry): Rename to
_S_opcode_word_boundary.
* include/bits/regex_automaton.tcc: Likewise.
* include/bits/regex_executor.h (__detail::_Executor::_M_word_boundry):
Rename to _M_word_boundary.
* include/bits/regex_executor.tcc: Likewise.
2013-11-05 Jonathan Wakely <jwakely.gcc@gmail.com>
N3655 C++1y TransformationTraits Redux

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

@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_opcode_backref,
_S_opcode_line_begin_assertion,
_S_opcode_line_end_assertion,
_S_opcode_word_boundry,
_S_opcode_word_boundary,
_S_opcode_subexpr_lookahead,
_S_opcode_subexpr_begin,
_S_opcode_subexpr_end,
@ -83,7 +83,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_StateIdT _M_quant_index;
// for _S_opcode_alternative or _S_opcode_subexpr_lookahead
_StateIdT _M_alt;
// for _S_opcode_word_boundry or _S_opcode_subexpr_lookahead or
// for _S_opcode_word_boundary or _S_opcode_subexpr_lookahead or
// quantifiers(ungreedy if set true)
bool _M_neg;
};
@ -197,7 +197,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_StateIdT
_M_insert_word_bound(bool __neg)
{
_StateT __tmp(_S_opcode_word_boundry);
_StateT __tmp(_S_opcode_word_boundary);
__tmp._M_neg = __neg;
return _M_insert_state(__tmp);
}

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

@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__ostr << __id << " [label=\"" << __id << "\\nLINE_END \"];\n"
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
break;
case _S_opcode_word_boundry:
case _S_opcode_word_boundary:
__ostr << __id << " [label=\"" << __id << "\\nWORD_BOUNDRY "
<< _M_neg << "\"];\n"
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";

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

@ -138,7 +138,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
bool
_M_word_boundry(_State<_CharT, _TraitsT> __state) const;
_M_word_boundary(_State<_CharT, _TraitsT> __state) const;
bool
_M_lookahead(_State<_CharT, _TraitsT> __state);

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

@ -257,8 +257,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
if (_M_at_end())
_M_dfs<__match_mode>(__state._M_next);
break;
case _S_opcode_word_boundry:
if (_M_word_boundry(__state) == !__state._M_neg)
case _S_opcode_word_boundary:
if (_M_word_boundary(__state) == !__state._M_neg)
_M_dfs<__match_mode>(__state._M_next);
break;
// Here __state._M_alt offers a single start node for a sub-NFA.
@ -344,11 +344,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
}
// Return whether now is at some word boundry.
// Return whether now is at some word boundary.
template<typename _BiIter, typename _Alloc, typename _TraitsT,
bool __dfs_mode>
bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
_M_word_boundry(_State<_CharT, _TraitsT> __state) const
_M_word_boundary(_State<_CharT, _TraitsT> __state) const
{
// By definition.
bool __ans = false;