regex.tcc (match_results<>::format, [...]): Update __out after calling std::copy.

2014-02-26  Tim Shen  <timshen91@gmail.com>

	* include/bits/regex.tcc (match_results<>::format,
	regex_replace<>): Update __out after calling std::copy.
	* testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc:
	Add testcase.
	* testsuite/28_regex/match_results/format.cc: Likewise.

From-SVN: r208179

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 50ed52f..2918b9c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-26  Tim Shen  <timshen91@gmail.com>
+
+       * include/bits/regex.tcc (match_results<>::format,
+       regex_replace<>): Update __out after calling std::copy.
+       * testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc:
+       Add testcase.
+       * testsuite/28_regex/match_results/format.cc: Likewise.
+
 2014-02-22  Marc Glisse  <marc.glisse@inria.fr>
 
        PR libstdc++/60308

diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc
index 73f55df..5fa1f01 100644 (file)
--- a/libstdc++-v3/include/bits/regex.tcc
+++ b/libstdc++-v3/include/bits/regex.tcc
@@ -425,7 +425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          auto& __sub = _Base_type::operator[](__idx);
          if (__sub.matched)
-           std::copy(__sub.first, __sub.second, __out);
+           __out = std::copy(__sub.first, __sub.second, __out);
        };
 
       if (__flags & regex_constants::format_sed)
@@ -455,7 +455,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
              if (__next == __fmt_last)
                break;
 
-             std::copy(__fmt_first, __next, __out);
+             __out = std::copy(__fmt_first, __next, __out);
 
              auto __eat = [&](char __ch) -> bool
                {
@@ -493,7 +493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                *__out++ = '$';
              __fmt_first = __next;
            }
-         std::copy(__fmt_first, __fmt_last, __out);
+         __out = std::copy(__fmt_first, __fmt_last, __out);
        }
       return __out;
     }
@@ -512,7 +512,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       if (__i == __end)
        {
          if (!(__flags & regex_constants::format_no_copy))
-           std::copy(__first, __last, __out);
+           __out = std::copy(__first, __last, __out);
        }
       else
        {
@@ -521,14 +521,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          for (; __i != __end; ++__i)
            {
              if (!(__flags & regex_constants::format_no_copy))
-               std::copy(__i->prefix().first, __i->prefix().second, __out);
+               __out = std::copy(__i->prefix().first, __i->prefix().second,
+                                 __out);
              __out = __i->format(__out, __fmt, __fmt + __len, __flags);
              __last = __i->suffix();
              if (__flags & regex_constants::format_first_only)
                break;
            }
          if (!(__flags & regex_constants::format_no_copy))
-           std::copy(__last.first, __last.second, __out);
+           __out = std::copy(__last.first, __last.second, __out);
        }
       return __out;
     }

diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc
new file mode 100644 (file)
index 0000000..b2aeac0
--- /dev/null
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc
@@ -0,0 +1,49 @@
+// { dg-options "-std=gnu++11" }
+
+//
+// Copyright (C) 2014 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 28.11.4 regex_replace
+// Tests ECMAScript regex_replace's _Out_iter return value.
+
+#include <regex>
+#include <testsuite_hooks.h>
+
+using namespace std;
+
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  char buff[4096] = {0};
+  regex re("asdf");
+  cmatch m;
+  string s = "asdf";
+  string res = "|asdf|asdf|";
+  VERIFY(regex_replace(buff, s.data(), s.data() + s.size(), re, "|&|\\0|",
+                      regex_constants::format_sed) == buff + res.size());
+  VERIFY(res == buff);
+}
+
+int
+main()
+{
+  test01();
+  return 0;
+}

diff --git a/libstdc++-v3/testsuite/28_regex/match_results/format.cc b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
index 11e3bdb..e71a232 100644 (file)
--- a/libstdc++-v3/testsuite/28_regex/match_results/format.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
@@ -45,9 +45,26 @@ test01()
         == "this is a string|a|string|is|this|\\");
 }
 
+void
+test02()
+{
+  bool test __attribute__((unused)) = true;
+
+  regex re("asdf");
+  cmatch m;
+  regex_match("asdf", m, re);
+  string fmt = "|&|\\0|";
+  char buff[4096] = {0};
+  string res = "|asdf|asdf|";
+  VERIFY(m.format(buff, fmt.data(), fmt.data() + fmt.size(),
+                 regex_constants::format_sed) == buff + res.size());
+  VERIFY(res == buff);
+}
+
 int
 main()
 {
   test01();
+  test02();
   return 0;
 }