From patchwork Thu Nov 30 19:22:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 81052 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 168DC385DC33 for ; Thu, 30 Nov 2023 19:23:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 66FB83858C62 for ; Thu, 30 Nov 2023 19:23:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66FB83858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 66FB83858C62 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701372186; cv=none; b=v47f7gC9OtLy1Mh/0rOK4iOw9mQLOFt5aGyUoDeHnOovgp5WbiaSjbd0R++TrdZwQY1KTMNmP+rsxjEH+aBCBitn6KOunDi6XTpFcQ33ozKi6P86zGbzvuU8toxIcgaqyq85nF6SPOsbEKs3NB4mva2Vs4jXBGh+edeF19CVd0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701372186; c=relaxed/simple; bh=zkbED0dPEgz+OcRyNrYpjpBbeaPkb78PRHstoESoACQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=lWPzF7dybVrKdIMs7uXW4sz2hD+ZOULTdtMgxHOqw7Cnp59QSKwGsQP2yb/CC/4K8ZHfjPUbTbMizujiZFBURIpOQs/8438OzArGuP9zKsPYG1DqXSeMoLF25ExvB0QZzIkUZdoxN0DxlP5gHXgt94c7UsEnUnesvEiHFNDbRds= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701372185; 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; bh=f+Kk/wXxkdVee8PBnHFLj51Sateir7kqG+xhwakq0P8=; b=K3MlEOOgogl19wtDLXjISLYfG/HSp/hwzdBus/LbwEjOvrqqlQIuuFZYPTDLGmbCaCPukR LiKUfGGEpSEcMCGBgVtNb9h7HIhFIJubDMYLLkISclYjziWRtxocfgrFqYTj05yLAqxvez G8cAlCvN25Jh0yIUAS5RWawAninIKrY= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-1kzW-OkoMYm7YGgK5xdy1w-1; Thu, 30 Nov 2023 14:23:04 -0500 X-MC-Unique: 1kzW-OkoMYm7YGgK5xdy1w-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-77dd463dfb0so170336085a.1 for ; Thu, 30 Nov 2023 11:23:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701372182; x=1701976982; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f+Kk/wXxkdVee8PBnHFLj51Sateir7kqG+xhwakq0P8=; b=iMCFhQV3mB5hVq5O1ulHD1lJzx7Y80EopErBhU8IE4LKH0rCzmuZJhDgzFC273FUgN Hc7PiNsddtotC+Wa+nKcDX2Qy0EW/TsVPBBbyrRV9dGn0jptZ1sSaFziipIfrxsww6o/ /E2cvoB033NqZv7P8Pus3oUjgKEW5ZQ+vmzzUdDR7ADxTRmpubjT8R+x2TfXvWOwb6SH RByIEReGYTVHzRZ8udUjw6Y79ZWWoNwGn0ilMxdnGNGa7ptK8rwpJYdb+M+Q4LpRiJ70 MYLuXADoplv4fv1fc1AzPw65pPJ4I5dwcgI8hXIveipiVpYy705n/Yq4v80O59VEg/Ar qcTw== X-Gm-Message-State: AOJu0Yz40vrot/1OFtdfu40d84N3C40Bqma75pyXwv9PhiZI5yhz+hEq 2tEvVKYbKKLGiHVtgsXofkOISekkXV3NDdSjQjft8+YwWsPipqmq8cbqsl5QUS/Vgr4kekScpYD k6LHSWvEzTk9nZDUkSKdg+D44iUVlBczU/PqNc8kyDPsOV7//4TyvOTZ/oEiX2AVGmblUhXCKnG I= X-Received: by 2002:a05:620a:1b84:b0:767:e993:5702 with SMTP id dv4-20020a05620a1b8400b00767e9935702mr26797732qkb.35.1701372181889; Thu, 30 Nov 2023 11:23:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEcVRHeLVfGL9WK4PChjmnp3OKsgnzcNsHuT8yq0I0UWQfd0ZCWRivaoKDs2/c+fGxlbDylA== X-Received: by 2002:a05:620a:1b84:b0:767:e993:5702 with SMTP id dv4-20020a05620a1b8400b00767e9935702mr26797705qkb.35.1701372181434; Thu, 30 Nov 2023 11:23:01 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id qz19-20020a05620a8c1300b0077d6875cb3esm752096qkn.114.2023.11.30.11.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:23:01 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Simplify ranges::to closure objects Date: Thu, 30 Nov 2023 14:22:52 -0500 Message-ID: <20231130192252.3123291-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.rc1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.6 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_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- Use the existing _Partial range adaptor closure object in the definition of ranges::to instead of essentially open coding it. libstdc++-v3/ChangeLog: * include/std/ranges (__detail::_ToClosure): Replace with ... (__detail::_To): ... this. (__detail::_ToClosure2): Replace with ... (__detail::To2): ... this. (to): Simplify using the existing _Partial range adaptor closure object. --- libstdc++-v3/include/std/ranges | 140 ++++++++------------------------ 1 file changed, 32 insertions(+), 108 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 9d4c2e01c4d..33e576e563a 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1007,6 +1007,7 @@ namespace views::__adaptor // Invoke _Adaptor with arguments __r, _M_args... according to the // value category of this _Partial object. + // TODO: use explicit object functions ("deducing this"). template requires __adaptor_invocable<_Adaptor, _Range, const _Args&...> constexpr auto @@ -1137,6 +1138,7 @@ namespace views::__adaptor // Invoke _M_rhs(_M_lhs(__r)) according to the value category of this // range adaptor closure object. + // TODO: use explicit object functions ("deducing this"). template requires __pipe_invocable constexpr auto @@ -9391,59 +9393,16 @@ namespace __detail /// @cond undocumented namespace __detail { - template - class _ToClosure - : public views::__adaptor::_RangeAdaptorClosure<_ToClosure<_Cont, _Args...>> + template + struct _To { - tuple...> _M_bound_args; - - public: - constexpr - _ToClosure(_Args&&... __args) - : _M_bound_args(std::forward<_Args>(__args)...) - { } - - // TODO: use explicit object functions ("deducing this"). - - template - constexpr auto - operator()(_Rg&& __r) & - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, _M_bound_args); - } - - template - constexpr auto - operator()(_Rg&& __r) const & - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, _M_bound_args); - } - - template - constexpr auto - operator()(_Rg&& __r) && - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, std::move(_M_bound_args)); - } - - template - constexpr auto - operator()(_Rg&& __r) const && - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, std::move(_M_bound_args)); - } + template + constexpr auto + operator()(_Range&& __r, _Args&&... __args) const + { + return ranges::to<_Cont>(std::forward<_Range>(__r), + std::forward<_Args>(__args)...); + } }; } // namespace __detail /// @endcond @@ -9465,66 +9424,27 @@ namespace __detail */ template requires (!view<_Cont>) - constexpr __detail::_ToClosure<_Cont, _Args...> + constexpr auto to [[nodiscard]] (_Args&&... __args) - { return {std::forward<_Args>(__args)...}; } + { + using __detail::_To; + using views::__adaptor::_Partial; + return _Partial<_To<_Cont>, decay_t<_Args>...>{std::forward<_Args>(__args)...}; + } /// @cond undocumented namespace __detail { - template typename _Cont, typename... _Args> - class _ToClosure2 - : public views::__adaptor::_RangeAdaptorClosure<_ToClosure2<_Cont, _Args...>> + template typename _Cont> + struct _To2 { - tuple...> _M_bound_args; - - public: - constexpr - _ToClosure2(_Args&&... __args) - : _M_bound_args(std::forward<_Args>(__args)...) - { } - - // TODO: use explicit object functions ("deducing this"). - - template - constexpr auto - operator()(_Rg&& __r) & - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, _M_bound_args); - } - - template - constexpr auto - operator()(_Rg&& __r) const & - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, _M_bound_args); - } - - template - constexpr auto - operator()(_Rg&& __r) && - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, std::move(_M_bound_args)); - } - - template - constexpr auto - operator()(_Rg&& __r) const && - { - return std::apply([&__r](_Tp&&... __args) { - return ranges::to<_Cont>(std::forward<_Rg>(__r), - std::forward<_Tp>(__args)...); - }, std::move(_M_bound_args)); - } + template + constexpr auto + operator()(_Range&& __r, _Args&&... __args) const + { + return ranges::to<_Cont>(std::forward<_Range>(__r), + std::forward<_Args>(__args)...); + } }; } // namespace __detail /// @endcond @@ -9547,9 +9467,13 @@ namespace __detail * `r | std::ranges::to(an_allocator)`. */ template typename _Cont, typename... _Args> - constexpr __detail::_ToClosure2<_Cont, _Args...> + constexpr auto to [[nodiscard]] (_Args&&... __args) - { return {std::forward<_Args>(__args)...}; } + { + using __detail::_To2; + using views::__adaptor::_Partial; + return _Partial<_To2<_Cont>, decay_t<_Args>...>{std::forward<_Args>(__args)...}; + } } // namespace ranges #endif // __cpp_lib_ranges_to_container