PR libstdc++/81002 fix std::basic_regex range constructor

	PR libstdc++/81002
	* include/bits/regex.h (basic_regex): Adjust call to __compile_nfa
	so iterator type is deduced.
	* include/bits/regex_compiler.h (__compile_nfa): Reorder template
	parameters to allow iterator type to be deduced.
	* testsuite/28_regex/basic_regex/ctors/basic/iter.cc: New.

From-SVN: r248989

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 19bab89c8e7ea84db438c55c8cb217804ea0af0e..d7d6979da6f92a4737d9ea651cd7f61d6743c1ad 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2017-06-07  Jonathan Wakely  <jwakely@redhat.com>
 
+       PR libstdc++/81002
+       * include/bits/regex.h (basic_regex): Adjust call to __compile_nfa
+       so iterator type is deduced.
+       * include/bits/regex_compiler.h (__compile_nfa): Reorder template
+       parameters to allow iterator type to be deduced.
+       * testsuite/28_regex/basic_regex/ctors/basic/iter.cc: New.
+
        * include/bits/alloc_traits.h (__is_allocator, _RequireAllocator):
        New trait and alias for detecting Allocator-like types.
        * include/bits/basic_string.h (basic_string): Add deduction guide

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 15f0d08c8da195f1fa5d88ed21035611232522a3..1710db90e740900af43570e8f13702ac1e92ee42 100644 (file)
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -765,7 +765,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
        : _M_flags((__f & (ECMAScript | basic | extended | awk | grep | egrep))
                   ? __f : (__f | ECMAScript)),
        _M_loc(std::move(__loc)),
-       _M_automaton(__detail::__compile_nfa<_FwdIter, _Rx_traits>(
+       _M_automaton(__detail::__compile_nfa<_Rx_traits>(
          std::move(__first), std::move(__last), _M_loc, _M_flags))
        { }
 

diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h
index 49c01840c99fe1fac28c2c5683ff7b9673eebbe5..2c00939f6f93fb9ce2b57b26c19bed8bc88d8e5f 100644 (file)
--- a/libstdc++-v3/include/bits/regex_compiler.h
+++ b/libstdc++-v3/include/bits/regex_compiler.h
@@ -191,7 +191,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       = typename enable_if< !__is_contiguous_normal_iter<_Iter>::value,
                            std::shared_ptr<const _NFA<_TraitsT>> >::type;
 
-  template<typename _FwdIter, typename _TraitsT>
+  template<typename _TraitsT, typename _FwdIter>
     inline __enable_if_contiguous_normal_iter<_FwdIter, _TraitsT>
     __compile_nfa(_FwdIter __first, _FwdIter __last,
                  const typename _TraitsT::locale_type& __loc,
@@ -203,15 +203,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return _Cmplr(__cfirst, __cfirst + __len, __loc, __flags)._M_get_nfa();
     }
 
-  template<typename _FwdIter, typename _TraitsT>
+  template<typename _TraitsT, typename _FwdIter>
     inline __disable_if_contiguous_normal_iter<_FwdIter, _TraitsT>
     __compile_nfa(_FwdIter __first, _FwdIter __last,
                  const typename _TraitsT::locale_type& __loc,
                  regex_constants::syntax_option_type __flags)
     {
-      basic_string<typename _TraitsT::char_type> __str(__first, __last);
-      return __compile_nfa(__str.data(), __str.data() + __str.size(), __loc,
-          __flags);
+      const basic_string<typename _TraitsT::char_type> __str(__first, __last);
+      return __compile_nfa<_TraitsT>(__str.data(), __str.data() + __str.size(),
+                                    __loc, __flags);
     }
 
   // [28.13.14]

diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc
new file mode 100644 (file)
index 0000000..7776c5f
--- /dev/null
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/iter.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2017 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/>.
+
+// { dg-do compile { target c++11 } }
+
+#include <regex>
+#include <testsuite_iterators.h>
+
+void
+test01()
+{
+  char s[] = "";
+  __gnu_test::test_container<char, __gnu_test::forward_iterator_wrapper> c(s);
+  std::regex r1(c.begin(), c.end());
+  std::regex r2(c.begin(), c.end(), std::regex_constants::grep);
+}