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

AK+Format: Use pointer mode for pointers by default.

Browse source
This commit is contained in:
asynts 2020-10-07 12:47:35 +02:00 • committed by Andreas Kling
parent b9316474b7
commit b94cb02a7f
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
AK/Format.h
View file

@ -284,6 +284,9 @@ template<typename T>
struct Formatter<T*> : StandardFormatter { struct Formatter<T*> : StandardFormatter {
void format(TypeErasedFormatParams& params, FormatBuilder& builder, T* value) void format(TypeErasedFormatParams& params, FormatBuilder& builder, T* value)
{ {
if (m_mode == Mode::Default)
m_mode = Mode::Pointer;
Formatter<FlatPtr> formatter { *this }; Formatter<FlatPtr> formatter { *this };
formatter.format(params, builder, reinterpret_cast<FlatPtr>(value)); formatter.format(params, builder, reinterpret_cast<FlatPtr>(value));
} }

2
AK/Tests/TestFormat.cpp
View file

@ -156,9 +156,11 @@ TEST_CASE(pointers)
if (sizeof(void*) == 4) { if (sizeof(void*) == 4) {
EXPECT_EQ(String::formatted("{:p}", 32), "0x00000020"); EXPECT_EQ(String::formatted("{:p}", 32), "0x00000020");
EXPECT_EQ(String::formatted("{:p}", ptr), "0x00004000"); EXPECT_EQ(String::formatted("{:p}", ptr), "0x00004000");
EXPECT_EQ(String::formatted("{}", ptr), "0x00004000");
} else if (sizeof(void*) == 8) { } else if (sizeof(void*) == 8) {
EXPECT_EQ(String::formatted("{:p}", 32), "0x0000000000000020"); EXPECT_EQ(String::formatted("{:p}", 32), "0x0000000000000020");
EXPECT_EQ(String::formatted("{:p}", ptr), "0x0000000000004000"); EXPECT_EQ(String::formatted("{:p}", ptr), "0x0000000000004000");
EXPECT_EQ(String::formatted("{}", ptr), "0x0000000000004000");
} else { } else {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }