mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 13:36:13 +03:00
AK: Differ between long and long long formats
This commit is contained in:
parent
fbfa378e74
commit
d6ccee4089
Notes:
sideshowbarker
2024-07-17 11:49:28 +09:00
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/d6ccee4089 Pull-request: https://github.com/SerenityOS/serenity/pull/13581
@ -353,10 +353,15 @@ struct PrintfImpl {
|
||||
}
|
||||
ALWAYS_INLINE int format_d(ModifierState const& state, ArgumentListRefT ap) const
|
||||
{
|
||||
if (state.long_qualifiers >= 2)
|
||||
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);
|
||||
i64 number = [&]() -> i64 {
|
||||
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
|
||||
{
|
||||
@ -364,9 +369,15 @@ struct PrintfImpl {
|
||||
}
|
||||
ALWAYS_INLINE int format_u(ModifierState const& state, ArgumentListRefT ap) const
|
||||
{
|
||||
if (state.long_qualifiers >= 2)
|
||||
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);
|
||||
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);
|
||||
u64 number = [&]() -> u64 {
|
||||
if (state.long_qualifiers >= 2)
|
||||
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
|
||||
{
|
||||
@ -390,9 +401,15 @@ struct PrintfImpl {
|
||||
}
|
||||
ALWAYS_INLINE int format_unsigned_hex(ModifierState const& state, ArgumentListRefT ap, bool uppercase) const
|
||||
{
|
||||
if (state.long_qualifiers >= 2)
|
||||
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);
|
||||
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);
|
||||
u64 number = [&]() -> u64 {
|
||||
if (state.long_qualifiers >= 2)
|
||||
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
|
||||
{
|
||||
|
@ -156,8 +156,21 @@ struct ArgvNextArgument<unsigned, V> {
|
||||
};
|
||||
|
||||
template<typename V>
|
||||
struct ArgvNextArgument<i64, V> {
|
||||
ALWAYS_INLINE i64 operator()(V arg) const
|
||||
struct ArgvNextArgument<long int, V> {
|
||||
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)
|
||||
return 0;
|
||||
@ -169,8 +182,21 @@ struct ArgvNextArgument<i64, V> {
|
||||
};
|
||||
|
||||
template<typename V>
|
||||
struct ArgvNextArgument<u64, V> {
|
||||
ALWAYS_INLINE u64 operator()(V arg) const
|
||||
struct ArgvNextArgument<unsigned long int, V> {
|
||||
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)
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user