diff options
| -rw-r--r-- | libcxx/CREDITS.TXT | 4 | ||||
| -rw-r--r-- | libcxx/include/regex | 2 | ||||
| -rw-r--r-- | libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp | 28 |
3 files changed, 33 insertions, 1 deletions
diff --git a/libcxx/CREDITS.TXT b/libcxx/CREDITS.TXT index 34a901f58da..d75630a0228 100644 --- a/libcxx/CREDITS.TXT +++ b/libcxx/CREDITS.TXT @@ -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 diff --git a/libcxx/include/regex b/libcxx/include/regex index 02211672077..312ca11442f 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -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); diff --git a/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp new file mode 100644 index 00000000000..11fce3fe0df --- /dev/null +++ b/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp @@ -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})); +} |
