status_cxx2011.xml: Update regex status.

2013-10-01  Tim Shen  <timshen91@gmail.com>

	* doc/xml/manual/status_cxx2011.xml: Update regex status.
	* include/bits/regex.h (match_results<>::begin,
	match_results<>::cbegin, match_results<>::end, match_results<>::cend):
	[28.10.3.13], [28.10.3.14] Always iterate the range [0, size()-2).

From-SVN: r203096

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fd237ed7612528efb63f0089bed1c49bc7643bf6..1a2fb28e23325752dc385e06a6cfc53d6618c260 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-01  Tim Shen  <timshen91@gmail.com>
+
+       * doc/xml/manual/status_cxx2011.xml: Update regex status.
+       * include/bits/regex.h (match_results<>::begin,
+       match_results<>::cbegin, match_results<>::end, match_results<>::cend):
+       [28.10.3.13], [28.10.3.14] Always iterate the range [0, size()-2).
+
 2013-10-01  François Dumont  <fdumont@gcc.gnu.org>
 
        * include/parallel/algobase.h (mismatch, equal): Provide parallel

diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
index 286a539ba7685661a56ef99b5f4e319173b59a40..29c235d1748d73fe8810acdeca5ae43011640b2c 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
@@ -2179,31 +2179,27 @@ particular release.
       </entry>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.1</entry>
       <entry>General</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.2</entry>
       <entry>Definitions</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.3</entry>
       <entry>Requirements</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.4</entry>
       <entry>Header <code>&lt;regex&gt;</code> synopsis</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
@@ -2223,48 +2219,43 @@ particular release.
       <entry>28.7</entry>
       <entry>Class template <code>regex_traits</code></entry>
       <entry>Partial</entry>
+      <entry><code>transform_primary</code> is not implemented</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#B0B0B0" ?>
       <entry>28.8</entry>
       <entry>Class template <code>basic_regex</code></entry>
-      <entry>Partial</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#B0B0B0" ?>
       <entry>28.9</entry>
       <entry>Class template <code>sub_match</code></entry>
-      <entry>Partial</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#B0B0B0" ?>
       <entry>28.10</entry>
       <entry>Class template <code>match_results</code></entry>
-      <entry>Partial</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.11</entry>
       <entry>Regular expression algorithms</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.12</entry>
       <entry>Regular expression Iterators</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>28.13</entry>
       <entry>Modified ECMAScript regular expression grammar</entry>
-      <entry>N</entry>
+      <entry>Y</entry>
       <entry/>
     </row>
     <row>

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index cbe903625b9db706dd2b0346ecde9d7755106509..4d7e7d7ff3634337fa50924d9e7f4afb2fd8745e 100644 (file)
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -220,10 +220,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        string_type
        transform_primary(_Fwd_iter __first, _Fwd_iter __last) const
        {
+         // TODO : this is not entirely correct.
+         // This function requires extra support from the platform.
+         //
+         // Read http://gcc.gnu.org/ml/libstdc++/2013-09/msg00117.html and
+         // http://www.open-std.org/Jtc1/sc22/wg21/docs/papers/2003/n1429.htm
+         // for details.
          typedef std::ctype<char_type> __ctype_type;
          const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
          std::vector<char_type> __s(__first, __last);
-         // FIXME : this is not entirely correct
          __fctyp.tolower(__s.data(), __s.data() + __s.size());
          return this->transform(__s.data(), __s.data() + __s.size());
        }
@@ -416,8 +421,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *
        * @throws regex_error if @p __p is not a valid regular expression.
        */
-      basic_regex(const _Ch_type* __p,
-                 std::size_t __len, flag_type __f = ECMAScript)
+      basic_regex(const _Ch_type* __p, std::size_t __len,
+                 flag_type __f = ECMAScript)
       : basic_regex(__p, __p + __len, __f)
       { }
 
@@ -484,8 +489,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *
        * @throws regex_error if @p __l is not a valid regular expression.
        */
-      basic_regex(initializer_list<_Ch_type> __l,
-                 flag_type __f = ECMAScript)
+      basic_regex(initializer_list<_Ch_type> __l, flag_type __f = ECMAScript)
       : basic_regex(__l.begin(), __l.end(), __f)
       { }
 
@@ -1494,17 +1498,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        * @name 10.? Public Types
        */
       //@{
-      typedef _Alloc                                       allocator_type;
       typedef sub_match<_Bi_iter>                          value_type;
       typedef const value_type&                            const_reference;
       typedef const_reference                              reference;
       typedef typename _Base_type::const_iterator          const_iterator;
       typedef const_iterator                               iterator;
       typedef typename __iter_traits::difference_type     difference_type;
-      typedef typename __iter_traits::value_type          char_type;
       typedef typename allocator_traits<_Alloc>::size_type size_type;
-
-
+      typedef _Alloc                                       allocator_type;
+      typedef typename __iter_traits::value_type          char_type;
       typedef std::basic_string<char_type>                 string_type;
       //@}
 
@@ -1730,21 +1732,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        */
       const_iterator
       cbegin() const
-      { return _Base_type::cbegin(); }
+      { return _Base_type::cbegin() + 2; }
 
       /**
        * @brief Gets an iterator to one-past-the-end of the collection.
        */
       const_iterator
       end() const
-      { return !empty() ? _Base_type::end() - 2 : _Base_type::end(); }
+      { return _Base_type::end() - 2; }
 
       /**
        * @brief Gets an iterator to one-past-the-end of the collection.
        */
       const_iterator
       cend() const
-      { return end(); }
+      { return _Base_type::cend(); }
 
       //@}
 
@@ -2263,14 +2265,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    */
   template<typename _Rx_traits, typename _Ch_type,
           typename _St, typename _Sa, typename _Fst, typename _Fsa>
-    inline basic_string<_Ch_type>
+    inline basic_string<_Ch_type, _St, _Sa>
     regex_replace(const basic_string<_Ch_type, _St, _Sa>& __s,
                  const basic_regex<_Ch_type, _Rx_traits>& __e,
                  const basic_string<_Ch_type, _Fst, _Fsa>& __fmt,
                  regex_constants::match_flag_type __flags
                  = regex_constants::match_default)
     {
-      basic_string<_Ch_type> __result;
+      basic_string<_Ch_type, _St, _Sa> __result;
       regex_replace(std::back_inserter(__result),
                    __s.begin(), __s.end(), __e, __fmt, __flags);
       return __result;
@@ -2289,14 +2291,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    */
   template<typename _Rx_traits, typename _Ch_type,
           typename _St, typename _Sa>
-    inline basic_string<_Ch_type>
+    inline basic_string<_Ch_type, _St, _Sa>
     regex_replace(const basic_string<_Ch_type, _St, _Sa>& __s,
                  const basic_regex<_Ch_type, _Rx_traits>& __e,
                  const _Ch_type* __fmt,
                  regex_constants::match_flag_type __flags
                  = regex_constants::match_default)
     {
-      basic_string<_Ch_type> __result;
+      basic_string<_Ch_type, _St, _Sa> __result;
       regex_replace(std::back_inserter(__result),
                    __s.begin(), __s.end(), __e, __fmt, __flags);
       return __result;
@@ -2662,7 +2664,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _M_end_of_seq()
       { return _M_result == nullptr; }
 
-      _Position _M_position;
+      _Position         _M_position;
       const value_type* _M_result;
       value_type        _M_suffix;
       std::size_t       _M_n;