diff mbox

[libstdc++/64680] Conform the standard regex interface

Message ID CAG4ZjNkJJD1S8Dz4y9_7DCo9qq=5Kg1ZPXUaJCdcJnCK-i5+tg@mail.gmail.com
State New
Headers show

Commit Message

Tim Shen Jan. 20, 2015, 4:57 p.m. UTC 
Bootstrapped and tested.

Thanks!

Comments

Paolo Carlini Jan. 20, 2015, 5:04 p.m. UTC | #1 
Hi,

On 01/20/2015 05:57 PM, Tim Shen wrote:
> +void test02()
> +{
> +  bool test __attribute__((unused)) = true;
> +
> +  std::regex re("[[:alnum:]]", std::regex_constants::basic);
> +  re = "\\w+";
> +}
When we end up doing this to save run time, let's at least add in a 
comment the PR #, like

     // PR libstdc++/64680

before test02().

Paolo.
diff mbox

Patch

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 6de883a..07c78b7 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -442,7 +442,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
        */
       explicit
       basic_regex(const _Ch_type* __p, flag_type __f = ECMAScript)
-      : basic_regex(__p, __p + _Rx_traits::length(__p), __f)
+      : basic_regex(__p, __p + char_traits<_Ch_type>::length(__p), __f)
       { }
 
       /**
@@ -553,7 +553,19 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
        */
       basic_regex&
       operator=(const _Ch_type* __p)
-      { return this->assign(__p, flags()); }
+      { return this->assign(__p); }
+
+      /**
+       * @brief Replaces a regular expression with a new one constructed from
+       * an initializer list.
+       *
+       * @param __l  The initializer list.
+       *
+       * @throws regex_error if @p __l is not a valid regular expression.
+       */
+      basic_regex&
+      operator=(initializer_list<_Ch_type> __l)
+      { return this->assign(__l.begin(), __l.end()); }
 
       /**
        * @brief Replaces a regular expression with a new one constructed from
@@ -564,7 +576,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
       template<typename _Ch_traits, typename _Alloc>
 	basic_regex&
 	operator=(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s)
-	{ return this->assign(__s, flags()); }
+	{ return this->assign(__s); }
 
       // [7.8.3] assign
       /**
@@ -712,7 +724,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
       imbue(locale_type __loc)
       {
 	std::swap(__loc, _M_loc);
-	_M_automaton = nullptr;
+	_M_automaton.reset();
 	return __loc;
       }
 
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
index 19528b6..cf876e0 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
@@ -36,9 +36,18 @@  void test01()
   re.assign(cs);
 }
 
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::regex re("[[:alnum:]]", std::regex_constants::basic);
+  re = "\\w+";
+}
+
 int
 main()
 { 
   test01();
+  test02();
   return 0;
 }