External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow passing UDL format strings to the format function

Browse Source
This commit is contained in:
Marc Aldorasi 2019-03-18 11:10:28 -04:00
parent 97619e27a2
commit d4ee81b264
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/fmt/format.h
View File

@ -3589,11 +3589,15 @@ inline std::size_t formatted_size(string_view format_str, const Args&... args) {
namespace internal { namespace internal {
# if FMT_UDL_TEMPLATE # if FMT_UDL_TEMPLATE
template <typename Char, Char... CHARS> class udl_formatter { template <typename Char, Char... CHARS> class udl_formatter : fmt::compile_string {
public: public:
typedef Char char_type;
static FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'};
FMT_CONSTEXPR operator fmt::basic_string_view<Char>() const {
return {s, sizeof...(CHARS)};
}
template <typename... Args> template <typename... Args>
std::basic_string<Char> operator()(const Args&... args) const { std::basic_string<Char> operator()(const Args&... args) const {
FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'};
FMT_CONSTEXPR_DECL bool invalid_format = FMT_CONSTEXPR_DECL bool invalid_format =
do_check_format_string<Char, error_handler, Args...>( do_check_format_string<Char, error_handler, Args...>(
basic_string_view<Char>(s, sizeof...(CHARS))); basic_string_view<Char>(s, sizeof...(CHARS)));
@ -3603,7 +3607,12 @@ template <typename Char, Char... CHARS> class udl_formatter {
}; };
# else # else
template <typename Char> struct udl_formatter { template <typename Char> struct udl_formatter {
const Char* str; typedef Char char_type;
basic_string_view<Char> str;
udl_formatter(const Char *s, std::size_t n) : str(s,n) {}
operator fmt::basic_string_view<Char>() const {
return str;
}
template <typename... Args> template <typename... Args>
auto operator()(Args&&... args) const auto operator()(Args&&... args) const
@ -3611,6 +3620,10 @@ template <typename Char> struct udl_formatter {
return format(str, std::forward<Args>(args)...); return format(str, std::forward<Args>(args)...);
} }
}; };
template <typename Char>
basic_string_view<Char> to_string_view(const udl_formatter<Char> &s) {
return s;
}
# endif // FMT_UDL_TEMPLATE # endif // FMT_UDL_TEMPLATE
template <typename Char> struct udl_arg { template <typename Char> struct udl_arg {
@ -3641,12 +3654,12 @@ FMT_CONSTEXPR internal::udl_formatter<Char, CHARS...> operator""_format() {
\endrst \endrst
*/ */
inline internal::udl_formatter<char> operator"" _format(const char* s, inline internal::udl_formatter<char> operator"" _format(const char* s,
std::size_t) { std::size_t n) {
return {s}; return {s, n};
} }
inline internal::udl_formatter<wchar_t> operator"" _format(const wchar_t* s, inline internal::udl_formatter<wchar_t> operator"" _format(const wchar_t* s,
std::size_t) { std::size_t n) {
return {s}; return {s, n};
} }
# endif // FMT_UDL_TEMPLATE # endif // FMT_UDL_TEMPLATE

7
test/format-test.cc
View File

@ -1922,6 +1922,13 @@ TEST(FormatTest, UdlTemplate) {
EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42)); EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42));
EXPECT_EQ(L"42", fmt::format(FMT_STRING(L"{}"), 42)); EXPECT_EQ(L"42", fmt::format(FMT_STRING(L"{}"), 42));
} }
TEST(LiteralsTest, FormatUdl) {
auto udl_format = format("{}c{}"_format, "ab", 1);
EXPECT_EQ(format("{}c{}", "ab", 1), udl_format);
auto udl_format_w = format(L"{}c{}"_format, L"ab", 1);
EXPECT_EQ(format(L"{}c{}", L"ab", 1), udl_format_w);
}
#endif // FMT_USE_USER_DEFINED_LITERALS #endif // FMT_USE_USER_DEFINED_LITERALS
enum TestEnum { A }; enum TestEnum { A };