[libcxx-commits] [libcxx] r352781 - Fix a bit of libc++-specific behavior in the regex tests; add a missing test. Reviewed as https://reviews.llvm.org/D57391 Thanks to Andrey Maksimov for the patch

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Thu Jan 31 10:54:26 2019
New Revision: 352781

URL: http://llvm.org/viewvc/llvm-project?rev=352781&view=rev
Log:
Fix a bit of libc++-specific behavior in the regex tests; add a missing test. Reviewed as https://reviews.llvm.org/D57391 Thanks to Andrey Maksimov for the patch

Added:
    libcxx/trunk/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp
Modified:
    libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp
    libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp

Modified: libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp?rev=352781&r1=352780&r2=352781&view=diff
==============================================================================
--- libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp (original)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.match/exponential.pass.cpp Thu Jan 31 10:54:26 2019
@@ -21,18 +21,20 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main() {
   for (std::regex_constants::syntax_option_type op :
        {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
         std::regex::awk}) {
     try {
-      std::regex_match(
+      bool b = std::regex_match(
           "aaaaaaaaaaaaaaaaaaaa",
           std::regex(
               "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaa",
               op));
-      assert(false);
+      LIBCPP_ASSERT(false);
+      assert(b);
     } catch (const std::regex_error &e) {
       assert(e.code() == std::regex_constants::error_complexity);
     }

Added: libcxx/trunk/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp?rev=352781&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp Thu Jan 31 10:54:26 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
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+// UNSUPPORTED: libcpp-no-exceptions
+
+// template <class OutputIterator, class BidirectionalIterator,
+//           class traits, class charT, class ST, class SA>
+//     OutputIterator
+//     regex_replace(OutputIterator out,
+//                   BidirectionalIterator first, BidirectionalIterator last,
+//                   const basic_regex<charT, traits>& e,
+//                   const basic_string<charT, ST, SA>& fmt,
+//                   regex_constants::match_flag_type flags =
+//                                              regex_constants::match_default);
+
+#include <regex>
+#include <cassert>
+
+#include "test_macros.h"
+
+int main()
+{
+    try {
+        std::regex re("a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaa");
+        const char s[] = "aaaaaaaaaaaaaaaaaaaa";
+        std::string r = std::regex_replace(s, re, "123-&", std::regex_constants::format_sed);
+        LIBCPP_ASSERT(false);
+        assert(r == "123-aaaaaaaaaaaaaaaaaaaa");
+    } catch (const std::regex_error &e) {
+      assert(e.code() == std::regex_constants::error_complexity);
+    }
+}

Modified: libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp?rev=352781&r1=352780&r2=352781&view=diff
==============================================================================
--- libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp (original)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.search/exponential.pass.cpp Thu Jan 31 10:54:26 2019
@@ -21,18 +21,20 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main() {
   for (std::regex_constants::syntax_option_type op :
        {std::regex::ECMAScript, std::regex::extended, std::regex::egrep,
         std::regex::awk}) {
     try {
-      std::regex_search(
+      bool b = std::regex_search(
           "aaaaaaaaaaaaaaaaaaaa",
           std::regex(
               "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaa",
               op));
-      assert(false);
+      LIBCPP_ASSERT(false);
+      assert(b);
     } catch (const std::regex_error &e) {
       assert(e.code() == std::regex_constants::error_complexity);
     }