[libcxx-commits] [libcxx] r361887 - Fix an incorrect 'Throws' in the regex code. Add a test for the new behavior. Reviewed as https://reviews.llvm.org/D61828. Thanks to Mark for the catch and the fix.

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Tue May 28 15:42:32 2019
New Revision: 361887

URL: http://llvm.org/viewvc/llvm-project?rev=361887&view=rev
Log:
Fix an incorrect 'Throws' in the regex code. Add a test for the new behavior. Reviewed as https://reviews.llvm.org/D61828. Thanks to Mark for the catch and the fix.

Added:
    libcxx/trunk/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp
Modified:
    libcxx/trunk/include/regex

Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=361887&r1=361886&r2=361887&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Tue May 28 15:42:32 2019
@@ -2306,7 +2306,7 @@ public:
             else
             {
                 if (__b.size() != 1 || __e.size() != 1)
-                    __throw_regex_error<regex_constants::error_collate>();
+                    __throw_regex_error<regex_constants::error_range>();
                 if (__icase_)
                 {
                     __b[0] = __traits_.translate_nocase(__b[0]);

Added: libcxx/trunk/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp?rev=361887&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp Tue May 28 15:42:32 2019
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: libcpp-no-exceptions
+// <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>
+#include "test_macros.h"
+
+static bool error_range_thrown(const char *pat)
+{
+    bool result = false;
+    try {
+        std::regex re(pat);
+    } catch (const std::regex_error &ex) {
+        result = (ex.code() == std::regex_constants::error_range);
+    }
+    return result;
+}
+
+int main(int, char**)
+{
+    assert(error_range_thrown(R"([\w-a])"));
+    assert(error_range_thrown(R"([a-\w])"));
+
+  return 0;
+}