From f054ff5b7c6afa260a9a3d07e8b59649dcf978f7 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 6 Nov 2013 09:47:51 +0000 Subject: [PATCH] regex_automaton.h (_S_opcode_word_boundry): Rename to _S_opcode_word_boundary. * 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 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/include/bits/regex_automaton.h | 6 +++--- libstdc++-v3/include/bits/regex_automaton.tcc | 2 +- libstdc++-v3/include/bits/regex_executor.h | 2 +- libstdc++-v3/include/bits/regex_executor.tcc | 8 ++++---- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4253a80..e2bf7ff 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2013-11-06 Jonathan Wakely + + * 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 N3655 C++1y TransformationTraits Redux diff --git a/libstdc++-v3/include/bits/regex_automaton.h b/libstdc++-v3/include/bits/regex_automaton.h index 4fb5556..e630512 100644 --- a/libstdc++-v3/include/bits/regex_automaton.h +++ b/libstdc++-v3/include/bits/regex_automaton.h @@ -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); } diff --git a/libstdc++-v3/include/bits/regex_automaton.tcc b/libstdc++-v3/include/bits/regex_automaton.tcc index c15e3e9..258d22d 100644 --- a/libstdc++-v3/include/bits/regex_automaton.tcc +++ b/libstdc++-v3/include/bits/regex_automaton.tcc @@ -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"; diff --git a/libstdc++-v3/include/bits/regex_executor.h b/libstdc++-v3/include/bits/regex_executor.h index 12db47b..57b3108 100644 --- a/libstdc++-v3/include/bits/regex_executor.h +++ b/libstdc++-v3/include/bits/regex_executor.h @@ -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); diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc index 0c42189..b310aba 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -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 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; -- 2.7.4