From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 064D7385840D; Tue, 18 Apr 2023 11:23:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 064D7385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681817018; bh=tbEgRM/xOIYZuAMQRjC8wc+fK20KxVdfUKsRhp8DCxo=; h=From:To:Subject:Date:From; b=TaKRR0e4lCX40HMIoxG9IuWCYMOB62E87srUeul7bZn6iJFQg4uDEKxXZ7zByP0wT Vq9WXjksYUyO7MMIc5SSaTIcNiNdjzpdtrvWY1pFvKcxwkhSynUQDGzRdwe0HIFXw5 2TPlRYynV0HyX0u086yLujq+2YvD2mKRrV6D1sKc= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-29] libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 95525c5b8c2d6317b693d441520b7bc808cf9ec7 X-Git-Newrev: cb5c71d16d0fb47638498365f5c857ce7c673eaf Message-Id: <20230418112338.064D7385840D@sourceware.org> Date: Tue, 18 Apr 2023 11:23:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cb5c71d16d0fb47638498365f5c857ce7c673eaf commit r14-29-gcb5c71d16d0fb47638498365f5c857ce7c673eaf Author: Patrick Palka Date: Tue Apr 18 07:21:13 2023 -0400 libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] PR libstdc++/108827 libstdc++-v3/ChangeLog: * include/bits/ranges_cmp.h (__cpp_lib_ranges): Bump value for C++23. * include/std/ranges (range_adaptor_closure): Define for C++23. * include/std/version (__cpp_lib_ranges): Bump value for C++23. * testsuite/std/ranges/version_c++23.cc: Bump expected value of __cpp_lib_ranges. * testsuite/std/ranges/range_adaptor_closure.cc: New test. Diff: --- libstdc++-v3/include/bits/ranges_cmp.h | 4 ++ libstdc++-v3/include/std/ranges | 8 ++++ libstdc++-v3/include/std/version | 3 ++ .../testsuite/std/ranges/range_adaptor_closure.cc | 46 ++++++++++++++++++++++ libstdc++-v3/testsuite/std/ranges/version_c++23.cc | 2 +- 5 files changed, 62 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/ranges_cmp.h b/libstdc++-v3/include/bits/ranges_cmp.h index 85c1a77ccf7..6710d829a37 100644 --- a/libstdc++-v3/include/bits/ranges_cmp.h +++ b/libstdc++-v3/include/bits/ranges_cmp.h @@ -57,7 +57,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef __cpp_lib_concepts // Define this here, included by all the headers that need to define it. +#if __cplusplus > 202002L +#define __cpp_lib_ranges 202202L +#else #define __cpp_lib_ranges 202110L +#endif namespace ranges { diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 1714f3fb16c..c4d4d85bf90 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1122,6 +1122,14 @@ namespace views::__adaptor }; } // namespace views::__adaptor +#if __cplusplus > 202002L + template + requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> + class range_adaptor_closure + : public views::__adaptor::_RangeAdaptorClosure + { }; +#endif + template requires is_object_v<_Range> class ref_view : public view_interface> { diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 027e5711ec5..02ead8f1443 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -265,8 +265,10 @@ #define __cpp_lib_interpolate 201902L #if __cpp_lib_concepts # define __cpp_lib_move_iterator_concept 202207L +#if __cplusplus <= 202002L // N.B. updated value in C++23 # define __cpp_lib_ranges 202110L #endif +#endif #define __cpp_lib_shift 201806L #if _GLIBCXX_HOSTED @@ -330,6 +332,7 @@ #define __cpp_lib_reference_from_temporary 202202L #define __cpp_lib_to_underlying 202102L #define __cpp_lib_unreachable 202202L +#define __cpp_lib_ranges 202202L #define __cpp_lib_ranges_zip 202110L #define __cpp_lib_ranges_chunk 202202L #define __cpp_lib_ranges_slide 202202L diff --git a/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc new file mode 100644 index 00000000000..6221f071331 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc @@ -0,0 +1,46 @@ +// { dg-options "-std=gnu++23" } +// { dg-do run { target c++23 } } + +#include +#include +#include + +namespace ranges = std::ranges; +namespace views = std::views; + +struct _Negate : ranges::range_adaptor_closure<_Negate> +{ + template + constexpr auto + operator()(_Range&& __r) const + requires requires { views::transform(std::declval<_Range>(), std::negate{}); } + { return views::transform(std::forward<_Range>(__r), std::negate{}); } +}; + +constexpr _Negate negate; + +constexpr bool +test01() +{ + int x[] = {1, 2, 3}; + VERIFY( ranges::equal(x | negate, (int[]){-1, -2, -3}) ); + VERIFY( ranges::equal(x | negate | negate, x) ); + VERIFY( ranges::equal(x | (negate | negate), x) ); + VERIFY( ranges::equal(x | views::reverse | negate, x | negate | views::reverse) ); + VERIFY( ranges::equal(x | (views::reverse | negate), x | (negate | views::reverse)) ); +#if 0 + // These asserts currently fail for the same reason as the disabled asserts + // in std/ranges/adaptors/all.cc. + static_assert( sizeof(negate | views::reverse | views::join) == 1 ); + static_assert( sizeof(views::reverse | negate | views::join) == 1 ); + static_assert( sizeof(views::reverse | views::join | negate) == 1 ); +#endif + + return true; +} + +int +main() +{ + static_assert(test01()); +} diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc index 04609bb602c..e8342fa986a 100644 --- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc @@ -4,7 +4,7 @@ #include #if __STDC_HOSTED__ -# if __cpp_lib_ranges != 202110L +# if __cpp_lib_ranges != 202202L # error "Feature-test macro __cpp_lib_ranges has wrong value in " # endif #endif