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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id E52343858436 for ; Thu, 21 Oct 2021 15:18:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E52343858436 Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-89-F9w5dyfNNziWFSqevY72eg-1; Thu, 21 Oct 2021 11:18:32 -0400 X-MC-Unique: F9w5dyfNNziWFSqevY72eg-1 Received: by mail-ua1-f69.google.com with SMTP id o12-20020ab0150c000000b002cb5393147dso398857uae.9 for ; Thu, 21 Oct 2021 08:18:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/MK47GjJKicm+Y3391Sl9MskHSKnCHqIveip1McV83o=; b=fsRXbloJ9v6xV9OR0ZLs4Wg8UXDc011Z3oTElyMS4W7N8614axk0VqOMEYdSI2CPqN INnoYGMiX4w9sBY4PnwNasklKW/w/avSqkyZO1iYA9QP2YhKSV3zZc7YuGCv7+xP9Jiv c2SX+70gPgc/dldM6C+e1MmfRkc5N3Z1jd9eYwsL3wmDg9QEaQ5psKqWq6HGBU7GEpyN NYZf5TKU+OMYGOL1cYhJx0NNFmP0dNDlbdohi/PFI/B7nRwFkDrLiI/2cOMrCt59rOK9 IC7NljJnpjbDKgNPDOxAKB041Fy1fyh1vSK9M/unQvPOeIsPiODC+z7YETLbIgUc7qn3 2B/g== X-Gm-Message-State: AOAM531YGQWkVJPK/KIkEym5vopb2cSBugXzOQka+pzQpksQ4wdsfp1Z DMZPeFaxhDfRdUqfo04nWlIh1TUXkdZJO3DXk469UzzAxgWeTKHRXg5RovXBRKlQQ7pBozAbgVp uF69+Ed2BNsg2/gciVUOXsLhle7zPVH8= X-Received: by 2002:a67:d89b:: with SMTP id f27mr7197812vsj.16.1634829511628; Thu, 21 Oct 2021 08:18:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyluoSastGlhfH+lRiXgWlV9qBIcz8yk25k0t/tm2Oiy/cyW8Q8Z6HEI9aS7qs954aJM9QyaG7f4qZmL48tj1o= X-Received: by 2002:a67:d89b:: with SMTP id f27mr7197786vsj.16.1634829511395; Thu, 21 Oct 2021 08:18:31 -0700 (PDT) MIME-Version: 1.0 References: <20211021143728.2107631-1-ppalka@redhat.com> In-Reply-To: <20211021143728.2107631-1-ppalka@redhat.com> From: Jonathan Wakely Date: Thu, 21 Oct 2021 16:18:20 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Implement P2432R1 changes for views::istream To: Patrick Palka Cc: gcc Patches , "libstdc++" X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2021 15:18:36 -0000 On Thu, 21 Oct 2021 at 15:41, Patrick Palka via Libstdc++ < libstdc++@gcc.gnu.org> wrote: > Tested on x86_64-pc-linux-gnu, does this look OK for trunk/11/10? > Yes for trunk. I'm undecided whether we want to make this breaking change on the branches. > libstdc++-v3/ChangeLog: > > * include/std/ranges (istream_view): Replace this function > template with an alias template as per P2432R1. > (wistream_view): Define as per P2432R1. > (views::_Istream, views::istream): Likewise. > * testsuite/std/ranges/istream_view.cc (test07): New test. > --- > libstdc++-v3/include/std/ranges | 25 ++++++++++++++++--- > .../testsuite/std/ranges/istream_view.cc | 13 ++++++++++ > 2 files changed, 34 insertions(+), 4 deletions(-) > > diff --git a/libstdc++-v3/include/std/ranges > b/libstdc++-v3/include/std/ranges > index 30ba0606869..7aa0f9dfc67 100644 > --- a/libstdc++-v3/include/std/ranges > +++ b/libstdc++-v3/include/std/ranges > @@ -781,10 +781,27 @@ namespace views > friend _Iterator; > }; > > - template > - basic_istream_view<_Val, _CharT, _Traits> > - istream_view(basic_istream<_CharT, _Traits>& __s) > - { return basic_istream_view<_Val, _CharT, _Traits>{__s}; } > + template > + using istream_view = basic_istream_view<_Val, char>; > + > + template > + using wistream_view = basic_istream_view<_Val, wchar_t>; > + > +namespace views > +{ > + template > + struct _Istream > + { > + template > + [[nodiscard]] > + constexpr auto > + operator()(basic_istream<_CharT, _TraitsT>& __e) const > + { return basic_istream_view<_Tp, _CharT, _TraitsT>(__e); } > + }; > + > + template > + inline constexpr _Istream<_Tp> istream; > +} > > // C++20 24.7 [range.adaptors] Range adaptors > > diff --git a/libstdc++-v3/testsuite/std/ranges/istream_view.cc > b/libstdc++-v3/testsuite/std/ranges/istream_view.cc > index f5c0c2a6bb0..ea7c5a35ef7 100644 > --- a/libstdc++-v3/testsuite/std/ranges/istream_view.cc > +++ b/libstdc++-v3/testsuite/std/ranges/istream_view.cc > @@ -103,6 +103,18 @@ test06() > static_assert( std::is_same_v ); > } > > +void > +test07() > +{ > + // P2432R1, views::istream > + auto nums = std::istringstream("0 1 2 3 4"); > + ranges::istream_view v(nums); > + int sum = 0; > + for (int val : views::istream(nums)) > + sum += val; > + VERIFY( sum == 10 ); > +} > + > int > main() > { > @@ -112,4 +124,5 @@ main() > test04(); > test05(); > test06(); > + test07(); > } > -- > 2.33.1.711.g9d530dc002 > >