[PATCH] D29898: [Support] Add format_provider for StringLiteral
Pavel Labath via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 14 08:47:31 PST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL295064: [Support] Add formatv support for StringLiteral (authored by labath).
Changed prior to commit:
https://reviews.llvm.org/D29898?vs=88342&id=88385#toc
Repository:
rL LLVM
https://reviews.llvm.org/D29898
Files:
llvm/trunk/include/llvm/Support/FormatProviders.h
llvm/trunk/unittests/Support/FormatVariadicTest.cpp
Index: llvm/trunk/include/llvm/Support/FormatProviders.h
===================================================================
--- llvm/trunk/include/llvm/Support/FormatProviders.h
+++ llvm/trunk/include/llvm/Support/FormatProviders.h
@@ -45,9 +45,8 @@
template <typename T>
struct use_string_formatter
- : public std::integral_constant<
- bool, is_one_of<T, llvm::StringRef, std::string>::value ||
- is_cstring<T>::value> {};
+ : public std::integral_constant<bool,
+ std::is_convertible<T, llvm::StringRef>::value> {};
template <typename T>
struct use_pointer_formatter
@@ -205,7 +204,7 @@
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);
}
};
Index: llvm/trunk/unittests/Support/FormatVariadicTest.cpp
===================================================================
--- llvm/trunk/unittests/Support/FormatVariadicTest.cpp
+++ llvm/trunk/unittests/Support/FormatVariadicTest.cpp
@@ -324,11 +324,13 @@
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29898.88385.patch
Type: text/x-patch
Size: 1754 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170214/013a63c5/attachment.bin>
More information about the llvm-commits
mailing list