From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 08C833858C78 for ; Fri, 14 Apr 2023 19:45:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 08C833858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681501521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6sNmFa1CMtzNzXpfQcPgzxqEnVQMhlwVE0nMfD67Luc=; b=ZaLcc95O+xIjUCXToHVMVYohHiKDJl/xs0BEGX+7dalDLXCrEWNvIhVfCqZxVlM0EQ4Q13 iLXB5z7bSfjJPC3/TWE5ggK4vN7UTmLtvsdnJCMCiOjYIWLwgWtSJVLYHHHMtY/NQEb7C6 BIX0EE9rrr6dhcIoiXvLaEou90iFv2A= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-166-BXCctQU3NMe5o-AMC_O4DA-1; Fri, 14 Apr 2023 15:45:20 -0400 X-MC-Unique: BXCctQU3NMe5o-AMC_O4DA-1 Received: by mail-qv1-f71.google.com with SMTP id o14-20020a0cc38e000000b005e62747d93aso11870671qvi.11 for ; Fri, 14 Apr 2023 12:45:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681501519; x=1684093519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6sNmFa1CMtzNzXpfQcPgzxqEnVQMhlwVE0nMfD67Luc=; b=bHWG25IDW2dhBfuFlIfTTVJhxe9ZYHhZbT9LVKUs7XV1Yw1r8SHkxgWkUuOAHWBBWB h6IyQojWUnGR+34iN/q6T+Dq1TfH17AkWqR6XuXfFrGR1RwsoZy02iwB07oFJYFYWmgT fsED4BlDcbh6YLELLNhrhQcIzmMMTUTWpGtbFDcf4lzyOnSb/iDs5x4Tnef5GgciDvDo zmkuasnH/FumS6fkuPoehX/W8GukiprLyaDsBPum+BPthmgvKrAA4XtZzOYvJ1H0vGwy AbsZO0O/9INny0bKucMeBfZkfwgP9voqOzR9ieJE///O1PPjnnGiXWHAKRhkTIJLR/N4 RhKQ== X-Gm-Message-State: AAQBX9c/u0zKxkTL/5FynE+eNXWJmsw0VJhr/wg3MD+AYD3jv4mfF9gW 11TlqV8bk9Ru82p9e2BXDxFBJx7qa/ijovkqU9L8vbT5qAylEGSCXcMHz8uAuNxPFeGx0hX0nha lC/twDX2i0XuIDC7Ykp0aS5w= X-Received: by 2002:a05:6214:5282:b0:5ef:512d:2d47 with SMTP id kj2-20020a056214528200b005ef512d2d47mr4690903qvb.19.1681501519114; Fri, 14 Apr 2023 12:45:19 -0700 (PDT) X-Google-Smtp-Source: AKy350ZZ5dPtQcthS7CS6ZUATLzRot5Vby975RCaExuDG8/xSuHCuye2/qVMXt4wkZ0TSjZ4d0F/7A== X-Received: by 2002:a05:6214:5282:b0:5ef:512d:2d47 with SMTP id kj2-20020a056214528200b005ef512d2d47mr4690883qvb.19.1681501518862; Fri, 14 Apr 2023 12:45:18 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id pr27-20020a056214141b00b005dd8b9345f8sm1291814qvb.144.2023.04.14.12.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:45:18 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 2/2] libstdc++: Implement range_adaptor_closure from P2387R3 [PR108827] Date: Fri, 14 Apr 2023 15:45:12 -0400 Message-ID: <20230414194512.2569383-2-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.335.g9857273be0 In-Reply-To: <20230414194512.2569383-1-ppalka@redhat.com> References: <20230414194512.2569383-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested on x86_64-pc-linux-gnu, does this look OK for trunk? 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. --- libstdc++-v3/include/bits/ranges_cmp.h | 4 ++ libstdc++-v3/include/std/ranges | 8 ++++ libstdc++-v3/include/std/version | 3 ++ .../std/ranges/range_adaptor_closure.cc | 42 +++++++++++++++++++ .../testsuite/std/ranges/version_c++23.cc | 2 +- 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc 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 531ec6f68b3..bf3c246f95d 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1137,6 +1137,14 @@ namespace views::__adaptor }; } // namespace views::__adaptor +#if __cplusplus > 20202L + template + requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> + class range_adaptor_closure + : public views::__adaptor::_RangeAdaptorClosure<_Derived> + { }; +#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 9f31f25f1e9..ad928a225ef 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..c642712ed9e --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/range_adaptor_closure.cc @@ -0,0 +1,42 @@ +// { 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)) ); + 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 ); + + 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 e2c14edc8ef..90cfceb626c 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 -- 2.40.0.335.g9857273be0