From patchwork Tue Oct 19 12:17:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 46389 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 17A1C3858015 for ; Tue, 19 Oct 2021 12:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17A1C3858015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634645929; bh=pGNZruHjZDTHcXIhEnuRafCfRII7W0us/GpWNUzfRdI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=ge7fUEMYAv+DMKJjbopZTmc+jQhKijrltyDS75okChMrdoV/M0OBUz3TQ8hsigbhi ZckhCjjo0YWHk8iZG+OpuI3nQynHWhpj+lv72YEPThsQxySAFtjEv5DDW+XsDZjp62 wNLZONpxHXv/CXZ+bCzLKDVPmm4h3wusSRisT3iQ= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 3A99B3858D3C for ; Tue, 19 Oct 2021 12:17:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3A99B3858D3C Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-ySRO28kWNHSexTAtrlefoA-1; Tue, 19 Oct 2021 08:17:47 -0400 X-MC-Unique: ySRO28kWNHSexTAtrlefoA-1 Received: by mail-qt1-f200.google.com with SMTP id f7-20020a05622a104700b002a7bc1702d3so4745092qte.20 for ; Tue, 19 Oct 2021 05:17:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pGNZruHjZDTHcXIhEnuRafCfRII7W0us/GpWNUzfRdI=; b=cS+IX7fKH4ZDYXUWFGM4J4Bb4KWrRKWRepGEMaTqYCzu0EVYvHIA27IJQ9rB+/iXmu rxK+Eu2ufIKEtrndAqpac0+cW5xUHwh3ggFAUrAwjgudIie1qF8HiwSfNqLvuMh1wSi5 BTeEzA0AtAD5FeGMBYiGL+W+XPs561nMjK1kjqcS9TtVcIU8CFmtaOxe5P3qSHys27hz jnHmVWl0F344IzKETHhXd4IMjBhbQPA25Cr/OrMnNKmwbY2cr6grmUnNhrLUMPq8yyM5 PVYUOo5IuKLK9BD/1waltPQBnWvXDoTtgH3Gt7akZOlbB+C0fXpstcb9iM4bbVF5OsPP Av+Q== X-Gm-Message-State: AOAM532HaEDrUiDwNNkYgCL99GJsQERO6O8Tk0BYcPAfX4wYBshORcS7 Sa/naCmZGjKBE69QoJuoQirrsgmKayZRYb6+8aQYBLBykIKT0f2w/fDTc9vzG3rLH3j7xQIysWg 1eINRLXlDbJ7qYt10kGn/TOc19y6YqauBj/7+3WV4ZUD/zp/emM/SHX2oR9eOvjY1UNA= X-Received: by 2002:ac8:11:: with SMTP id a17mr35305298qtg.276.1634645866230; Tue, 19 Oct 2021 05:17:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKcNPS1GIZ3Y7mszvK48Oo2vdGOuSWClM+bsQzPfzTOkazzlOrMSHEb1Fwpj180RgcpC5ztw== X-Received: by 2002:ac8:11:: with SMTP id a17mr35305259qtg.276.1634645865839; Tue, 19 Oct 2021 05:17:45 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id t190sm7977867qkb.1.2021.10.19.05.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 05:17:45 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] libstdc++: Implement LWG 3523 changes to ranges::iota_view Date: Tue, 19 Oct 2021 08:17:03 -0400 Message-Id: <20211019121704.1510908-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.637.gf443b226ca MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.1 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" libstdc++-v3/ChangeLog: * include/std/ranges (iota_view::_Iterator): Befriend iota_view. (iota_view::_Sentinel): Likewise. (iota_view::iota_view): Add three overloads each taking an iterator/sentinel pair as per LWG 3523. * testsuite/std/ranges/iota/iota_view.cc (test06): New test. --- libstdc++-v3/include/std/ranges | 21 +++++++++++++++++++ .../testsuite/std/ranges/iota/iota_view.cc | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index b8de400dfbb..85f232d8fb9 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -532,6 +532,7 @@ namespace ranges private: _Winc _M_value = _Winc(); + friend iota_view; friend _Sentinel; }; @@ -568,6 +569,8 @@ namespace ranges operator-(const _Sentinel& __x, const _Iterator& __y) requires sized_sentinel_for<_Bound, _Winc> { return __x._M_distance_from(__y); } + + friend iota_view; }; _Winc _M_value = _Winc(); @@ -590,6 +593,24 @@ namespace ranges __glibcxx_assert( bool(__value <= __bound) ); } + constexpr + iota_view(_Iterator __first, _Iterator __last) + requires same_as<_Winc, _Bound> + : iota_view(__first._M_value, __last._M_value) + { } + + constexpr + iota_view(_Iterator __first, unreachable_sentinel_t __last) + requires same_as<_Bound, unreachable_sentinel_t> + : iota_view(__first._M_value, __last) + { } + + constexpr + iota_view(_Iterator __first, _Sentinel __last) + requires (!same_as<_Winc, _Bound>) && (!same_as<_Bound, unreachable_sentinel_t>) + : iota_view(__first._M_value, __last._M_bound) + { } + constexpr _Iterator begin() const { return _Iterator{_M_value}; } diff --git a/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc b/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc index 362ef1f7f78..5bebe4be693 100644 --- a/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc +++ b/libstdc++-v3/testsuite/std/ranges/iota/iota_view.cc @@ -18,6 +18,7 @@ // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } +#include #include #include @@ -90,6 +91,25 @@ test05() VERIFY( r.begin() - r.end() == -3 ); } +void +test06() +{ + // Verify LWG 3523 changes. + auto v1 = std::views::iota(0, 5); + auto w1 = decltype(v1)(v1.begin(), v1.end()); + VERIFY( std::ranges::equal(v1, w1) ); + + auto v2 = std::views::iota(0); + auto w2 = decltype(v2)(v2.begin(), v2.end()); + static_assert(std::same_as); + VERIFY( *w2.begin() == 0 ); + + auto v3 = std::views::iota(0, 5l); + auto w3 = decltype(v3)(v3.begin(), v3.end()); + static_assert(!std::ranges::common_range); + VERIFY( std::ranges::equal(v3, w3) ); +} + int main() { @@ -98,4 +118,5 @@ main() test03(); test04(); test05(); + test06(); }