External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify ceil

Browse Source
This commit is contained in:
Victor Zverovich 2023-05-24 11:38:27 -07:00
parent 5e988f8dfa
commit d8f04e3995
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/fmt/format.h
View File

@ -3317,23 +3317,6 @@ FMT_CONSTEXPR20 void format_hexfloat(Float value, int precision,
format_hexfloat(static_cast<double>(value), precision, specs, buf); format_hexfloat(static_cast<double>(value), precision, specs, buf);
} }
template <typename Float> FMT_CONSTEXPR auto iceil(Float value) -> int {
auto min = (std::numeric_limits<int>::min)();
auto max = (std::numeric_limits<int>::max)();
ignore_unused(min, max);
FMT_ASSERT(value >= min && value <= max, "value not in int range");
do {
auto mid = min + static_cast<int>((static_cast<unsigned>(max) -
static_cast<unsigned>(min)) /
2);
if (mid < value)
min = mid;
else
max = mid;
} while (min + 1 != max);
return max;
}
template <typename Float> template <typename Float>
FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs, FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
buffer<char>& buf) -> int { buffer<char>& buf) -> int {
@ -3364,7 +3347,9 @@ FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs,
// 10^(exp - 1) <= value < 10^exp or 10^exp <= value < 10^(exp + 1). // 10^(exp - 1) <= value < 10^exp or 10^exp <= value < 10^(exp + 1).
// This is based on log10(value) == log2(value) / log2(10) and approximation // This is based on log10(value) == log2(value) / log2(10) and approximation
// of log2(value) by e + num_fraction_bits idea from double-conversion. // of log2(value) by e + num_fraction_bits idea from double-conversion.
exp = iceil((f.e + count_digits<1>(f.f) - 1) * inv_log2_10 - 1e-10); auto e = (f.e + count_digits<1>(f.f) - 1) * inv_log2_10 - 1e-10;
exp = static_cast<int>(e);
if (e > exp) ++exp; // Compute ceil.
dragon_flags = dragon::fixup; dragon_flags = dragon::fixup;
} else if (precision < 0) { } else if (precision < 0) {
// Use Dragonbox for the shortest format. // Use Dragonbox for the shortest format.

2
test/compile-fp-test.cc
View File

@ -10,7 +10,7 @@
#if defined(__cpp_lib_bit_cast) && __cpp_lib_bit_cast >= 201806 && \ #if defined(__cpp_lib_bit_cast) && __cpp_lib_bit_cast >= 201806 && \
defined(__cpp_constexpr) && __cpp_constexpr >= 201907 && \ defined(__cpp_constexpr) && __cpp_constexpr >= 201907 && \
defined(__cpp_constexpr_dynamic_alloc) && !FMT_MSC_VERSION && \ defined(__cpp_constexpr_dynamic_alloc) && \
__cpp_constexpr_dynamic_alloc >= 201907 && FMT_CPLUSPLUS >= 202002L __cpp_constexpr_dynamic_alloc >= 201907 && FMT_CPLUSPLUS >= 202002L
template <size_t max_string_length, typename Char = char> struct test_string { template <size_t max_string_length, typename Char = char> struct test_string {

15
test/format-impl-test.cc
View File

@ -523,18 +523,3 @@ TEST(format_impl_test, to_utf8) {
EXPECT_EQ(s, u.str()); EXPECT_EQ(s, u.str());
EXPECT_EQ(s.size(), u.size()); EXPECT_EQ(s.size(), u.size());
} }
TEST(format_impl_test, iceil) {
for (double v : std::initializer_list<double>{
((std::numeric_limits<int>::min)() + 0.5),
-1.2,
-0.2,
0.0,
0.2,
1.2,
4.0,
((std::numeric_limits<int>::max)() - 0.5),
}) {
EXPECT_EQ(fmt::detail::iceil(v), static_cast<int>(std::ceil(v)));
}
}