coffee/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2026-10-29 02:17:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix hexfloat zero padding: zero padding must be placed after the sign and "0x" prefix (#4972)

Browse Source 
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
This commit is contained in:
Vladislav Shchapov 2026-10-09 01:06:28 +05:00 committed by GitHub
parent 62295c1ce2
commit 35c58f084e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/fmt/format.h
View File

@ -3368,8 +3368,6 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, format_specs specs,
// Remove zero tail.
while (print_xdigits > 0 && xdigits[print_xdigits] == '0') --print_xdigits;
buf.push_back('0');
buf.push_back(specs.upper() ? 'X' : 'x');
buf.push_back(xdigits[0]);
if (specs.alt() || print_xdigits > 0 || print_xdigits < specs.precision)
buf.push_back('.');
@ -3745,9 +3743,24 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value, format_specs specs,
memory_buffer buffer;
if (specs.type() == presentation_type::hexfloat) {
if (s != sign::none) buffer.push_back(detail::getsign<char>(s));
size_t prefix_length = 0;
buffer.push_back('0');
buffer.push_back(specs.upper() ? 'X' : 'x');
if (specs.align() == align::numeric) {
prefix_length = buffer.size();
const char* data = buffer.data();
out = copy<Char>(data, data + prefix_length, out);
buffer.clear();
}
format_hexfloat(convert_float(value), specs, buffer);
return write_bytes<Char, align::right>(out, {buffer.data(), buffer.size()},
specs);
return write_padded<Char, align::right>(
out, specs, buffer.size(), buffer.size() + prefix_length,
[&buffer](reserve_iterator<OutputIt> it) {
const char* data = buffer.data();
return copy<Char>(data, data + buffer.size(), it);
});
}
if (specs.type() == presentation_type::exp) {

2
test/format-test.cc
View File

@ -1671,6 +1671,8 @@ TEST(format_test, format_double) {
EXPECT_EQ(fmt::format("{:L}", 42.0), "42");
EXPECT_EQ(fmt::format("{:24a}", 4.2f), " 0x1.0cccccp+2");
EXPECT_EQ(fmt::format("{:24a}", 4.2), " 0x1.0cccccccccccdp+2");
EXPECT_EQ(fmt::format("{:012a}", 1.0), "0x0000001p+0");
EXPECT_EQ(fmt::format("{:*>12a}", 1.0), "******0x1p+0");
EXPECT_EQ(fmt::format("{:<24a}", 4.2), "0x1.0cccccccccccdp+2 ");
EXPECT_EQ(fmt::format("{0:e}", 392.65), "3.926500e+02");
EXPECT_EQ(fmt::format("{0:E}", 392.65), "3.926500E+02");