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

re PR libstdc++/64302 (The match_results::cbegin()/cend() return incorrect results) 

PR libstdc++/64302
	PR libstdc++/64303
	* include/bits/regex.h (match_results::cbegin, match_results::cend,
	regex_token_iterator::regex_token_iterator,
	regex_token_iterator::_M_normalize_result): Fix match_results cbegin
	and cend and regex_token_iterator::_M_result invariant.
	* include/bits/regex.tcc: Fix regex_token_iterator::_M_result invariant.
	* testsuite/28_regex/iterators/regex_token_iterator/64303.cc: Testcase.

From-SVN: r218810
This commit is contained in:
Tim Shen 2014-12-17 09:25:44 +00:00 committed by Tim Shen
parent b20487079f
commit e16a69a8f2
4 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2014-12-17 Tim Shen <timshen@google.com>
PR libstdc++/64302
PR libstdc++/64303
* include/bits/regex.h (match_results::cbegin, match_results::cend,
regex_token_iterator::regex_token_iterator,
regex_token_iterator::_M_normalize_result): Fix match_results cbegin
and cend and regex_token_iterator::_M_result invariant.
* include/bits/regex.tcc: Fix regex_token_iterator::_M_result invariant.
* testsuite/28_regex/iterators/regex_token_iterator/64303.cc: Testcase.
2014-12-16 Jakub Jelinek <jakub@redhat.com>
* config/abi/pre/gnu.ver (CXXABI_1.3.9): Export not just

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

@ -1756,7 +1756,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*/
const_iterator
cbegin() const
{ return _Base_type::cbegin() + 2; }
{ return this->begin(); }
/**
* @brief Gets an iterator to one-past-the-end of the collection.
@ -1770,7 +1770,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*/
const_iterator
cend() const
{ return _Base_type::cend(); }
{ return this->end(); }
//@}
@ -2632,7 +2632,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
regex_constants::match_flag_type __m
= regex_constants::match_default)
: _M_position(__a, __b, __re, __m),
_M_subs(__submatches, *(&__submatches+1)), _M_n(0)
_M_subs(__submatches, __submatches + _Nm), _M_n(0)
{ _M_init(__a, __b); }
// _GLIBCXX_RESOLVE_LIB_DEFECTS
@ -2660,12 +2660,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*/
regex_token_iterator(const regex_token_iterator& __rhs)
: _M_position(__rhs._M_position), _M_subs(__rhs._M_subs),
_M_suffix(__rhs._M_suffix), _M_n(__rhs._M_n), _M_result(__rhs._M_result),
_M_has_m1(__rhs._M_has_m1)
{
if (__rhs._M_result == &__rhs._M_suffix)
_M_result = &_M_suffix;
}
_M_suffix(__rhs._M_suffix), _M_n(__rhs._M_n), _M_has_m1(__rhs._M_has_m1)
{ _M_normalize_result(); }
/**
* @brief Assigns a %regex_token_iterator to another.
@ -2737,6 +2733,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_end_of_seq() const
{ return _M_result == nullptr; }
// [28.12.2.2.4]
void
_M_normalize_result()
{
if (_M_position != _Position())
_M_result = &_M_current_match();
else if (_M_has_m1)
_M_result = &_M_suffix;
else
_M_result = nullptr;
}
_Position _M_position;
std::vector<int> _M_subs;
value_type _M_suffix;

4
libstdc++-v3/include/bits/regex.tcc
View File

@ -607,11 +607,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_position = __rhs._M_position;
_M_subs = __rhs._M_subs;
_M_n = __rhs._M_n;
_M_result = __rhs._M_result;
_M_suffix = __rhs._M_suffix;
_M_has_m1 = __rhs._M_has_m1;
if (__rhs._M_result == &__rhs._M_suffix)
_M_result = &_M_suffix;
_M_normalize_result();
return *this;
}

49
libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/64303.cc Normal file
View File

@ -0,0 +1,49 @@
// { dg-do run }
// { dg-options "-std=gnu++11" }
//
// Copyright (C) 2014 Free Software Foundation, Inc.
//
// 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.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// 28.12.2 Class template regex_token_iterator
#include <regex>
#include <testsuite_hooks.h>
void
test01()
{
bool test __attribute__((unused)) = true;
const std::string s(" 111 222 ");
const std::regex re("\\w+");
std::sregex_token_iterator it1(s.begin(), s.end(), re), it2(it1), end;
for (; it1 != end; ++it1, ++it2) {
VERIFY(it1 == it2);
VERIFY(*it1 == *it2);
}
VERIFY(it2 == end);
}
int
main()
{
test01();
return 0;
}