[Patch, libstdc++/64239] Use std::swap instead of swap in regex

[Patch, libstdc++/64239] Use std::swap instead of swap in regex

[Tim Shen]

[-- Attachment #1: Type: text/plain, Size: 98 bytes --]

Bootstrapped and tested. It could be also patched to 4.9 branch.

Thanks!


-- 
Regards,
Tim Shen

[-- Attachment #2: a.diff --]
[-- Type: text/plain, Size: 1225 bytes --]

commit dfe3a26759893849020a659b14fafe8b27e90dae
Author: timshen <timshen@google.com>
Date:   Tue Jan 6 19:30:27 2015 -0800

    	PR libstdc++/64239
    
    	* include/bits/regex.h (match_results<>::swap): Use std::swap
    	instead of swap.
    	* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
    	Likewise.

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 9b7ed8c..b520039 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -1864,7 +1864,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       swap(match_results& __that)
       {
 	_Base_type::swap(__that);
-	swap(_M_begin, __that._M_begin);
+	std::swap(_M_begin, __that._M_begin);
       }
       //@}
 
diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
index 57bafa3..33d7118 100644
--- a/libstdc++-v3/include/bits/regex_compiler.tcc
+++ b/libstdc++-v3/include/bits/regex_compiler.tcc
@@ -276,7 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 		{
 		  auto& __tmp = (*_M_nfa)[__stack.top()];
 		  __stack.pop();
-		  swap(__tmp._M_next, __tmp._M_alt);
+		  std::swap(__tmp._M_next, __tmp._M_alt);
 		}
 	    }
 	  _M_stack.push(__e);

Re: [Patch, libstdc++/64239] Use std::swap instead of swap in regex

[Jonathan Wakely]

On 06/01/15 21:03 -0800, Tim Shen wrote:
>Bootstrapped and tested. It could be also patched to 4.9 branch.
>
>Thanks!
>
>
>-- 
>Regards,
>Tim Shen

>commit dfe3a26759893849020a659b14fafe8b27e90dae
>Author: timshen <timshen@google.com>
>Date:   Tue Jan 6 19:30:27 2015 -0800
>
>    	PR libstdc++/64239
>

No blank line here in the ChangeLog.

>    	* include/bits/regex.h (match_results<>::swap): Use std::swap
>    	instead of swap.
>    	* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
>    	Likewise.
>
>diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
>index 9b7ed8c..b520039 100644
>--- a/libstdc++-v3/include/bits/regex.h
>+++ b/libstdc++-v3/include/bits/regex.h
>@@ -1864,7 +1864,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
>       swap(match_results& __that)
>       {
> 	_Base_type::swap(__that);
>-	swap(_M_begin, __that._M_begin);
>+	std::swap(_M_begin, __that._M_begin);

This is swapping iterators, which can be user-defined types, so it
should support finding a swap function by ADL, i.e.

        using std::swap;
        swap(_M_begin, __that._M_begin);

>       }
>       //@}

Also, there should be a new test, since apparently we don't have any
test that tries to call match_results::swap(match_results&).

Re: [Patch, libstdc++/64239] Use std::swap instead of swap in regex

[Tim Shen]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

On Wed, Jan 7, 2015 at 4:39 AM, Jonathan Wakely <jwakely@redhat.com> wrote:
> No blank line here in the ChangeLog.

Done.

> This is swapping iterators, which can be user-defined types, so it
> should support finding a swap function by ADL, i.e.

Done.

> Also, there should be a new test, since apparently we don't have any
> test that tries to call match_results::swap(match_results&).

Done.


-- 
Regards,
Tim Shen

[-- Attachment #2: a.diff --]
[-- Type: text/plain, Size: 2681 bytes --]

commit 90118704de6214d9a9ce5d82fea8d364d758bc60
Author: timshen <timshen@google.com>
Date:   Tue Jan 6 19:30:27 2015 -0800

    	PR libstdc++/64239
    	* include/bits/regex.h (match_results<>::swap): Use std::swap
    	instead of swap.
    	* include/bits/regex_compiler.tcc (_Compiler<>::_M_quantifier):
    	Likewise.
    	* testsuite/28_regex/match_results/swap.cc: New testcase.

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 9b7ed8c..52c2384 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -1863,6 +1863,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       void
       swap(match_results& __that)
       {
+	using std::swap;
 	_Base_type::swap(__that);
 	swap(_M_begin, __that._M_begin);
       }
diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
index 57bafa3..33d7118 100644
--- a/libstdc++-v3/include/bits/regex_compiler.tcc
+++ b/libstdc++-v3/include/bits/regex_compiler.tcc
@@ -276,7 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 		{
 		  auto& __tmp = (*_M_nfa)[__stack.top()];
 		  __stack.pop();
-		  swap(__tmp._M_next, __tmp._M_alt);
+		  std::swap(__tmp._M_next, __tmp._M_alt);
 		}
 	    }
 	  _M_stack.push(__e);
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/swap.cc b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc
new file mode 100644
index 0000000..18248c1
--- /dev/null
+++ b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc
@@ -0,0 +1,43 @@
+// { dg-options "-std=gnu++11" }
+
+//
+// Copyright (C) 2015 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/>.
+
+#include <regex>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::cmatch m;
+  std::regex_match("a", m, std::regex("a"));
+  std::cmatch mm1 = m, mm2;
+  mm1.swap(mm2);
+  VERIFY(m == mm2);
+  std::swap(mm1, mm2);
+  VERIFY(m == mm1);
+}
+
+int
+main()
+{
+  test01();
+  return 0;
+}

Re: [Patch, libstdc++/64239] Use std::swap instead of swap in regex

[Jonathan Wakely]

On 08/01/15 11:44 -0800, Tim Shen wrote:
>On Wed, Jan 7, 2015 at 4:39 AM, Jonathan Wakely <jwakely@redhat.com> wrote:
>> No blank line here in the ChangeLog.
>
>Done.
>
>> This is swapping iterators, which can be user-defined types, so it
>> should support finding a swap function by ADL, i.e.
>
>Done.
>
>> Also, there should be a new test, since apparently we don't have any
>> test that tries to call match_results::swap(match_results&).
>
>Done.

Thanks - OK for trunk and 4.9.