Don't emit more than precision digits (#1072)

fmtlib · Mar 9, 2019 · 49d244c · 49d244c
1 parent 3466d9c
commit 49d244c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
@@ -459,8 +459,8 @@ int grisu2_gen_digits(char* buf, fp value, uint64_t error_ulp, int& exp,
   // The fractional part of scaled value (p2 in Grisu) c = value % one.
   uint64_t fractional = value.f & (one.f - 1);
   exp = count_digits(integral);  // kappa in Grisu.
-  stop.on_exp(exp);
   int size = 0;
+  if (stop.on_exp(exp)) return size;
   // Generate digits for the integral part. This can produce up to 10 digits.
   do {
     uint32_t digit = 0;
@@ -537,17 +537,23 @@ struct fixed_stop {
   int exp10;
   bool fixed;
 
-  void on_exp(int exp) {
-    if (!fixed) return;
+  bool enough_precision(int full_exp) const {
+    return full_exp <= 0 && -full_exp >= precision;
+  }
+
+  bool on_exp(int exp) {
+    if (!fixed) return false;
     exp += exp10;
     if (exp >= 0) precision += exp;
+    // TODO: round
+    return enough_precision(exp);
   }
 
   // TODO: test
   bool operator()(char* buf, int& size, uint64_t remainder, uint64_t divisor,
                   uint64_t error, int& exp, bool integral) {
     assert(remainder < divisor);
-    if (size != precision) return false;
+    if (size != precision && !enough_precision(exp + exp10)) return false;
     if (!integral) {
       // Check if error * 2 < divisor with overflow prevention.
       // The check is not needed for the integral part because error = 1
@@ -585,7 +591,7 @@ struct fixed_stop {
 struct shortest_stop {
   fp diff;  // wp_w in Grisu.
 
-  void on_exp(int) {}
+  bool on_exp(int) { return false; }
 
   bool operator()(char* buf, int& size, uint64_t remainder, uint64_t divisor,
                   uint64_t error, int& exp, bool integral) {

diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -2892,7 +2892,7 @@ void basic_writer<Range>::write_double(T value, const format_specs& spec) {
   int exp = 0;
   int precision = spec.has_precision() || !spec.type ? spec.precision : 6;
   bool use_grisu = fmt::internal::use_grisu<T>() &&
-                   !spec.type &&
+                   (!spec.type || handler.fixed) &&
                    internal::grisu2_format(static_cast<double>(value), buffer,
                                            precision, handler.fixed, exp);
   if (!use_grisu) internal::sprintf_format(value, buffer, spec);

diff --git a/test/format-test.cc b/test/format-test.cc
@@ -1470,6 +1470,10 @@ TEST(FormatterTest, FormatDouble) {
   EXPECT_EQ(buffer, format("{:A}", -42.0));
 }
 
+TEST(FormatterTest, PrecisionRounding) {
+  EXPECT_EQ("0.000", format("{:.3f}", 0.00049));
+}
+
 TEST(FormatterTest, FormatNaN) {
   double nan = std::numeric_limits<double>::quiet_NaN();
   EXPECT_EQ("nan", format("{}", nan));