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 9E0D43858C36 for ; Thu, 27 Jul 2023 15:03:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E0D43858C36 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=1690470236; 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=DED4KXRGZlIXVaajnzLSxtehS1I211CS79dQGg4duHg=; b=GmBCUNNj6c3wxeAP478ZJSsjzzKYU2DSf9SHnH33KS/CV9uMy+o2CZITwAU6MciV58AMpk 1iMSHDfnzMzqKtRzNaztcRuqtF8Vw8mbfGElcpFMGVxQGxiYPlU1+7LCRAVYcQnSKSYeJn 5cFRge6O/jiC1Osvm8sFpGJOY0nfQB8= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-378-5biQl7oLPTWtmcTJTZk1Ow-1; Thu, 27 Jul 2023 11:03:49 -0400 X-MC-Unique: 5biQl7oLPTWtmcTJTZk1Ow-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 579982815E2C; Thu, 27 Jul 2023 15:03:49 +0000 (UTC) Received: from localhost (unknown [10.42.28.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 824E01121330; Thu, 27 Jul 2023 15:03:48 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix std::format alternate form for floating-point [PR108046] Date: Thu, 27 Jul 2023 16:03:11 +0100 Message-ID: <20230727150345.303590-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.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_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham 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. Backport to gcc-13 to follow. -- >8 -- A decimal point was being added to the end of the string for {:#.0} because the __expc character was not being set, for the _Pres_none presentation type, so __s.find(__expc) didn't the 'e' in "1e+01" and so we created "1e+01." by appending the radix char to the end. This can be fixed by ensuring that __expc='e' is set for the _Pres_none case. I realized we can also set __expc='P' and __expc='E' when needed, to save a call to std::toupper later. For the {:#.0g} format, __expc='e' was being set and so the 'e' was found in "1e+10" but then __z = __prec - __sigfigs would wraparound to SIZE_MAX. That meant we would decide not to add a radix char because the number of extra characters to insert would be 1+SIZE_MAX i.e. zero. This can be fixed by using __z == 0 when __prec == 0. libstdc++-v3/ChangeLog: PR libstdc++/108046 * include/std/format (__formatter_fp::format): Ensure __expc is always set for all presentation types. Set __z correctly for zero precision. * testsuite/std/format/functions/format.cc: Check problem cases. --- libstdc++-v3/include/std/format | 17 +++++++++-------- .../testsuite/std/format/functions/format.cc | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 0c6069b2681..1e0ef612ddd 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1430,22 +1430,24 @@ namespace __format chars_format __fmt{}; bool __upper = false; bool __trailing_zeros = false; - char __expc = 0; + char __expc = 'e'; switch (_M_spec._M_type) { case _Pres_A: __upper = true; + __expc = 'P'; [[fallthrough]]; case _Pres_a: - __expc = 'p'; + if (_M_spec._M_type != _Pres_A) + __expc = 'p'; __fmt = chars_format::hex; break; case _Pres_E: __upper = true; + __expc = 'E'; [[fallthrough]]; case _Pres_e: - __expc = 'e'; __use_prec = true; __fmt = chars_format::scientific; break; @@ -1455,10 +1457,10 @@ namespace __format break; case _Pres_G: __upper = true; + __expc = 'E'; [[fallthrough]]; case _Pres_g: __trailing_zeros = true; - __expc = 'e'; __use_prec = true; __fmt = chars_format::general; break; @@ -1511,7 +1513,6 @@ namespace __format { for (char* __p = __start; __p != __res.ptr; ++__p) *__p = std::toupper(*__p); - __expc = std::toupper(__expc); } // Add sign for non-negative values. @@ -1545,15 +1546,15 @@ namespace __format __p = __s.find(__expc); if (__p == __s.npos) __p = __s.size(); - __d = __p; + __d = __p; // Position where '.' should be inserted. __sigfigs = __d; } - if (__trailing_zeros) + if (__trailing_zeros && __prec != 0) { if (!__format::__is_xdigit(__s[0])) --__sigfigs; - __z = __prec - __sigfigs; + __z = __prec - __sigfigs; // Number of zeros to insert. } if (size_t __extras = int(__d == __p) + __z) diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc index 3485535e3cb..bd914df6d7c 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format.cc @@ -152,6 +152,10 @@ test_alternate_forms() s = std::format("{:#.2g}", -0.0); VERIFY( s == "-0.0" ); + + // PR libstdc++/108046 + s = std::format("{0:#.0} {0:#.1} {0:#.0g}", 10.0); + VERIFY( s == "1.e+01 1.e+01 1.e+01" ); } struct euro_punc : std::numpunct -- 2.41.0