public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Patrick Palka <ppalka@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-6294] libstdc++: Simplify ranges::to closure objects
Date: Thu, 7 Dec 2023 21:36:53 +0000 (GMT) [thread overview]
Message-ID: <20231207213653.7B2613858D3C@sourceware.org> (raw)
https://gcc.gnu.org/g:0832cf42a6912f876086cb14b92f788d8406f393
commit r14-6294-g0832cf42a6912f876086cb14b92f788d8406f393
Author: Patrick Palka <ppalka@redhat.com>
Date: Thu Dec 7 16:36:23 2023 -0500
libstdc++: Simplify ranges::to closure objects
We can use the existing _Partial range adaptor closure object for
ranges::to instead of essentially reimplementing 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.
Diff:
---
libstdc++-v3/include/std/ranges | 128 ++++++++--------------------------------
1 file changed, 26 insertions(+), 102 deletions(-)
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index afd0a38e0cf..fb9df3d3e79 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<typename _Range>
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<typename _Range>
requires __pipe_invocable<const _Lhs&, const _Rhs&, _Range>
constexpr auto
@@ -9387,58 +9389,15 @@ namespace __detail
/// @cond undocumented
namespace __detail
{
- template<typename _Cont, typename... _Args>
- class _ToClosure
- : public views::__adaptor::_RangeAdaptorClosure<_ToClosure<_Cont, _Args...>>
+ template<typename _Cont>
+ struct _To
{
- tuple<decay_t<_Args>...> _M_bound_args;
-
- public:
- constexpr
- _ToClosure(_Args&&... __args)
- : _M_bound_args(std::forward<_Args>(__args)...)
- { }
-
- // TODO: use explicit object functions ("deducing this").
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) &
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, _M_bound_args);
- }
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) const &
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, _M_bound_args);
- }
-
- template<typename _Rg>
+ template<typename _Range, typename... _Args>
constexpr auto
- operator()(_Rg&& __r) &&
+ operator()(_Range&& __r, _Args&&... __args) const
{
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, std::move(_M_bound_args));
- }
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) const &&
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, std::move(_M_bound_args));
+ return ranges::to<_Cont>(std::forward<_Range>(__r),
+ std::forward<_Args>(__args)...);
}
};
} // namespace __detail
@@ -9461,65 +9420,26 @@ namespace __detail
*/
template<typename _Cont, typename... _Args>
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<template<typename...> typename _Cont, typename... _Args>
- class _ToClosure2
- : public views::__adaptor::_RangeAdaptorClosure<_ToClosure2<_Cont, _Args...>>
+ template<template<typename...> typename _Cont>
+ struct _To2
{
- tuple<decay_t<_Args>...> _M_bound_args;
-
- public:
- constexpr
- _ToClosure2(_Args&&... __args)
- : _M_bound_args(std::forward<_Args>(__args)...)
- { }
-
- // TODO: use explicit object functions ("deducing this").
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) &
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, _M_bound_args);
- }
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) const &
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, _M_bound_args);
- }
-
- template<typename _Rg>
- constexpr auto
- operator()(_Rg&& __r) &&
- {
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, std::move(_M_bound_args));
- }
-
- template<typename _Rg>
+ template<typename _Range, typename... _Args>
constexpr auto
- operator()(_Rg&& __r) const &&
+ operator()(_Range&& __r, _Args&&... __args) const
{
- return std::apply([&__r]<typename... _Tp>(_Tp&&... __args) {
- return ranges::to<_Cont>(std::forward<_Rg>(__r),
- std::forward<_Tp>(__args)...);
- }, std::move(_M_bound_args));
+ return ranges::to<_Cont>(std::forward<_Range>(__r),
+ std::forward<_Args>(__args)...);
}
};
} // namespace __detail
@@ -9543,9 +9463,13 @@ namespace __detail
* `r | std::ranges::to<std::vector>(an_allocator)`.
*/
template<template<typename...> 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
reply other threads:[~2023-12-07 21:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231207213653.7B2613858D3C@sourceware.org \
--to=ppalka@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
--cc=libstdc++-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).