generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bill Fisher: This patch fixes a bug where the regex parser doesn't advance the pointer after reading the third character of an octal escape (in awk mode).

Browse Source 
That is, regex{"\141", awk} results in the regular expression /a1/ instead of just /a/.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185449 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-07-02 17:43:31 +00:00
parent eaffd0a8ff
commit dbc8cf059e
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CREDITS.TXT
View File

@ -33,6 +33,10 @@ E: mclow.lists@gmail.com
E: marshall@idio.com
D: Minor patches and bug fixes.
N: Bill Fisher
E: william.w.fisher@gmail.com
D: Regex bug fixes.
N: Google Inc.
D: Copyright owner and contributor of the CityHash algorithm

2
include/regex
View File

@ -3913,7 +3913,7 @@ basic_regex<_CharT, _Traits>::__parse_awk_escape(_ForwardIterator __first,
{
__val = 8 * __val + *__first - '0';
if (++__first != __last && ('0' <= *__first && *__first <= '7'))
__val = 8 * __val + *__first - '0';
__val = 8 * __val + *__first++ - '0';
}
if (__str)
*__str = _CharT(__val);

28
test/re/re.regex/re.regex.construct/awk_oct.pass.cpp Normal file
View File

@ -0,0 +1,28 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <regex>
// template <class charT, class traits = regex_traits<charT>> class basic_regex;
// template <class ST, class SA>
// basic_regex(const basic_string<charT, ST, SA>& s);
#include <regex>
#include <cassert>
int main()
{
using std::regex_constants::awk;
assert(std::regex_match("\4", std::regex{"\\4", awk}));
assert(std::regex_match("\41", std::regex{"\\41", awk}));
assert(std::regex_match("\141", std::regex{"\\141", awk}));
assert(std::regex_match("\1411", std::regex{"\\1411", awk}));
}