test

alexezeder · Aug 28, 2021 · 8a13e2e · 8a13e2e
1 parent ff0cf70
commit 8a13e2e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 19 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -6,6 +6,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         cxx: [g++-4.8, g++-10, clang++-9]
         build_type: [Debug, Release]

diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
@@ -193,7 +193,7 @@ template <typename T = void> struct basic_inl_data {
       827,   853,   880,   907,   933,   960,   986,   1013,  1039,  1066};
 
   static constexpr uint64_t power_of_10_64[20] = {
-      1, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ULL),
+      1, FMT_POWERS_OF_10(1ULL), FMT_POWERS_OF_10(1000000000ULL),
       10000000000000000000ULL};
 };
 

diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -1838,28 +1838,48 @@ FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& fp,
       if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1;
       if (num_zeros > 0) size += to_unsigned(num_zeros) + 1;
     }
-    auto grouping = digit_grouping<Char>(loc, fspecs.locale);
-    size += to_unsigned(grouping.count_separators(significand_size));
-    return write_padded<align::right>(out, specs, size, [&](iterator it) {
-      if (sign) *it++ = static_cast<Char>(data::signs[sign]);
-      it = write_significand<Char>(it, significand, significand_size,
-                                   fp.exponent, grouping);
-      if (!fspecs.showpoint) return it;
-      *it++ = decimal_point;
-      return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
-    });
+    if (is_constant_evaluated()) {
+      return write_padded<align::right>(out, specs, size, [&](iterator it) {
+        if (sign) *it++ = static_cast<Char>(data::signs[sign]);
+        it = write_significand<Char>(it, significand, significand_size);
+        it = detail::fill_n(it, fp.exponent, zero);
+        if (!fspecs.showpoint) return it;
+        *it++ = decimal_point;
+        return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
+      });
+    } else {
+      auto grouping = digit_grouping<Char>(loc, fspecs.locale);
+      size += to_unsigned(grouping.count_separators(significand_size));
+      return write_padded<align::right>(out, specs, size, [&](iterator it) {
+        if (sign) *it++ = static_cast<Char>(data::signs[sign]);
+        it = write_significand<Char>(it, significand, significand_size,
+                                     fp.exponent, grouping);
+        if (!fspecs.showpoint) return it;
+        *it++ = decimal_point;
+        return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
+      });
+    }
   } else if (exp > 0) {
     // 1234e-2 -> 12.34[0+]
     int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0;
     size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0);
-    auto grouping = digit_grouping<Char>(loc, fspecs.locale);
-    size += to_unsigned(grouping.count_separators(significand_size));
-    return write_padded<align::right>(out, specs, size, [&](iterator it) {
-      if (sign) *it++ = static_cast<Char>(data::signs[sign]);
-      it = write_significand(it, significand, significand_size, exp,
-                             decimal_point, grouping);
-      return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
-    });
+    if (is_constant_evaluated()) {
+      return write_padded<align::right>(out, specs, size, [&](iterator it) {
+        if (sign) *it++ = static_cast<Char>(data::signs[sign]);
+        it = write_significand(it, significand, significand_size, exp,
+                               decimal_point);
+        return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
+      });
+    } else {
+      auto grouping = digit_grouping<Char>(loc, fspecs.locale);
+      size += to_unsigned(grouping.count_separators(significand_size));
+      return write_padded<align::right>(out, specs, size, [&](iterator it) {
+        if (sign) *it++ = static_cast<Char>(data::signs[sign]);
+        it = write_significand(it, significand, significand_size, exp,
+                               decimal_point, grouping);
+        return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it;
+      });
+    }
   }
   // 1234e-6 -> 0.001234
   int num_zeros = -exp;