On 07/06/17 16:45 +0100, Jonathan Wakely wrote:
Apparently std::basic_regex construction from forward iterators has never worked, because the call to __compile_nfa doesn't give the traits type. This reorders the template parameters so that only the traits type needs to be given explicitly, and the iterator type can be deduced.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. Tested powerpc64le-linux, committed to trunk. I'll commit a simpler change to the branches.
Here's the patch for the branches. This doesn't reorder the template parameters, just adds the missing template argument list to the call. Tested x86_64-linux, committed to gcc-7-branch, gcc-6-branch and gcc-5-branch.
commit 9181bcbd96c1efd5f9767104064f21f7a0c78457 Author: Jonathan Wakely <[email protected]> Date: Wed Jun 7 16:49:33 2017 +0100 PR libstdc++/81002 fix std::basic_regex range constructor PR libstdc++/81002 * include/bits/regex_compiler.h (__compile_nfa): Add template argument list to specify traits type. * testsuite/28_regex/basic_regex/ctors/basic/iter.cc: New. diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h index 49c0184..20f72fa 100644 --- a/libstdc++-v3/include/bits/regex_compiler.h +++ b/libstdc++-v3/include/bits/regex_compiler.h @@ -209,9 +209,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION 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); + using char_type = typename _TraitsT::char_type; + const basic_string<char_type> __str(__first, __last); + return __compile_nfa<const char_type*, _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 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); +}
