From 21f7f9980c078080189ca78e4da56f0c26736946 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 25 Sep 2019 13:31:53 +0100 Subject: [PATCH] Implement LWG 3296 for basic_regex::assign * include/bits/regex.h (basic_regex::assign(const C*, size_t, flag_type)): Add default argument (LWG 3296). * testsuite/28_regex/basic_regex/assign/char/lwg3296.cc: New test. * testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc: New test. From-SVN: r276121 --- libstdc++-v3/ChangeLog | 8 +++++ libstdc++-v3/include/bits/regex.h | 4 ++- .../basic_regex/assign/char/lwg3296.cc | 36 +++++++++++++++++++ .../basic_regex/assign/wchar_t/lwg3296.cc | 36 +++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/lwg3296.cc create mode 100644 libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7daabe5b601..cd46ef31eab 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-09-25 Jonathan Wakely + + * include/bits/regex.h + (basic_regex::assign(const C*, size_t, flag_type)): Add default + argument (LWG 3296). + * testsuite/28_regex/basic_regex/assign/char/lwg3296.cc: New test. + * testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc: New test. + 2019-09-24 Jonathan Wakely * include/std/variant (variant::index()): Remove impossible case. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index b30b41a0759..7869c3fd1c1 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -628,8 +628,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 * expression pattern interpreted according to @p __flags. If * regex_error is thrown, *this remains unchanged. */ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3296. Inconsistent default argument for basic_regex<>::assign basic_regex& - assign(const _Ch_type* __p, std::size_t __len, flag_type __flags) + assign(const _Ch_type* __p, size_t __len, flag_type __flags = ECMAScript) { return this->assign(string_type(__p, __len), __flags); } /** diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/lwg3296.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/lwg3296.cc new file mode 100644 index 00000000000..29256bbbf03 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/lwg3296.cc @@ -0,0 +1,36 @@ +// Copyright (C) 2019 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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +void +test01() +{ + std::regex r("", std::regex_constants::grep); + r.assign("(.)[", 3); // LWG 3296 + VERIFY( r.flags() == std::regex_constants::ECMAScript ); + VERIFY( r.mark_count() == 1 ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc new file mode 100644 index 00000000000..302ebd6b4f9 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/lwg3296.cc @@ -0,0 +1,36 @@ +// Copyright (C) 2019 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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +void +test01() +{ + std::wregex r(L"", std::regex_constants::grep); + r.assign(L"(.)[", 3); // LWG 3296 + VERIFY( r.flags() == std::regex_constants::ECMAScript ); + VERIFY( r.mark_count() == 1 ); +} + +int +main() +{ + test01(); +} -- 2.30.2