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

regex_compiler.h (_Comipler<>::_M_quantifier()): Fix parse error of multiple consecutive quantifiers like "a**".

Browse source 
2014-01-19  Tim Shen  <timshen91@gmail.com>

	* include/bits/regex_compiler.h (_Comipler<>::_M_quantifier()):
	Fix parse error of multiple consecutive quantifiers like "a**".
	* include/bits/regex_compiler.tcc (_Comipler<>::_M_quantifier()):
	Likewise.
	* testsuite/28_regex/basic_regex/multiple_quantifiers.cc: New.

From-SVN: r206783
This commit is contained in:
Tim Shen 2014-01-19 21:59:20 +00:00 • committed by Tim Shen
parent e2a9b2cdf0
commit 053eb1f31e
4 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,11 @@
2014-01-19 Tim Shen <timshen91@gmail.com>
* include/bits/regex_compiler.h (_Comipler<>::_M_quantifier()):
Fix parse error of multiple consecutive quantifiers like "a**".
* include/bits/regex_compiler.tcc (_Comipler<>::_M_quantifier()):
Likewise.
* testsuite/28_regex/basic_regex/multiple_quantifiers.cc: New.
2014-01-17 François Dumont <fdumont@gcc.gnu.org>
* include/profile/set.h (set): Implement C++11 allocator-aware

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

@ -83,7 +83,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool
_M_assertion();
void
bool
_M_quantifier();
bool

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

@ -135,7 +135,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return true;
if (this->_M_atom())
{
this->_M_quantifier();
while (this->_M_quantifier());
return true;
}
return false;
@ -173,7 +173,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _TraitsT>
void
bool
_Compiler<_TraitsT>::
_M_quantifier()
{
@ -276,6 +276,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
_M_stack.push(__e);
}
else
return false;
return true;
}
#define __INSERT_REGEX_MATCHER(__func, args...)\

33
libstdc++-v3/testsuite/28_regex/basic_regex/multiple_quantifiers.cc Normal file
View file

@ -0,0 +1,33 @@
// { 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.8 basic_regex
// Tests multiple consecutive quantifiers
#include <regex>
using namespace std;
int
main()
{
regex re1("a++");
regex re2("(a+)+");
return 0;
}