procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/64239 (regex_iterator::operator= should copy match_results::position)

Browse source 
PR libstdc++/64239
	* include/bits/regex.h (match_results<>::swap): Use std::swap
	instead of swap.
	* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
	Likewise.
	* testsuite/28_regex/match_results/swap.cc: New testcase.

From-SVN: r219373
This commit is contained in:
Tim Shen 2015-01-09 03:58:59 +00:00 • committed by Tim Shen
parent e608ef6de9
commit a8e67466d3
4 changed files with 54 additions and 1 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 @@
2015-01-09 Tim Shen <timshen@google.com>
PR libstdc++/64239
* include/bits/regex.h (match_results<>::swap): Use std::swap
instead of swap.
* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
Likewise.
* testsuite/28_regex/match_results/swap.cc: New testcase.
2015-01-08 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/60132

1
libstdc++-v3/include/bits/regex.h
View file

@ -1863,6 +1863,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
void
swap(match_results& __that)
{
using std::swap;
_Base_type::swap(__that);
swap(_M_begin, __that._M_begin);
}

2
libstdc++-v3/include/bits/regex_compiler.tcc
View file

@ -276,7 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
auto& __tmp = (*_M_nfa)[__stack.top()];
__stack.pop();
swap(__tmp._M_next, __tmp._M_alt);
std::swap(__tmp._M_next, __tmp._M_alt);
}
}
_M_stack.push(__e);

43
libstdc++-v3/testsuite/28_regex/match_results/swap.cc Normal file
View file

@ -0,0 +1,43 @@
// { dg-options "-std=gnu++11" }
//
// Copyright (C) 2015 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/>.
#include <regex>
#include <testsuite_hooks.h>
void
test01()
{
bool test __attribute__((unused)) = true;
std::cmatch m;
std::regex_match("a", m, std::regex("a"));
std::cmatch mm1 = m, mm2;
mm1.swap(mm2);
VERIFY(m == mm2);
std::swap(mm1, mm2);
VERIFY(m == mm1);
}
int
main()
{
test01();
return 0;
}