mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

AK: Differ between long and long long formats

Browse source
This commit is contained in:
Tim Schumacher 2022-04-09 02:49:07 +02:00 • committed by Ali Mohammad Pur
parent fbfa378e74
commit d6ccee4089
2 changed files with 56 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
AK/PrintfImplementation.h
View file

@ -353,10 +353,15 @@ struct PrintfImpl {
} }
ALWAYS_INLINE int format_d(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_d(ModifierState const& state, ArgumentListRefT ap) const
{ {
if (state.long_qualifiers >= 2) i64 number = [&]() -> i64 {
return print_signed_number(m_putch, m_bufptr, NextArgument<i64>()(ap), state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); if (state.long_qualifiers >= 2)
return NextArgument<long long int>()(ap);
if (state.long_qualifiers == 1)
return NextArgument<long int>()(ap);
return NextArgument<int>()(ap);
}();
return print_signed_number(m_putch, m_bufptr, NextArgument<int>()(ap), state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); return print_signed_number(m_putch, m_bufptr, number, state.always_sign, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision);
} }
ALWAYS_INLINE int format_i(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_i(ModifierState const& state, ArgumentListRefT ap) const
{ {
@ -364,9 +369,15 @@ struct PrintfImpl {
} }
ALWAYS_INLINE int format_u(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_u(ModifierState const& state, ArgumentListRefT ap) const
{ {
if (state.long_qualifiers >= 2) u64 number = [&]() -> u64 {
return print_decimal(m_putch, m_bufptr, NextArgument<u64>()(ap), false, false, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); if (state.long_qualifiers >= 2)
return print_decimal(m_putch, m_bufptr, NextArgument<u32>()(ap), false, false, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); return NextArgument<unsigned long long int>()(ap);
if (state.long_qualifiers == 1)
return NextArgument<unsigned long int>()(ap);
return NextArgument<unsigned int>()(ap);
}();
return print_decimal(m_putch, m_bufptr, number, false, false, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision);
} }
ALWAYS_INLINE int format_Q(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_Q(ModifierState const& state, ArgumentListRefT ap) const
{ {
@ -390,9 +401,15 @@ struct PrintfImpl {
} }
ALWAYS_INLINE int format_unsigned_hex(ModifierState const& state, ArgumentListRefT ap, bool uppercase) const ALWAYS_INLINE int format_unsigned_hex(ModifierState const& state, ArgumentListRefT ap, bool uppercase) const
{ {
if (state.long_qualifiers >= 2) u64 number = [&]() -> u64 {
return print_hex(m_putch, m_bufptr, NextArgument<u64>()(ap), uppercase, state.alternate_form, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); if (state.long_qualifiers >= 2)
return print_hex(m_putch, m_bufptr, NextArgument<u32>()(ap), uppercase, state.alternate_form, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision); return NextArgument<unsigned long long int>()(ap);
if (state.long_qualifiers == 1)
return NextArgument<unsigned long int>()(ap);
return NextArgument<unsigned int>()(ap);
}();
return print_hex(m_putch, m_bufptr, number, uppercase, state.alternate_form, state.left_pad, state.zero_pad, state.field_width, state.has_precision, state.precision);
} }
ALWAYS_INLINE int format_x(ModifierState const& state, ArgumentListRefT ap) const ALWAYS_INLINE int format_x(ModifierState const& state, ArgumentListRefT ap) const
{ {

34
Userland/Utilities/printf.cpp
View file

@ -156,8 +156,21 @@ struct ArgvNextArgument<unsigned, V> {
}; };
template<typename V> template<typename V>
struct ArgvNextArgument<i64, V> { struct ArgvNextArgument<long int, V> {
ALWAYS_INLINE i64 operator()(V arg) const ALWAYS_INLINE long int operator()(V arg) const
{
if (arg.argc == 0)
return 0;
auto result = *arg.argv++;
--arg.argc;
return strtol(result, nullptr, 10);
}
};
template<typename V>
struct ArgvNextArgument<long long int, V> {
ALWAYS_INLINE long long int operator()(V arg) const
{ {
if (arg.argc == 0) if (arg.argc == 0)
return 0; return 0;
@ -169,8 +182,21 @@ struct ArgvNextArgument<i64, V> {
}; };
template<typename V> template<typename V>
struct ArgvNextArgument<u64, V> { struct ArgvNextArgument<unsigned long int, V> {
ALWAYS_INLINE u64 operator()(V arg) const ALWAYS_INLINE unsigned long int operator()(V arg) const
{
if (arg.argc == 0)
return 0;
auto result = *arg.argv++;
--arg.argc;
return strtoul(result, nullptr, 10);
}
};
template<typename V>
struct ArgvNextArgument<unsigned long long int, V> {
ALWAYS_INLINE unsigned long long int operator()(V arg) const
{ {
if (arg.argc == 0) if (arg.argc == 0)
return 0; return 0;