[libcxx] r185211 - Provide missing '{' in parsing extended quoted characters. This fixes http://llvm.org/bugs/show_bug.cgi?id=16135

[Howard Hinnant]

Author: hhinnant
Date: Fri Jun 28 15:31:05 2013
New Revision: 185211

URL: http://llvm.org/viewvc/llvm-project?rev=185211&view=rev
Log:
Provide missing '{' in parsing extended quoted characters.  This fixes http://llvm.org/bugs/show_bug.cgi?id=16135

Added:
    libcxx/trunk/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
Modified:
    libcxx/trunk/include/regex

Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=185211&r1=185210&r2=185211&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Fri Jun 28 15:31:05 2013
@@ -3420,6 +3420,7 @@ basic_regex<_CharT, _Traits>::__parse_QU
                 case '+':
                 case '?':
                 case '{':
+                case '}':
                     __push_char(*__temp);
                     __first = ++__temp;
                     break;

Added: libcxx/trunk/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp?rev=185211&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp (added)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp Fri Jun 28 15:31:05 2013
@@ -0,0 +1,72 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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 BidirectionalIterator, class Allocator, class charT, class traits>
+//     bool
+//     regex_match(BidirectionalIterator first, BidirectionalIterator last,
+//                  match_results<BidirectionalIterator, Allocator>& m,
+//                  const basic_regex<charT, traits>& e,
+//                  regex_constants::match_flag_type flags = regex_constants::match_default);
+
+// http://llvm.org/bugs/show_bug.cgi?id=16135
+
+#include <string>
+#include <regex>
+#include <cassert>
+
+void
+test1()
+{
+    std::string re{"\\{a\\}"};
+    std::string target{"{a}"};
+    std::regex regex{re};
+    std::smatch smatch;
+    assert((std::regex_match(target, smatch, regex)));
+}
+
+void
+test2()
+{
+    std::string re{"\\{a\\}"};
+    std::string target{"{a}"};
+    std::regex regex{re, std::regex::extended};
+    std::smatch smatch;
+    assert((std::regex_match(target, smatch, regex)));
+}
+
+void
+test3()
+{
+    std::string re{"\\{a\\}"};
+    std::string target{"{a}"};
+    std::regex regex{re, std::regex::awk};
+    std::smatch smatch;
+    assert((std::regex_match(target, smatch, regex)));
+}
+
+void
+test4()
+{
+    std::string re{"\\{a\\}"};
+    std::string target{"{a}"};
+    std::regex regex{re, std::regex::egrep};
+    std::smatch smatch;
+    assert((std::regex_match(target, smatch, regex)));
+}
+
+int
+main()
+{
+    test1();
+    test2();
+    test3();
+    test4();
+}