Re: [PATCH] D22702: [libcxx]Missing default argument for flag_type parameter in one of std::basic_regex constructors

[Jason Liu via cfe-commits]

jasonliu updated this revision to Diff 66153.
jasonliu added a comment.

Address @hubert.reinterpretcast 's comment about the test case. Added more 
cases to test "size" parameter in the constructor.


https://reviews.llvm.org/D22702

Files:
  include/regex
  test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp

Index: test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
===================================================================
--- test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
+++ test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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;
+
+// basic_regex(const charT* p, size_t len);
+
+#include <regex>
+#include <cassert>
+
+template <class CharT>
+void
+test(const CharT* p, std::size_t len, unsigned mc)
+{
+    std::basic_regex<CharT> r(p, len);
+    assert(r.flags() == std::regex_constants::ECMAScript);
+    assert(r.mark_count() == mc);
+}
+
+int main()
+{
+    test("\\(a\\)", 5, 0);
+    test("\\(a[bc]\\)", 9, 0);
+    test("\\(a\\([bc]\\)\\)", 13, 0);
+    test("(a([bc]))", 9, 2);
+   
+    test("(\0)(b)(c)(d)", 12, 4);
+    test("(\0)(b)(c)(d)", 9, 3);
+    test("(\0)(b)(c)(d)", 3, 1);
+    test("(\0)(b)(c)(d)", 0, 0);
+}
Index: include/regex
===================================================================
--- include/regex
+++ include/regex
@@ -145,7 +145,7 @@
     // construct/copy/destroy:
     basic_regex();
     explicit basic_regex(const charT* p, flag_type f = 
regex_constants::ECMAScript);
-    basic_regex(const charT* p, size_t len, flag_type f);
+    basic_regex(const charT* p, size_t len, flag_type f = 
regex_constants::ECMAScript);
     basic_regex(const basic_regex&);
     basic_regex(basic_regex&&) noexcept;
     template <class ST, class SA>
@@ -2515,7 +2515,7 @@
           __end_(0)
         {__parse(__p, __p + __traits_.length(__p));}
     _LIBCPP_INLINE_VISIBILITY
-    basic_regex(const value_type* __p, size_t __len, flag_type __f)
+    basic_regex(const value_type* __p, size_t __len, flag_type __f = 
regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), 
__open_count_(0),
           __end_(0)
         {__parse(__p, __p + __len);}



Index: test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
===================================================================
--- test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
+++ test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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;
+
+// basic_regex(const charT* p, size_t len);
+
+#include <regex>
+#include <cassert>
+
+template <class CharT>
+void
+test(const CharT* p, std::size_t len, unsigned mc)
+{
+    std::basic_regex<CharT> r(p, len);
+    assert(r.flags() == std::regex_constants::ECMAScript);
+    assert(r.mark_count() == mc);
+}
+
+int main()
+{
+    test("\\(a\\)", 5, 0);
+    test("\\(a[bc]\\)", 9, 0);
+    test("\\(a\\([bc]\\)\\)", 13, 0);
+    test("(a([bc]))", 9, 2);
+   
+    test("(\0)(b)(c)(d)", 12, 4);
+    test("(\0)(b)(c)(d)", 9, 3);
+    test("(\0)(b)(c)(d)", 3, 1);
+    test("(\0)(b)(c)(d)", 0, 0);
+}
Index: include/regex
===================================================================
--- include/regex
+++ include/regex
@@ -145,7 +145,7 @@
     // construct/copy/destroy:
     basic_regex();
     explicit basic_regex(const charT* p, flag_type f = regex_constants::ECMAScript);
-    basic_regex(const charT* p, size_t len, flag_type f);
+    basic_regex(const charT* p, size_t len, flag_type f = regex_constants::ECMAScript);
     basic_regex(const basic_regex&);
     basic_regex(basic_regex&&) noexcept;
     template <class ST, class SA>
@@ -2515,7 +2515,7 @@
           __end_(0)
         {__parse(__p, __p + __traits_.length(__p));}
     _LIBCPP_INLINE_VISIBILITY
-    basic_regex(const value_type* __p, size_t __len, flag_type __f)
+    basic_regex(const value_type* __p, size_t __len, flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
         {__parse(__p, __p + __len);}

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits