From de348d3f7d81460f369aad60af226af7ce115888 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 14 Feb 2017 16:35:56 +0000 Subject: [PATCH] [Support] Add formatv support for StringLiteral Summary: This is achieved by generalizing the expression selecting the StringRef format_provider. Now, anything that can be converted to a StringRef will use it's formatter. Reviewers: zturner Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D29898 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295064 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FormatProviders.h | 7 +++---- unittests/Support/FormatVariadicTest.cpp | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/llvm/Support/FormatProviders.h b/include/llvm/Support/FormatProviders.h index 1f0768c3ab08..54a37169d3af 100644 --- a/include/llvm/Support/FormatProviders.h +++ b/include/llvm/Support/FormatProviders.h @@ -45,9 +45,8 @@ struct is_cstring template struct use_string_formatter - : public std::integral_constant< - bool, is_one_of::value || - is_cstring::value> {}; + : public std::integral_constant::value> {}; template struct use_pointer_formatter @@ -205,7 +204,7 @@ struct format_provider< if (!Style.empty() && Style.getAsInteger(10, N)) { assert(false && "Style is not a valid integer"); } - llvm::StringRef S(V); + llvm::StringRef S = V; Stream << S.substr(0, N); } }; diff --git a/unittests/Support/FormatVariadicTest.cpp b/unittests/Support/FormatVariadicTest.cpp index 9307c6d8e09b..b0c843870afc 100644 --- a/unittests/Support/FormatVariadicTest.cpp +++ b/unittests/Support/FormatVariadicTest.cpp @@ -324,11 +324,13 @@ TEST(FormatVariadicTest, StringFormatting) { const char FooArray[] = "FooArray"; const char *FooPtr = "FooPtr"; llvm::StringRef FooRef("FooRef"); + constexpr StringLiteral FooLiteral("FooLiteral"); std::string FooString("FooString"); // 1. Test that we can print various types of strings. EXPECT_EQ(FooArray, formatv("{0}", FooArray).str()); EXPECT_EQ(FooPtr, formatv("{0}", FooPtr).str()); EXPECT_EQ(FooRef, formatv("{0}", FooRef).str()); + EXPECT_EQ(FooLiteral, formatv("{0}", FooLiteral).str()); EXPECT_EQ(FooString, formatv("{0}", FooString).str()); // 2. Test that the precision specifier prints the correct number of