2013-08-07 16:27:36 +00:00
|
|
|
// class template regex -*- C++ -*-
|
|
|
|
|
2017-01-01 13:07:43 +01:00
|
|
|
// Copyright (C) 2013-2017 Free Software Foundation, Inc.
|
2013-08-07 16:27:36 +00:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @file bits/regex_automaton.tcc
|
|
|
|
* This is an internal header file, included by other library headers.
|
|
|
|
* Do not attempt to use it directly. @headername{regex}
|
|
|
|
*/
|
|
|
|
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
namespace __detail
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
|
|
|
|
#ifdef _GLIBCXX_DEBUG
|
2014-05-27 12:14:17 +01:00
|
|
|
inline std::ostream&
|
2013-11-08 14:30:22 +00:00
|
|
|
_State_base::_M_print(std::ostream& ostr) const
|
|
|
|
{
|
|
|
|
switch (_M_opcode)
|
2013-08-07 16:27:36 +00:00
|
|
|
{
|
2013-11-08 14:30:22 +00:00
|
|
|
case _S_opcode_alternative:
|
2014-04-27 23:48:47 +00:00
|
|
|
case _S_opcode_repeat:
|
2013-11-08 14:30:22 +00:00
|
|
|
ostr << "alt next=" << _M_next << " alt=" << _M_alt;
|
|
|
|
break;
|
|
|
|
case _S_opcode_subexpr_begin:
|
|
|
|
ostr << "subexpr begin next=" << _M_next << " index=" << _M_subexpr;
|
|
|
|
break;
|
|
|
|
case _S_opcode_subexpr_end:
|
|
|
|
ostr << "subexpr end next=" << _M_next << " index=" << _M_subexpr;
|
|
|
|
break;
|
|
|
|
case _S_opcode_backref:
|
|
|
|
ostr << "backref next=" << _M_next << " index=" << _M_backref_index;
|
|
|
|
break;
|
|
|
|
case _S_opcode_match:
|
|
|
|
ostr << "match next=" << _M_next;
|
|
|
|
break;
|
|
|
|
case _S_opcode_accept:
|
|
|
|
ostr << "accept next=" << _M_next;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ostr << "unknown next=" << _M_next;
|
|
|
|
break;
|
2013-08-07 16:27:36 +00:00
|
|
|
}
|
2013-11-08 14:30:22 +00:00
|
|
|
return ostr;
|
|
|
|
}
|
2013-08-07 16:27:36 +00:00
|
|
|
|
|
|
|
// Prints graphviz dot commands for state.
|
2014-05-27 12:14:17 +01:00
|
|
|
inline std::ostream&
|
2013-11-08 14:30:22 +00:00
|
|
|
_State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const
|
|
|
|
{
|
|
|
|
switch (_M_opcode)
|
2013-08-07 16:27:36 +00:00
|
|
|
{
|
2013-11-08 14:30:22 +00:00
|
|
|
case _S_opcode_alternative:
|
2014-04-27 23:48:47 +00:00
|
|
|
case _S_opcode_repeat:
|
2013-11-08 14:30:22 +00:00
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nALT\"];\n"
|
|
|
|
<< __id << " -> " << _M_next
|
2014-04-27 23:48:47 +00:00
|
|
|
<< " [label=\"next\", tailport=\"s\"];\n"
|
2013-11-08 14:30:22 +00:00
|
|
|
<< __id << " -> " << _M_alt
|
2014-04-27 23:48:47 +00:00
|
|
|
<< " [label=\"alt\", tailport=\"n\"];\n";
|
2013-11-08 14:30:22 +00:00
|
|
|
break;
|
|
|
|
case _S_opcode_backref:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nBACKREF "
|
|
|
|
<< _M_subexpr << "\"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"<match>\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_line_begin_assertion:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nLINE_BEGIN \"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_line_end_assertion:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nLINE_END \"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_word_boundary:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nWORD_BOUNDRY "
|
|
|
|
<< _M_neg << "\"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_subexpr_lookahead:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nLOOK_AHEAD\"];\n"
|
|
|
|
<< __id << " -> " << _M_next
|
|
|
|
<< " [label=\"epsilon\", tailport=\"s\"];\n"
|
|
|
|
<< __id << " -> " << _M_alt
|
|
|
|
<< " [label=\"<assert>\", tailport=\"n\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_subexpr_begin:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nSBEGIN "
|
|
|
|
<< _M_subexpr << "\"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_subexpr_end:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nSEND "
|
|
|
|
<< _M_subexpr << "\"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_dummy:
|
|
|
|
break;
|
|
|
|
case _S_opcode_match:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nMATCH\"];\n"
|
|
|
|
<< __id << " -> " << _M_next << " [label=\"<match>\"];\n";
|
|
|
|
break;
|
|
|
|
case _S_opcode_accept:
|
|
|
|
__ostr << __id << " [label=\"" << __id << "\\nACC\"];\n" ;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(false);
|
|
|
|
break;
|
2013-08-07 16:27:36 +00:00
|
|
|
}
|
2013-11-08 14:30:22 +00:00
|
|
|
return __ostr;
|
|
|
|
}
|
2013-08-07 16:27:36 +00:00
|
|
|
|
2013-11-08 14:30:29 +00:00
|
|
|
template<typename _TraitsT>
|
2013-11-08 14:30:22 +00:00
|
|
|
std::ostream&
|
2013-11-08 14:30:29 +00:00
|
|
|
_NFA<_TraitsT>::_M_dot(std::ostream& __ostr) const
|
2013-08-07 16:27:36 +00:00
|
|
|
{
|
|
|
|
__ostr << "digraph _Nfa {\n"
|
regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not use std::map.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not
use std::map.
* include/bits/regex_automaton.h: Do not use std::set.
* include/bits/regex_compiler.h (_BracketMatcher<>::_M_add_char(),
_BracketMatcher<>::_M_add_collating_element(),
_BracketMatcher<>::_M_add_equivalence_class(),
_BracketMatcher<>::_M_make_range()): Likewise.
* include/bits/regex_compiler.tcc (_BracketMatcher<>::_M_apply()):
Likewise.
* include/bits/regex_executor.h: Do not use std::queue.
* include/bits/regex_executor.tcc (_Executor<>::_M_main(),
_Executor<>::_M_dfs()): Likewise.
* include/std/regex: Remove <map>, <set> and <queue>.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (__compile_nfa<>(), basic_regex<>::basic_regex(),
basic_regex<>::assign()): Change __compile_nfa to accept
const _CharT* only.
* include/bits/regex_compiler.h: Change _Compiler's template
argument from <_FwdIter, _TraitsT> to <_TraitsT>.
* include/bits/regex_compiler.tcc: Likewise.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h: Change _ScannerT into char-type
templated.
* include/bits/regex_scanner.h (_Scanner<>::_Scanner()): Separate
_ScannerBase from _Scanner; Change _Scanner's template argument from
_FwdIter to _CharT. Avoid use of std::map and std::set by using arrays
instead.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner(),
_Scanner<>::_M_scan_normal(), _Scanner<>::_M_eat_escape_ecma(),
_Scanner<>::_M_eat_escape_posix(), _Scanner<>::_M_eat_escape_awk()):
Likewise.
* include/std/regex: Add <cstring> for using strchr.
2014-01-17 Tim Shen <timshen91@gmail.com>
* bits/regex_automaton.tcc: Indentation fix.
* bits/regex_compiler.h (__compile_nfa<>(), _Compiler<>,
_RegexTranslator<> _AnyMatcher<>, _CharMatcher<>,
_BracketMatcher<>): Add bool option template parameters and
specializations to make matching more efficient and space saving.
* bits/regex_compiler.tcc: Likewise.
From-SVN: r206690
2014-01-16 23:35:21 +00:00
|
|
|
" rankdir=LR;\n";
|
2013-10-06 17:53:14 +00:00
|
|
|
for (size_t __i = 0; __i < this->size(); ++__i)
|
regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not use std::map.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not
use std::map.
* include/bits/regex_automaton.h: Do not use std::set.
* include/bits/regex_compiler.h (_BracketMatcher<>::_M_add_char(),
_BracketMatcher<>::_M_add_collating_element(),
_BracketMatcher<>::_M_add_equivalence_class(),
_BracketMatcher<>::_M_make_range()): Likewise.
* include/bits/regex_compiler.tcc (_BracketMatcher<>::_M_apply()):
Likewise.
* include/bits/regex_executor.h: Do not use std::queue.
* include/bits/regex_executor.tcc (_Executor<>::_M_main(),
_Executor<>::_M_dfs()): Likewise.
* include/std/regex: Remove <map>, <set> and <queue>.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (__compile_nfa<>(), basic_regex<>::basic_regex(),
basic_regex<>::assign()): Change __compile_nfa to accept
const _CharT* only.
* include/bits/regex_compiler.h: Change _Compiler's template
argument from <_FwdIter, _TraitsT> to <_TraitsT>.
* include/bits/regex_compiler.tcc: Likewise.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h: Change _ScannerT into char-type
templated.
* include/bits/regex_scanner.h (_Scanner<>::_Scanner()): Separate
_ScannerBase from _Scanner; Change _Scanner's template argument from
_FwdIter to _CharT. Avoid use of std::map and std::set by using arrays
instead.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner(),
_Scanner<>::_M_scan_normal(), _Scanner<>::_M_eat_escape_ecma(),
_Scanner<>::_M_eat_escape_posix(), _Scanner<>::_M_eat_escape_awk()):
Likewise.
* include/std/regex: Add <cstring> for using strchr.
2014-01-17 Tim Shen <timshen91@gmail.com>
* bits/regex_automaton.tcc: Indentation fix.
* bits/regex_compiler.h (__compile_nfa<>(), _Compiler<>,
_RegexTranslator<> _AnyMatcher<>, _CharMatcher<>,
_BracketMatcher<>): Add bool option template parameters and
specializations to make matching more efficient and space saving.
* bits/regex_compiler.tcc: Likewise.
From-SVN: r206690
2014-01-16 23:35:21 +00:00
|
|
|
(*this)[__i]._M_dot(__ostr, __i);
|
2013-08-07 16:27:36 +00:00
|
|
|
__ostr << "}\n";
|
|
|
|
return __ostr;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-11-08 14:30:29 +00:00
|
|
|
template<typename _TraitsT>
|
2013-11-08 14:30:22 +00:00
|
|
|
_StateIdT
|
2013-11-08 14:30:29 +00:00
|
|
|
_NFA<_TraitsT>::_M_insert_backref(size_t __index)
|
2013-08-18 13:55:48 +00:00
|
|
|
{
|
2015-04-28 04:16:48 +00:00
|
|
|
if (this->_M_flags & regex_constants::__polynomial)
|
2015-09-19 20:56:27 +00:00
|
|
|
__throw_regex_error(regex_constants::error_complexity,
|
|
|
|
"Unexpected back-reference in polynomial mode.");
|
2013-08-18 13:55:48 +00:00
|
|
|
// To figure out whether a backref is valid, a stack is used to store
|
|
|
|
// unfinished sub-expressions. For example, when parsing
|
|
|
|
// "(a(b)(c\\1(d)))" at '\\1', _M_subexpr_count is 3, indicating that 3
|
|
|
|
// sub expressions are parsed or partially parsed(in the stack), aka,
|
|
|
|
// "(a..", "(b)" and "(c..").
|
|
|
|
// _M_paren_stack is {1, 3}, for incomplete "(a.." and "(c..". At this
|
|
|
|
// time, "\\2" is valid, but "\\1" and "\\3" are not.
|
|
|
|
if (__index >= _M_subexpr_count)
|
2015-09-19 20:56:27 +00:00
|
|
|
__throw_regex_error(
|
|
|
|
regex_constants::error_backref,
|
|
|
|
"Back-reference index exceeds current sub-expression count.");
|
2013-11-08 14:30:22 +00:00
|
|
|
for (auto __it : this->_M_paren_stack)
|
2013-08-22 09:01:38 +00:00
|
|
|
if (__index == __it)
|
2015-09-19 20:56:27 +00:00
|
|
|
__throw_regex_error(
|
|
|
|
regex_constants::error_backref,
|
|
|
|
"Back-reference referred to an opened sub-expression.");
|
2013-11-08 14:30:22 +00:00
|
|
|
this->_M_has_backref = true;
|
2013-09-14 14:23:44 +00:00
|
|
|
_StateT __tmp(_S_opcode_backref);
|
|
|
|
__tmp._M_backref_index = __index;
|
2013-11-08 14:30:22 +00:00
|
|
|
return _M_insert_state(std::move(__tmp));
|
2013-08-18 13:55:48 +00:00
|
|
|
}
|
|
|
|
|
2013-11-08 14:30:29 +00:00
|
|
|
template<typename _TraitsT>
|
2013-11-08 14:30:22 +00:00
|
|
|
void
|
2013-11-08 14:30:29 +00:00
|
|
|
_NFA<_TraitsT>::_M_eliminate_dummy()
|
2013-08-07 16:27:36 +00:00
|
|
|
{
|
2013-09-05 15:20:39 +00:00
|
|
|
for (auto& __it : *this)
|
|
|
|
{
|
2015-07-30 10:35:45 +00:00
|
|
|
while (__it._M_next >= 0 && (*this)[__it._M_next]._M_opcode()
|
2013-09-14 14:23:44 +00:00
|
|
|
== _S_opcode_dummy)
|
2013-09-05 15:20:39 +00:00
|
|
|
__it._M_next = (*this)[__it._M_next]._M_next;
|
2015-07-30 10:35:45 +00:00
|
|
|
if (__it._M_has_alt())
|
|
|
|
while (__it._M_alt >= 0 && (*this)[__it._M_alt]._M_opcode()
|
2013-09-05 15:20:39 +00:00
|
|
|
== _S_opcode_dummy)
|
|
|
|
__it._M_alt = (*this)[__it._M_alt]._M_next;
|
|
|
|
}
|
2013-08-07 16:27:36 +00:00
|
|
|
}
|
|
|
|
|
2013-09-05 15:20:39 +00:00
|
|
|
// Just apply DFS on the sequence and re-link their links.
|
2013-11-08 14:30:29 +00:00
|
|
|
template<typename _TraitsT>
|
|
|
|
_StateSeq<_TraitsT>
|
|
|
|
_StateSeq<_TraitsT>::_M_clone()
|
2013-08-07 16:27:36 +00:00
|
|
|
{
|
2014-07-01 03:05:45 +00:00
|
|
|
std::map<_StateIdT, _StateIdT> __m;
|
2013-09-05 15:20:39 +00:00
|
|
|
std::stack<_StateIdT> __stack;
|
|
|
|
__stack.push(_M_start);
|
|
|
|
while (!__stack.empty())
|
|
|
|
{
|
|
|
|
auto __u = __stack.top();
|
|
|
|
__stack.pop();
|
|
|
|
auto __dup = _M_nfa[__u];
|
regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not use std::map.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not
use std::map.
* include/bits/regex_automaton.h: Do not use std::set.
* include/bits/regex_compiler.h (_BracketMatcher<>::_M_add_char(),
_BracketMatcher<>::_M_add_collating_element(),
_BracketMatcher<>::_M_add_equivalence_class(),
_BracketMatcher<>::_M_make_range()): Likewise.
* include/bits/regex_compiler.tcc (_BracketMatcher<>::_M_apply()):
Likewise.
* include/bits/regex_executor.h: Do not use std::queue.
* include/bits/regex_executor.tcc (_Executor<>::_M_main(),
_Executor<>::_M_dfs()): Likewise.
* include/std/regex: Remove <map>, <set> and <queue>.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (__compile_nfa<>(), basic_regex<>::basic_regex(),
basic_regex<>::assign()): Change __compile_nfa to accept
const _CharT* only.
* include/bits/regex_compiler.h: Change _Compiler's template
argument from <_FwdIter, _TraitsT> to <_TraitsT>.
* include/bits/regex_compiler.tcc: Likewise.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h: Change _ScannerT into char-type
templated.
* include/bits/regex_scanner.h (_Scanner<>::_Scanner()): Separate
_ScannerBase from _Scanner; Change _Scanner's template argument from
_FwdIter to _CharT. Avoid use of std::map and std::set by using arrays
instead.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner(),
_Scanner<>::_M_scan_normal(), _Scanner<>::_M_eat_escape_ecma(),
_Scanner<>::_M_eat_escape_posix(), _Scanner<>::_M_eat_escape_awk()):
Likewise.
* include/std/regex: Add <cstring> for using strchr.
2014-01-17 Tim Shen <timshen91@gmail.com>
* bits/regex_automaton.tcc: Indentation fix.
* bits/regex_compiler.h (__compile_nfa<>(), _Compiler<>,
_RegexTranslator<> _AnyMatcher<>, _CharMatcher<>,
_BracketMatcher<>): Add bool option template parameters and
specializations to make matching more efficient and space saving.
* bits/regex_compiler.tcc: Likewise.
From-SVN: r206690
2014-01-16 23:35:21 +00:00
|
|
|
// _M_insert_state() never return -1
|
2015-07-30 10:35:45 +00:00
|
|
|
auto __id = _M_nfa._M_insert_state(std::move(__dup));
|
2013-09-05 15:20:39 +00:00
|
|
|
__m[__u] = __id;
|
2015-07-30 10:35:45 +00:00
|
|
|
if (__dup._M_has_alt())
|
2014-07-01 03:05:45 +00:00
|
|
|
if (__dup._M_alt != _S_invalid_state_id
|
|
|
|
&& __m.count(__dup._M_alt) == 0)
|
2013-09-05 15:20:39 +00:00
|
|
|
__stack.push(__dup._M_alt);
|
2014-04-24 18:29:21 +00:00
|
|
|
if (__u == _M_end)
|
|
|
|
continue;
|
2014-07-01 03:05:45 +00:00
|
|
|
if (__dup._M_next != _S_invalid_state_id
|
|
|
|
&& __m.count(__dup._M_next) == 0)
|
2014-04-24 18:29:21 +00:00
|
|
|
__stack.push(__dup._M_next);
|
2013-09-05 15:20:39 +00:00
|
|
|
}
|
2014-07-01 03:05:45 +00:00
|
|
|
for (auto __it : __m)
|
2013-09-05 15:20:39 +00:00
|
|
|
{
|
2014-07-01 03:05:45 +00:00
|
|
|
auto __v = __it.second;
|
regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not use std::map.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not
use std::map.
* include/bits/regex_automaton.h: Do not use std::set.
* include/bits/regex_compiler.h (_BracketMatcher<>::_M_add_char(),
_BracketMatcher<>::_M_add_collating_element(),
_BracketMatcher<>::_M_add_equivalence_class(),
_BracketMatcher<>::_M_make_range()): Likewise.
* include/bits/regex_compiler.tcc (_BracketMatcher<>::_M_apply()):
Likewise.
* include/bits/regex_executor.h: Do not use std::queue.
* include/bits/regex_executor.tcc (_Executor<>::_M_main(),
_Executor<>::_M_dfs()): Likewise.
* include/std/regex: Remove <map>, <set> and <queue>.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (__compile_nfa<>(), basic_regex<>::basic_regex(),
basic_regex<>::assign()): Change __compile_nfa to accept
const _CharT* only.
* include/bits/regex_compiler.h: Change _Compiler's template
argument from <_FwdIter, _TraitsT> to <_TraitsT>.
* include/bits/regex_compiler.tcc: Likewise.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h: Change _ScannerT into char-type
templated.
* include/bits/regex_scanner.h (_Scanner<>::_Scanner()): Separate
_ScannerBase from _Scanner; Change _Scanner's template argument from
_FwdIter to _CharT. Avoid use of std::map and std::set by using arrays
instead.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner(),
_Scanner<>::_M_scan_normal(), _Scanner<>::_M_eat_escape_ecma(),
_Scanner<>::_M_eat_escape_posix(), _Scanner<>::_M_eat_escape_awk()):
Likewise.
* include/std/regex: Add <cstring> for using strchr.
2014-01-17 Tim Shen <timshen91@gmail.com>
* bits/regex_automaton.tcc: Indentation fix.
* bits/regex_compiler.h (__compile_nfa<>(), _Compiler<>,
_RegexTranslator<> _AnyMatcher<>, _CharMatcher<>,
_BracketMatcher<>): Add bool option template parameters and
specializations to make matching more efficient and space saving.
* bits/regex_compiler.tcc: Likewise.
From-SVN: r206690
2014-01-16 23:35:21 +00:00
|
|
|
auto& __ref = _M_nfa[__v];
|
|
|
|
if (__ref._M_next != _S_invalid_state_id)
|
2013-09-05 15:20:39 +00:00
|
|
|
{
|
Enable lightweight checks with _GLIBCXX_ASSERTIONS.
* doc/xml/manual/using.xml (_GLIBCXX_ASSERTIONS): Document.
* doc/html/manual/using_macros.html: Regenerate.
* include/bits/c++config: Define _GLIBCXX_ASSERTIONS when
_GLIBCXX_DEBUG is defined. Disable std::string extern templates when
(_GLIBCXX_EXTERN_TEMPLATE, __glibcxx_assert): Depend on
_GLIBCXX_ASSERTIONS instead of _GLIBCXX_DEBUG.
* include/debug/debug.h [!_GLIBCXX_DEBUG]: Define
__glibcxx_requires_non_empty_range and __glibcxx_requires_nonempty.
* include/backward/auto_ptr.h (auto_ptr::operator*,
auto_ptr::operator->): Replace _GLIBCXX_DEBUG_ASSERT with
__glibcxx_assert.
* include/bits/basic_string.h (basic_string::operator[],
basic_string::front, basic_string::back, basic_string::pop_back):
Likewise.
* include/bits/random.h
(uniform_int_distribution::param_type::param_type,
uniform_real_distribution::param_type::param_type,
normal_distribution::param_type::param_type,
gamma_distribution::param_type::param_type,
bernoulli_distribution::param_type::param_type,
binomial_distribution::param_type::param_type,
geometric_distribution::param_type::param_type,
negative_binomial_distribution::param_type::param_type,
poisson_distribution::param_type::param_type,
exponential_distribution::param_type::param_type): Likewise.
* include/bits/regex.h (match_results::operator[],
match_results::prefix, match_results::suffix): Likewise.
* include/bits/regex.tcc (format, regex_iterator::operator++):
Likewise.
* include/bits/regex_automaton.tcc (_StateSeq::_M_clone): Likewise.
* include/bits/regex_compiler.tcc (_Compiler::_Compiler,
_Compiler::_M_insert_character_class_matcher): Likewise.
* include/bits/regex_executor.tcc (_Executor::_M_dfs): Likewise.
* include/bits/regex_scanner.tcc (_Scanner::_M_advance,
_Scanner::_M_scan_normal): Likewise.
* include/bits/shared_ptr_base.h (__shared_ptr::_M_reset,
__shared_ptr::operator*): Likewise.
* include/bits/stl_iterator_base_funcs.h (__advance): Likewise.
* include/bits/unique_ptr.h (unique_ptr::operator*,
unique_ptr::operator[]): Likewise.
* include/experimental/fs_path.h (path::path(string_type, _Type),
path::iterator::operator++, path::iterator::operator--,
path::iterator::operator*): Likewise.
* include/experimental/string_view (basic_string_view::operator[],
basic_string_view::front, basic_string_view::back,
basic_string_view::remove_prefix): Likewise.
* include/ext/random (beta_distribution::param_type::param_type,
normal_mv_distribution::param_type::param_type,
rice_distribution::param_type::param_type,
pareto_distribution::param_type::param_type,
k_distribution::param_type::param_type,
arcsine_distribution::param_type::param_type,
hoyt_distribution::param_type::param_type,
triangular_distribution::param_type::param_type,
von_mises_distribution::param_type::param_type,
hypergeometric_distribution::param_type::param_type,
logistic_distribution::param_type::param_type): Likewise.
* include/ext/vstring.h (__versa_string::operator[]): Likewise.
* include/std/complex (polar): Likewise.
* include/std/mutex [!_GTHREAD_USE_MUTEX_TIMEDLOCK]
(timed_mutex::~timed_mutex, timed_mutex::unlock,
(recursive_timed_mutex::~timed_mutex, recursive_timed_mutex::unlock):
Likewise.
* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
(__shared_mutex_pthread::__shared_mutex_pthread,
__shared_mutex_pthread::~__shared_mutex_pthread): Likewise.
(__shared_mutex_pthread::lock, __shared_mutex_pthread::try_lock,
__shared_mutex_pthread::unlock, __shared_mutex_pthread::lock_shared,
__shared_mutex_pthread::try_lock_shared): Likewise.
(__shared_mutex_cv::~__shared_mutex_cv, __shared_mutex_cv::unlock,
__shared_mutex_cv::unlock_shared): Likewise.
(shared_timed_mutex::try_lock_until,
shared_timed_mutex::try_lock_shared_until): Likewise.
* include/std/valarray (valarray::valarray(const _Tp*, size_t),
valarray::operator=, valarray::sum, valarray::min, valarray::max,
_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT, _DEFINE_BINARY_OPERATOR):
Likewise.
From-SVN: r227595
2015-09-09 18:12:47 +01:00
|
|
|
__glibcxx_assert(__m.count(__ref._M_next) > 0);
|
2013-09-05 15:20:39 +00:00
|
|
|
__ref._M_next = __m[__ref._M_next];
|
|
|
|
}
|
2015-07-30 10:35:45 +00:00
|
|
|
if (__ref._M_has_alt())
|
regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not use std::map.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_automaton.tcc (_StateSeq<>::_M_clone()): Do not
use std::map.
* include/bits/regex_automaton.h: Do not use std::set.
* include/bits/regex_compiler.h (_BracketMatcher<>::_M_add_char(),
_BracketMatcher<>::_M_add_collating_element(),
_BracketMatcher<>::_M_add_equivalence_class(),
_BracketMatcher<>::_M_make_range()): Likewise.
* include/bits/regex_compiler.tcc (_BracketMatcher<>::_M_apply()):
Likewise.
* include/bits/regex_executor.h: Do not use std::queue.
* include/bits/regex_executor.tcc (_Executor<>::_M_main(),
_Executor<>::_M_dfs()): Likewise.
* include/std/regex: Remove <map>, <set> and <queue>.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex.h (__compile_nfa<>(), basic_regex<>::basic_regex(),
basic_regex<>::assign()): Change __compile_nfa to accept
const _CharT* only.
* include/bits/regex_compiler.h: Change _Compiler's template
argument from <_FwdIter, _TraitsT> to <_TraitsT>.
* include/bits/regex_compiler.tcc: Likewise.
2014-01-17 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h: Change _ScannerT into char-type
templated.
* include/bits/regex_scanner.h (_Scanner<>::_Scanner()): Separate
_ScannerBase from _Scanner; Change _Scanner's template argument from
_FwdIter to _CharT. Avoid use of std::map and std::set by using arrays
instead.
* include/bits/regex_scanner.tcc (_Scanner<>::_Scanner(),
_Scanner<>::_M_scan_normal(), _Scanner<>::_M_eat_escape_ecma(),
_Scanner<>::_M_eat_escape_posix(), _Scanner<>::_M_eat_escape_awk()):
Likewise.
* include/std/regex: Add <cstring> for using strchr.
2014-01-17 Tim Shen <timshen91@gmail.com>
* bits/regex_automaton.tcc: Indentation fix.
* bits/regex_compiler.h (__compile_nfa<>(), _Compiler<>,
_RegexTranslator<> _AnyMatcher<>, _CharMatcher<>,
_BracketMatcher<>): Add bool option template parameters and
specializations to make matching more efficient and space saving.
* bits/regex_compiler.tcc: Likewise.
From-SVN: r206690
2014-01-16 23:35:21 +00:00
|
|
|
if (__ref._M_alt != _S_invalid_state_id)
|
2013-09-05 15:20:39 +00:00
|
|
|
{
|
Enable lightweight checks with _GLIBCXX_ASSERTIONS.
* doc/xml/manual/using.xml (_GLIBCXX_ASSERTIONS): Document.
* doc/html/manual/using_macros.html: Regenerate.
* include/bits/c++config: Define _GLIBCXX_ASSERTIONS when
_GLIBCXX_DEBUG is defined. Disable std::string extern templates when
(_GLIBCXX_EXTERN_TEMPLATE, __glibcxx_assert): Depend on
_GLIBCXX_ASSERTIONS instead of _GLIBCXX_DEBUG.
* include/debug/debug.h [!_GLIBCXX_DEBUG]: Define
__glibcxx_requires_non_empty_range and __glibcxx_requires_nonempty.
* include/backward/auto_ptr.h (auto_ptr::operator*,
auto_ptr::operator->): Replace _GLIBCXX_DEBUG_ASSERT with
__glibcxx_assert.
* include/bits/basic_string.h (basic_string::operator[],
basic_string::front, basic_string::back, basic_string::pop_back):
Likewise.
* include/bits/random.h
(uniform_int_distribution::param_type::param_type,
uniform_real_distribution::param_type::param_type,
normal_distribution::param_type::param_type,
gamma_distribution::param_type::param_type,
bernoulli_distribution::param_type::param_type,
binomial_distribution::param_type::param_type,
geometric_distribution::param_type::param_type,
negative_binomial_distribution::param_type::param_type,
poisson_distribution::param_type::param_type,
exponential_distribution::param_type::param_type): Likewise.
* include/bits/regex.h (match_results::operator[],
match_results::prefix, match_results::suffix): Likewise.
* include/bits/regex.tcc (format, regex_iterator::operator++):
Likewise.
* include/bits/regex_automaton.tcc (_StateSeq::_M_clone): Likewise.
* include/bits/regex_compiler.tcc (_Compiler::_Compiler,
_Compiler::_M_insert_character_class_matcher): Likewise.
* include/bits/regex_executor.tcc (_Executor::_M_dfs): Likewise.
* include/bits/regex_scanner.tcc (_Scanner::_M_advance,
_Scanner::_M_scan_normal): Likewise.
* include/bits/shared_ptr_base.h (__shared_ptr::_M_reset,
__shared_ptr::operator*): Likewise.
* include/bits/stl_iterator_base_funcs.h (__advance): Likewise.
* include/bits/unique_ptr.h (unique_ptr::operator*,
unique_ptr::operator[]): Likewise.
* include/experimental/fs_path.h (path::path(string_type, _Type),
path::iterator::operator++, path::iterator::operator--,
path::iterator::operator*): Likewise.
* include/experimental/string_view (basic_string_view::operator[],
basic_string_view::front, basic_string_view::back,
basic_string_view::remove_prefix): Likewise.
* include/ext/random (beta_distribution::param_type::param_type,
normal_mv_distribution::param_type::param_type,
rice_distribution::param_type::param_type,
pareto_distribution::param_type::param_type,
k_distribution::param_type::param_type,
arcsine_distribution::param_type::param_type,
hoyt_distribution::param_type::param_type,
triangular_distribution::param_type::param_type,
von_mises_distribution::param_type::param_type,
hypergeometric_distribution::param_type::param_type,
logistic_distribution::param_type::param_type): Likewise.
* include/ext/vstring.h (__versa_string::operator[]): Likewise.
* include/std/complex (polar): Likewise.
* include/std/mutex [!_GTHREAD_USE_MUTEX_TIMEDLOCK]
(timed_mutex::~timed_mutex, timed_mutex::unlock,
(recursive_timed_mutex::~timed_mutex, recursive_timed_mutex::unlock):
Likewise.
* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
(__shared_mutex_pthread::__shared_mutex_pthread,
__shared_mutex_pthread::~__shared_mutex_pthread): Likewise.
(__shared_mutex_pthread::lock, __shared_mutex_pthread::try_lock,
__shared_mutex_pthread::unlock, __shared_mutex_pthread::lock_shared,
__shared_mutex_pthread::try_lock_shared): Likewise.
(__shared_mutex_cv::~__shared_mutex_cv, __shared_mutex_cv::unlock,
__shared_mutex_cv::unlock_shared): Likewise.
(shared_timed_mutex::try_lock_until,
shared_timed_mutex::try_lock_shared_until): Likewise.
* include/std/valarray (valarray::valarray(const _Tp*, size_t),
valarray::operator=, valarray::sum, valarray::min, valarray::max,
_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT, _DEFINE_BINARY_OPERATOR):
Likewise.
From-SVN: r227595
2015-09-09 18:12:47 +01:00
|
|
|
__glibcxx_assert(__m.count(__ref._M_alt) > 0);
|
2013-09-05 15:20:39 +00:00
|
|
|
__ref._M_alt = __m[__ref._M_alt];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return _StateSeq(_M_nfa, __m[_M_start], __m[_M_end]);
|
2013-08-07 16:27:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace __detail
|
|
|
|
} // namespace
|