AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-26 04:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of hexfloat

Browse Source
This commit is contained in:
Victor Zverovich 2019-06-12 20:03:56 -07:00
parent 92a44db11c
commit cbbee1b385
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/format-inl.h
View File

@ -786,20 +786,21 @@ void sprintf_format(Double value, internal::buffer<char>& buf,
// Find the decimal point. // Find the decimal point.
auto p = buf.data(), end = p + n; auto p = buf.data(), end = p + n;
if (*p == '+' || *p == '-') ++p; if (*p == '+' || *p == '-') ++p;
if (spec.type == 'a' || spec.type == 'A') p += 2; // Skip "0x". if (spec.type != 'a' && spec.type != 'A') {
while (p < end && *p >= '0' && *p <= '9') ++p; while (p < end && *p >= '0' && *p <= '9') ++p;
if (p < end && *p != 'e' && *p != 'E') { if (p < end && *p != 'e' && *p != 'E') {
if (*p != '.') *p = '.'; if (*p != '.') *p = '.';
if (!spec.type) { if (!spec.type) {
// Keep only one trailing zero after the decimal point. // Keep only one trailing zero after the decimal point.
++p; ++p;
if (*p == '0') ++p; if (*p == '0') ++p;
while (p != end && *p >= '1' && *p <= '9') ++p; while (p != end && *p >= '1' && *p <= '9') ++p;
char* where = p; char* where = p;
while (p != end && *p == '0') ++p; while (p != end && *p == '0') ++p;
if (p == end || *p < '0' || *p > '9') { if (p == end || *p < '0' || *p > '9') {
if (p != end) std::memmove(where, p, to_unsigned(end - p)); if (p != end) std::memmove(where, p, to_unsigned(end - p));
n -= static_cast<unsigned>(p - where); n -= static_cast<unsigned>(p - where);
}
} }
} }
} }

2
test/format-test.cc
View File

@ -1506,6 +1506,8 @@ TEST(FormatterTest, FormatLongDouble) {
safe_sprintf(buffer, "%Le", 392.65l); safe_sprintf(buffer, "%Le", 392.65l);
EXPECT_EQ(buffer, format("{0:e}", 392.65l)); EXPECT_EQ(buffer, format("{0:e}", 392.65l));
EXPECT_EQ("+0000392.6", format("{0:+010.4g}", 392.64l)); EXPECT_EQ("+0000392.6", format("{0:+010.4g}", 392.64l));
safe_sprintf(buffer, "%La", 3.31l);
EXPECT_EQ(buffer, format("{:a}", 3.31l));
} }
TEST(FormatterTest, FormatChar) { TEST(FormatterTest, FormatChar) {