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

Add a missing decimal point in exponent notation with trailing zeros

Browse Source
This commit is contained in:
Victor Zverovich 2019-12-02 11:36:33 -08:00
parent 4ca6821e8f
commit 8bbe76af3a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/format.h
View File

@ -1145,10 +1145,11 @@ template <typename Char> class float_writer {
if (specs_.format == float_format::exp) { if (specs_.format == float_format::exp) {
// Insert a decimal point after the first digit and add an exponent. // Insert a decimal point after the first digit and add an exponent.
*it++ = static_cast<Char>(*digits_); *it++ = static_cast<Char>(*digits_);
if (num_digits_ > 1) *it++ = decimal_point_;
it = copy_str<Char>(digits_ + 1, digits_ + num_digits_, it);
int num_zeros = specs_.precision - num_digits_; int num_zeros = specs_.precision - num_digits_;
if (num_zeros > 0 && specs_.trailing_zeros) bool trailing_zeros = num_zeros > 0 && specs_.trailing_zeros;
if (num_digits_ > 1 || trailing_zeros) *it++ = decimal_point_;
it = copy_str<Char>(digits_ + 1, digits_ + num_digits_, it);
if (trailing_zeros)
it = std::fill_n(it, num_zeros, static_cast<Char>('0')); it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
*it++ = static_cast<Char>(specs_.upper ? 'E' : 'e'); *it++ = static_cast<Char>(specs_.upper ? 'E' : 'e');
return write_exponent<Char>(full_exp - 1, it); return write_exponent<Char>(full_exp - 1, it);

1
test/format-test.cc
View File

@ -1204,6 +1204,7 @@ TEST(FormatterTest, Precision) {
EXPECT_EQ("1.2", format("{0:.2}", 1.2345l)); EXPECT_EQ("1.2", format("{0:.2}", 1.2345l));
EXPECT_EQ("1.2e+56", format("{:.2}", 1.234e56)); EXPECT_EQ("1.2e+56", format("{:.2}", 1.234e56));
EXPECT_EQ("1e+00", format("{:.0e}", 1.0L)); EXPECT_EQ("1e+00", format("{:.0e}", 1.0L));
EXPECT_EQ(" 0.0e+00", format("{:9.1e}", 0.0));
EXPECT_EQ( EXPECT_EQ(
"4.9406564584124654417656879286822137236505980261432476442558568250067550" "4.9406564584124654417656879286822137236505980261432476442558568250067550"
"727020875186529983636163599237979656469544571773092665671035593979639877" "727020875186529983636163599237979656469544571773092665671035593979639877"