diff options
Diffstat (limited to 'libstdc++-v3/include/bits/regex.h')
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 555dfc6e1fb..48388198ce0 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -740,11 +740,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @throws regex_error if @p [__first, __last) is not a valid regular * expression. */ - template<typename _InputIterator> - basic_regex(_InputIterator __first, _InputIterator __last, + template<typename _FwdIter> + basic_regex(_FwdIter __first, _FwdIter __last, flag_type __f = ECMAScript) : _M_flags(__f), - _M_automaton(__detail::_Compiler<_InputIterator, _Ch_type, _Rx_traits> + _M_automaton(__detail::_Compiler<_FwdIter, _Ch_type, _Rx_traits> (__first, __last, _M_traits, _M_flags)._M_get_nfa()) { } @@ -2371,7 +2371,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { if (__re._M_automaton == nullptr) return false; - for (auto __cur = __first; __cur != __last; ++__cur) // Any KMP-like algo? + auto __cur = __first; + // Continue when __cur == __last + do { __detail::__get_executor(__cur, __last, __m, __re, __flags) ->_M_search_from_first(); @@ -2391,10 +2393,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; } } + while (__cur++ != __last); return false; } - /** * Searches for a regular expression within a range. * @param __first [IN] The start of the string to search. |