RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:47:35 +00:00
Code Issues Activity Actions

AK: Don't write trailing zeros with %g

Browse source
This commit is contained in:
Peter Elliott 2022-10-29 23:16:49 -06:00 • committed by Jelle Raaijmakers
parent 5efcec308a
commit b217045f8f
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
AK/PrintfImplementation.h
View file

@ -164,7 +164,7 @@ ALWAYS_INLINE int print_decimal(PutChFunc putch, CharType*& bufptr, u64 number,
} }
#ifndef KERNEL #ifndef KERNEL
template<typename PutChFunc, typename CharType> template<typename PutChFunc, typename CharType>
ALWAYS_INLINE int print_double(PutChFunc putch, CharType*& bufptr, double number, bool always_sign, bool left_pad, bool zero_pad, u32 field_width, u32 precision) ALWAYS_INLINE int print_double(PutChFunc putch, CharType*& bufptr, double number, bool always_sign, bool left_pad, bool zero_pad, u32 field_width, u32 precision, bool trailing_zeros)
{ {
int length = 0; int length = 0;
@ -200,14 +200,22 @@ ALWAYS_INLINE int print_double(PutChFunc putch, CharType*& bufptr, double number
length = print_decimal(putch, bufptr, (i64)number, sign, always_sign, left_pad, zero_pad, whole_width, false, 1); length = print_decimal(putch, bufptr, (i64)number, sign, always_sign, left_pad, zero_pad, whole_width, false, 1);
if (precision > 0) { if (precision > 0) {
putch(bufptr, '.');
length++;
double fraction = number - (i64)number; double fraction = number - (i64)number;
for (u32 i = 0; i < precision; ++i) for (u32 i = 0; i < precision; ++i)
fraction = fraction * 10; fraction = fraction * 10;
if (trailing_zeros || fraction) {
length++;
putch(bufptr, '.');
return length + print_decimal(putch, bufptr, (i64)fraction, false, false, false, true, precision, false, 1); i64 ifraction = fraction;
while (!trailing_zeros && ifraction % 10 == 0) {
ifraction /= 10;
precision--;
}
return length + print_decimal(putch, bufptr, ifraction, false, false, false, true, precision, false, 1);
}
} }
return length; return length;
@ -393,11 +401,12 @@ struct PrintfImpl {
#ifndef KERNEL #ifndef KERNEL
ALWAYS_INLINE int format_g(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_g(ModifierState const& state, ArgumentListRefT ap) const
{ {
return format_f(state, ap); // FIXME: Exponent notation
return print_double(m_putch, m_bufptr, NextArgument<double>()(ap), state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.precision, false);
} }
ALWAYS_INLINE int format_f(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_f(ModifierState const& state, ArgumentListRefT ap) const
{ {
return print_double(m_putch, m_bufptr, NextArgument<double>()(ap), state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.precision); return print_double(m_putch, m_bufptr, NextArgument<double>()(ap), state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.precision, true);
} }
#endif #endif
ALWAYS_INLINE int format_o(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_o(ModifierState const& state, ArgumentListRefT ap) const

8
Tests/LibC/TestSnprintf.cpp
View file

@ -325,3 +325,11 @@ TEST_CASE(truncation)
EXPECT(test_single<unsigned long long int>({ LITERAL("xxxxxxxxxxxxxxxxxxx"), "|%llx|", ULLONG_MAX, 18, LITERAL("|ffffffffffffffff|\0") })); EXPECT(test_single<unsigned long long int>({ LITERAL("xxxxxxxxxxxxxxxxxxx"), "|%llx|", ULLONG_MAX, 18, LITERAL("|ffffffffffffffff|\0") }));
EXPECT(test_single<unsigned long long int>({ LITERAL("xxxxxxxxxxxxxxxxxxx"), "|%llX|", ULLONG_MAX, 18, LITERAL("|FFFFFFFFFFFFFFFF|\0") })); EXPECT(test_single<unsigned long long int>({ LITERAL("xxxxxxxxxxxxxxxxxxx"), "|%llX|", ULLONG_MAX, 18, LITERAL("|FFFFFFFFFFFFFFFF|\0") }));
} }
TEST_CASE(g_format)
{
EXPECT(test_single<double>({ LITERAL("xxxx"), "|%g|", 0.0, 3, LITERAL("|0|\0") }));
EXPECT(test_single<double>({ LITERAL("xxxx"), "|%g|", 1.0, 3, LITERAL("|1|\0") }));
EXPECT(test_single<double>({ LITERAL("xxxxxx"), "|%g|", 1.1, 5, LITERAL("|1.1|\0") }));
EXPECT(test_single<double>({ LITERAL("xxxxxxxx"), "|%g|", -1.12, 7, LITERAL("|-1.12|\0") }));
}