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

fleximus · Oct 8, 2020 · b94cb02 · b94cb02
1 parent b931647
commit b94cb02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/AK/Format.h b/AK/Format.h
@@ -284,6 +284,9 @@ template<typename T>
 struct Formatter<T*> : StandardFormatter {
  void format(TypeErasedFormatParams& params, FormatBuilder& builder, T* value)
  {
+ if (m_mode == Mode::Default)
+ m_mode = Mode::Pointer;
+
  Formatter<FlatPtr> formatter { *this };
  formatter.format(params, builder, reinterpret_cast<FlatPtr>(value));
  }

diff --git a/AK/Tests/TestFormat.cpp b/AK/Tests/TestFormat.cpp
@@ -156,9 +156,11 @@ TEST_CASE(pointers)
  if (sizeof(void*) == 4) {
  EXPECT_EQ(String::formatted("{:p}", 32), "0x00000020");
  EXPECT_EQ(String::formatted("{:p}", ptr), "0x00004000");
+ EXPECT_EQ(String::formatted("{}", ptr), "0x00004000");
  } else if (sizeof(void*) == 8) {
  EXPECT_EQ(String::formatted("{:p}", 32), "0x0000000000000020");
  EXPECT_EQ(String::formatted("{:p}", ptr), "0x0000000000004000");
+ EXPECT_EQ(String::formatted("{}", ptr), "0x0000000000004000");
  } else {
  ASSERT_NOT_REACHED();
  }