diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-04-26 11:42:26 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2024-04-26 15:57:38 +0100 |
| commit | a0bc71e480132a528a4869c1cd7863f709768c53 (patch) | |
| tree | 1faa6286f456cef50af8497bb18999adc06b310e | |
| parent | 7d5479a2ecf6309281de10b747a7423169a2ff95 (diff) | |
| download | gcc-a0bc71e480132a528a4869c1cd7863f709768c53.zip gcc-a0bc71e480132a528a4869c1cd7863f709768c53.tar.gz gcc-a0bc71e480132a528a4869c1cd7863f709768c53.tar.bz2 | |
libstdc++: Do not apply localized formatting to NaN and inf [PR114863]
We don't want to add grouping to strings like "-inf", and there is no
radix character to replace either.
libstdc++-v3/ChangeLog:
PR libstdc++/114863
* include/std/format (__formatter_fp::format): Only use
_M_localized for finite values.
* testsuite/std/format/functions/format.cc: Check localized
formatting of NaN and initiny.
| -rw-r--r-- | libstdc++-v3/include/std/format | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/format/functions/format.cc | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 22dcb5f..48deba2 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1734,7 +1734,7 @@ namespace __format } #endif - if (_M_spec._M_localized) + if (_M_spec._M_localized && __builtin_isfinite(__v)) { __wstr = _M_localize(__str, __expc, __fc.locale()); if (!__wstr.empty()) diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc index 4499397..78cc1ab 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format.cc @@ -248,6 +248,14 @@ test_locale() s = std::format(cloc, "{:05L}", -1.0); // PR libstdc++/110968 VERIFY( s == "-0001" ); + // PR libstdc++/114863 grouping applied to nan and inf + double inf = std::numeric_limits<double>::infinity(); + s = std::format(eloc, "{0:Le} {0:Lf} {0:Lg}", -inf); + VERIFY( s == "-inf -inf -inf" ); + double nan = std::numeric_limits<double>::quiet_NaN(); + s = std::format(eloc, "{0:Le} {0:Lf} {0:Lg}", -nan); + VERIFY( s == "-nan -nan -nan" ); + // Restore std::locale::global(cloc); } |