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 879A33858C3A for ; Wed, 20 Oct 2021 18:17:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 879A33858C3A Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-pPvs7pHLM5iZw92Qyz0yPA-1; Wed, 20 Oct 2021 14:17:30 -0400 X-MC-Unique: pPvs7pHLM5iZw92Qyz0yPA-1 Received: by mail-qk1-f198.google.com with SMTP id s18-20020a05620a255200b00433885d4fa7so2816912qko.4 for ; Wed, 20 Oct 2021 11:17:29 -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=klsBwvsAHvd60euBHokxECXpLWl3vgMFfA6NtXM8W7E=; b=ipIC5Kt3SJesEqkEaQGjTSiFHtiq8hNtPVa6JjP34sz8H31ws99GOB/EIV0AEIfuMu MVsfM3pXNzA5TUgQJMqVxHuWFFpY0acXCZjCK+VJTEBHY4ePwSBWbitGkiMf0EEhWfCW HAOrVLsgy+jo/lW2067KA+Use4TCQtJAp2T/HKnPrMg43RxofHHRAZhUJxXfH34h2XG/ jzIIXyW3E5vM/o1j6BgWviMFLcX5CPQjtzFk3U0X6lFmz0X+XUomsZgLOkmbScVvQrp/ /RynilGkzJsQNvCD/jIw/MVFDBRmlj9Jrs3nsKv8eWJhCZ3fqqVwO+LtYr6SSx/nKyb4 H4Pw== X-Gm-Message-State: AOAM532wxlsjiE7CDuQvukjuym1cTpJr6sZKZYwx8+u6FB4FcTJSMqTx 1SMKtST1nKM1w1sUK7KcmxxezwWVk1AeIQvQrhVttAvPESO/duzFLc3UrpMSkhts9zNIXSAzLD9 E0deiXPnT1o0uq2U= X-Received: by 2002:a37:c44:: with SMTP id 65mr645451qkm.278.1634753849495; Wed, 20 Oct 2021 11:17:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsZzLDoXclQ3GejTzEbqdj0f396QBkbp17aNtgTSUn8CJVhnolgRpKJ+mZaUYtKFxYt8MT2w== X-Received: by 2002:a37:c44:: with SMTP id 65mr645420qkm.278.1634753849139; Wed, 20 Oct 2021 11:17:29 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id bm16sm1371967qkb.86.2021.10.20.11.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 11:17:28 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view Date: Wed, 20 Oct 2021 14:17:22 -0400 Message-Id: <20211020181722.1862070-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 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-Spam-Status: No, score=-15.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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: Wed, 20 Oct 2021 18:17:32 -0000 Tested on x86_64-pc-linux-gnu, does this look OK for trunk, and 11 after a while? libstdc++-v3/ChangeLog: * include/std/ranges (lazy_split_view::base): Add forward_range constraint as per LWG 3591. (lazy_split_view::begin, lazy_split_view::end): Also check simpleness of _Pattern as per LWG 3592. (split_view::base): Relax copyable constraint as per LWG 3590. --- libstdc++-v3/include/std/ranges | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c1519c7dbd5..30ba0606869 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3137,7 +3137,7 @@ namespace views::__adaptor { return _M_i_current(); } constexpr iterator_t<_Base> - base() && + base() && requires forward_range<_Vp> { return std::move(_M_i_current()); } constexpr decltype(auto) @@ -3229,8 +3229,11 @@ namespace views::__adaptor begin() { if constexpr (forward_range<_Vp>) - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::begin(_M_base)}; + { + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::begin(_M_base)}; + } else { _M_current = ranges::begin(_M_base); @@ -3247,8 +3250,9 @@ namespace views::__adaptor constexpr auto end() requires forward_range<_Vp> && common_range<_Vp> { - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::end(_M_base)}; + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::end(_M_base)}; } constexpr auto @@ -3339,7 +3343,7 @@ namespace views::__adaptor { } constexpr _Vp - base() const& requires copyable<_Vp> + base() const& requires copy_constructible<_Vp> { return _M_base; } constexpr _Vp -- 2.33.1.711.g9d530dc002