From d2ca7ca017a1d5e3b524ceccf9dbbf4e826fbef5 Mon Sep 17 00:00:00 2001
From: asynts <asynts@gmail.com>
Date: Tue, 6 Oct 2020 13:57:20 +0200
Subject: [PATCH] AK+Format: Make it possible to format string literals as
 pointers.

String literals are just pointers to a constant character. It should be
possible to format them as such. (The default is to print them as
strings still.)
---
 AK/Format.h             | 35 ++++++++++++++++++++++-------------
 AK/Tests/TestFormat.cpp |  6 ++++++
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/AK/Format.h b/AK/Format.h
index ff74e19799..9d7ab3bc42 100644
--- a/AK/Format.h
+++ b/AK/Format.h
@@ -238,6 +238,17 @@ struct StandardFormatter {
     void parse(TypeErasedFormatParams&, FormatParser&);
 };
 
+template<typename T>
+struct Formatter<T, typename EnableIf<IsIntegral<T>::value>::Type> : StandardFormatter {
+    Formatter() { }
+    explicit Formatter(StandardFormatter formatter)
+        : StandardFormatter(formatter)
+    {
+    }
+
+    void format(TypeErasedFormatParams&, FormatBuilder&, T value);
+};
+
 template<>
 struct Formatter<StringView> : StandardFormatter {
     Formatter() { }
@@ -250,12 +261,21 @@ struct Formatter<StringView> : StandardFormatter {
 };
 template<>
 struct Formatter<const char*> : Formatter<StringView> {
+    void format(TypeErasedFormatParams& params, FormatBuilder& builder, const char* value)
+    {
+        if (m_mode == Mode::Pointer) {
+            Formatter<FlatPtr> formatter { *this };
+            formatter.format(params, builder, reinterpret_cast<FlatPtr>(value));
+        } else {
+            Formatter<StringView>::format(params, builder, value);
+        }
+    }
 };
 template<>
-struct Formatter<char*> : Formatter<StringView> {
+struct Formatter<char*> : Formatter<const char*> {
 };
 template<size_t Size>
-struct Formatter<char[Size]> : Formatter<StringView> {
+struct Formatter<char[Size]> : Formatter<const char*> {
 };
 template<>
 struct Formatter<String> : Formatter<StringView> {
@@ -264,17 +284,6 @@ template<>
 struct Formatter<FlyString> : Formatter<StringView> {
 };
 
-template<typename T>
-struct Formatter<T, typename EnableIf<IsIntegral<T>::value>::Type> : StandardFormatter {
-    Formatter() { }
-    explicit Formatter(StandardFormatter formatter)
-        : StandardFormatter(formatter)
-    {
-    }
-
-    void format(TypeErasedFormatParams&, FormatBuilder&, T value);
-};
-
 template<typename T>
 struct Formatter<T*> : StandardFormatter {
     void format(TypeErasedFormatParams& params, FormatBuilder& builder, T* value)
diff --git a/AK/Tests/TestFormat.cpp b/AK/Tests/TestFormat.cpp
index ea7fb5db19..7df8430b5e 100644
--- a/AK/Tests/TestFormat.cpp
+++ b/AK/Tests/TestFormat.cpp
@@ -182,4 +182,10 @@ TEST_CASE(ensure_that_format_works)
     }
 }
 
+TEST_CASE(format_string_literal_as_pointer)
+{
+    const char* literal = "abc";
+    EXPECT_EQ(String::formatted("{:p}", literal), String::formatted("{:p}", reinterpret_cast<FlatPtr>(literal)));
+}
+
 TEST_MAIN(Format)