[libcxx] r185449 - 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).

[Howard Hinnant]

Author: hhinnant
Date: Tue Jul  2 12:43:31 2013
New Revision: 185449

URL: http://llvm.org/viewvc/llvm-project?rev=185449&view=rev
Log:
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).

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

Added:
    libcxx/trunk/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp
Modified:
    libcxx/trunk/CREDITS.TXT
    libcxx/trunk/include/regex

Modified: libcxx/trunk/CREDITS.TXT
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CREDITS.TXT?rev=185449&r1=185448&r2=185449&view=diff
==============================================================================
--- libcxx/trunk/CREDITS.TXT (original)
+++ libcxx/trunk/CREDITS.TXT Tue Jul  2 12:43:31 2013
@@ -33,6 +33,10 @@ E: mclow.lists at gmail.com
 E: marshall at idio.com
 D: Minor patches and bug fixes.
 
+N: Bill Fisher
+E: william.w.fisher at gmail.com
+D: Regex bug fixes.
+
 N: Google Inc.
 D: Copyright owner and contributor of the CityHash algorithm
 

Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=185449&r1=185448&r2=185449&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Tue Jul  2 12:43:31 2013
@@ -3913,7 +3913,7 @@ basic_regex<_CharT, _Traits>::__parse_aw
         {
             __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);

Added: libcxx/trunk/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp?rev=185449&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp (added)
+++ libcxx/trunk/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp Tue Jul  2 12:43:31 2013
@@ -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}));
+}