From c1ecd97f005317efe271f04c725fdf676653dc93 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Fri, 28 Jun 2013 20:31:05 +0000
Subject: [PATCH] Provide missing '{' in parsing extended quoted characters. 
 This fixes http://llvm.org/bugs/show_bug.cgi?id=16135

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185211 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/regex                                 |  1 +
 .../parse_curly_brackets.pass.cpp             | 72 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp

diff --git a/include/regex b/include/regex
index 75c61db3..52c9178a 100644
--- a/include/regex
+++ b/include/regex
@@ -3420,6 +3420,7 @@ basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first,
                 case '+':
                 case '?':
                 case '{':
+                case '}':
                     __push_char(*__temp);
                     __first = ++__temp;
                     break;
diff --git a/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp b/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
new file mode 100644
index 00000000..6a454189
--- /dev/null
+++ b/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
@@ -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();
+}