git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backport: re PR libstdc++/68863 (Regular expressions: Backreferences don't work in negative lookahead) 

Backport from mainline
	2015-12-15  Tim Shen  <timshen@google.com>

	PR libstdc++/68863
	* include/bits/regex_executor.tcc (_Executor::_M_lookahead):
	Copy the captured content for lookahead, so that the backreferences
	inside can refer to them.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc:
	New testcase.

From-SVN: r231642
This commit is contained in:
Tim Shen 2015-12-15 05:19:20 +00:00 committed by Tim Shen
parent 2cbab8d9c9
commit fa979e815c
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,15 @@
2015-12-15 Tim Shen <timshen@google.com>
Backport from mainline
2015-12-15 Tim Shen <timshen@google.com>
PR libstdc++/68863
* include/bits/regex_executor.tcc (_Executor::_M_lookahead):
Copy the captured content for lookahead, so that the backreferences
inside can refer to them.
* testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc:
New testcase.
2015-12-11 Jonathan Wakely <jwakely@redhat.com> 2015-12-11 Jonathan Wakely <jwakely@redhat.com>
* doc/doxygen/user.cfg.in: Use EXTENSION_MAPPING tag. Add new headers * doc/doxygen/user.cfg.in: Use EXTENSION_MAPPING tag. Add new headers

5
libstdc++-v3/include/bits/regex_executor.tcc
View File

@ -147,7 +147,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
_M_lookahead(_State<_TraitsT> __state) _M_lookahead(_State<_TraitsT> __state)
{ {
_ResultsVec __what(_M_cur_results.size()); // Backreferences may refer to captured content.
// We may want to make this faster by not copying,
// but let's not be clever prematurely.
_ResultsVec __what(_M_cur_results);
_Executor __sub(_M_current, _M_end, __what, _M_re, _M_flags); _Executor __sub(_M_current, _M_end, __what, _M_re, _M_flags);
__sub._M_states._M_start = __state._M_alt; __sub._M_states._M_start = __state._M_alt;
if (__sub._M_search_from_first()) if (__sub._M_search_from_first())

43
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/68863.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/>.
// 28.11.2 regex_match
#include <regex>
#include <testsuite_hooks.h>
#include <testsuite_regex.h>
using namespace __gnu_test;
using namespace std;
// libstdc++/68863
void
test01()
{
bool test __attribute__((unused)) = true;
VERIFY(!std::regex_match("aa", std::regex("(.)(?!\\1).")));
}
int
main()
{
test01();
return 0;
}