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 67BD63858C52 for ; Fri, 15 Sep 2023 09:26:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67BD63858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694770011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWmmVMIN67SLZpEgxDYQ4zfR2W5/aMH2eH4PVgtoo9o=; b=KX9lJgOL6hIph4LLyEGgjZLqJzJRtvDwWbn+xKgOt+wwxqBXYBcVKXQ3jGCFDdzeHyTted GUbytfCWpji+YTNfFf8IzAkq9bqqUcHeROgqUvSy8UCDpprXNy5vEZXRVbq0UQaslT4D3x PBlNji17u+qDJJmPvBRrJn2qqxVYJrk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-684-BKzdjTlpNzGQTDzad1GJ2w-1; Fri, 15 Sep 2023 05:26:48 -0400 X-MC-Unique: BKzdjTlpNzGQTDzad1GJ2w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E590C101A550; Fri, 15 Sep 2023 09:26:47 +0000 (UTC) Received: from localhost (unknown [10.42.28.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A802D1C554; Fri, 15 Sep 2023 09:26:47 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add operator bool to result types (P2497R0) Date: Fri, 15 Sep 2023 10:24:41 +0100 Message-ID: <20230915092647.2192116-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 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,URIBL_BLACK autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux. Pushed to trunk. This was supposed to be in C++23, but I messed up the polls at the last meeting for C++23 ballot resolution. I've heard suggestions that we should just backport it to C++23 as a nice quality of life improvement, but I've also heard objections to any such feature backports (they hurt portability between compilers). This just adds it for C++26. -- >8 -- C++26 adds these convenience conversions. libstdc++-v3/ChangeLog: * include/bits/version.def (to_chars): Define new value for C++26. * include/bits/version.h: Regenerate. * include/std/charconv (to_chars_result::operator bool): New function. (from_chars_result::operator bool): New function. * testsuite/20_util/to_chars/version.cc: Update expected value. * testsuite/20_util/from_chars/result.cc: New test. * testsuite/20_util/to_chars/result.cc: New test. --- libstdc++-v3/include/bits/version.def | 7 + libstdc++-v3/include/bits/version.h | 299 +++++++++--------- libstdc++-v3/include/std/charconv | 6 + .../testsuite/20_util/from_chars/result.cc | 21 ++ .../testsuite/20_util/to_chars/result.cc | 25 ++ .../testsuite/20_util/to_chars/version.cc | 2 +- 6 files changed, 212 insertions(+), 148 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/from_chars/result.cc create mode 100644 libstdc++-v3/testsuite/20_util/to_chars/result.cc diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def index 8d9b2f71a2e..b7d17c91c34 100644 --- a/libstdc++-v3/include/bits/version.def +++ b/libstdc++-v3/include/bits/version.def @@ -255,6 +255,13 @@ ftms = { ftms = { name = to_chars; + values = { + v = 202306; + cxxmin = 26; + extra_cond = "_GLIBCXX_FLOAT_IS_IEEE_BINARY32 " + "&& _GLIBCXX_DOUBLE_IS_IEEE_BINARY64 " + "&& __SIZE_WIDTH__ >= 32"; + }; values = { v = 201611; cxxmin = 14; diff --git a/libstdc++-v3/include/std/charconv b/libstdc++-v3/include/std/charconv index 01711d38576..7edb6ade3d4 100644 --- a/libstdc++-v3/include/std/charconv +++ b/libstdc++-v3/include/std/charconv @@ -62,6 +62,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus > 201703L && __cpp_impl_three_way_comparison >= 201907L friend bool operator==(const to_chars_result&, const to_chars_result&) = default; +#endif +#if __cplusplus > 202302L + constexpr explicit operator bool() const noexcept { return ec == errc{}; } #endif }; @@ -74,6 +77,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus > 201703L && __cpp_impl_three_way_comparison >= 201907L friend bool operator==(const from_chars_result&, const from_chars_result&) = default; +#endif +#if __cplusplus > 202302L + constexpr explicit operator bool() const noexcept { return ec == errc{}; } #endif }; diff --git a/libstdc++-v3/testsuite/20_util/from_chars/result.cc b/libstdc++-v3/testsuite/20_util/from_chars/result.cc new file mode 100644 index 00000000000..637678ac532 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/from_chars/result.cc @@ -0,0 +1,21 @@ +// { dg-do run { target c++26 } } + +#include +#include + +void +test_result() +{ + static_assert( ! std::is_convertible_v ); + static_assert( std::is_constructible_v ); + + std::from_chars_result res{}; + VERIFY( res ); + res.ec = std::errc::invalid_argument; + VERIFY( !res ); +} + +int main() +{ + test_result(); +} diff --git a/libstdc++-v3/testsuite/20_util/to_chars/result.cc b/libstdc++-v3/testsuite/20_util/to_chars/result.cc new file mode 100644 index 00000000000..5284680460a --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/to_chars/result.cc @@ -0,0 +1,25 @@ +// { dg-do run { target c++26 } } + +#include +#include + +#if defined(__cpp_lib_to_chars) && __cpp_lib_to_chars < 202306L +# error "Feature-test macro for std::to_chars has wrong value in " +#endif + +void +test_result() +{ + static_assert( ! std::is_convertible_v ); + static_assert( std::is_constructible_v ); + + std::to_chars_result res{}; + VERIFY( res ); + res.ec = std::errc::invalid_argument; + VERIFY( !res ); +} + +int main() +{ + test_result(); +} diff --git a/libstdc++-v3/testsuite/20_util/to_chars/version.cc b/libstdc++-v3/testsuite/20_util/to_chars/version.cc index 2789afa28ef..f7866ec5377 100644 --- a/libstdc++-v3/testsuite/20_util/to_chars/version.cc +++ b/libstdc++-v3/testsuite/20_util/to_chars/version.cc @@ -6,7 +6,7 @@ #ifndef __cpp_lib_to_chars # error "Feature-test macro for to_chars missing in " -#elif __cpp_lib_to_chars != 201611L +#elif __cpp_lib_to_chars != (__cplusplus == 202302L ? 201611L : 202306L) # error "Feature-test macro for to_chars has wrong value in " #endif -- 2.41.0