fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 19:24:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detect user-defined literal templates

Browse Source
This commit is contained in:
Victor Zverovich
2017-11-04 08:23:24 -07:00
parent a7e986166a
commit 8ca6e76dbc
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/format.h
View File

@@ -79,6 +79,10 @@
# endif # endif
#endif #endif
#ifdef __clang__
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
#endif
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
# define FMT_ICC_VERSION __INTEL_COMPILER # define FMT_ICC_VERSION __INTEL_COMPILER
#elif defined(__ICL) #elif defined(__ICL)
@@ -88,6 +92,7 @@
#if defined(__clang__) && !defined(FMT_ICC_VERSION) #if defined(__clang__) && !defined(FMT_ICC_VERSION)
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdocumentation-unknown-command" # pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
# pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
# pragma clang diagnostic ignored "-Wpadded" # pragma clang diagnostic ignored "-Wpadded"
#endif #endif
@@ -185,6 +190,13 @@
# endif # endif
#endif #endif
#if FMT_USE_USER_DEFINED_LITERALS && \
(FMT_GCC_VERSION >= 600 || FMT_CLANG_VERSION >= 304)
# define FMT_UDL_TEMPLATE 1
#else
# define FMT_UDL_TEMPLATE 0
#endif
#ifndef FMT_ASSERT #ifndef FMT_ASSERT
# define FMT_ASSERT(condition, message) assert((condition) && message) # define FMT_ASSERT(condition, message) assert((condition) && message)
#endif #endif
@@ -3839,10 +3851,27 @@ operator"" _a(const char *s, std::size_t) { return {s}; }
inline internal::UdlArg<wchar_t> inline internal::UdlArg<wchar_t>
operator"" _a(const wchar_t *s, std::size_t) { return {s}; } operator"" _a(const wchar_t *s, std::size_t) { return {s}; }
# if FMT_UDL_TEMPLATE
template <typename Char, Char... CHARS>
struct udl_formatter {
template <typename... Args>
std::string operator()(const Args &... args) const {
const Char s[] = {CHARS...};
// TODO
return s;
}
};
template <typename Char, Char... CHARS>
constexpr auto operator""_format() {
return udl_formatter<Char, CHARS...>();
}
# endif
} // inline namespace literals } // inline namespace literals
} // namespace fmt } // namespace fmt
#endif // FMT_USE_USER_DEFINED_LITERALS #endif // FMT_USE_USER_DEFINED_LITERALS
#ifdef FMT_HEADER_ONLY #ifdef FMT_HEADER_ONLY
# define FMT_FUNC inline # define FMT_FUNC inline
# include "format.cc" # include "format.cc"

6
test/format-test.cc
View File

@@ -1812,3 +1812,9 @@ TEST(FormatTest, ConstexprParseFormatString) {
static_assert(parse_string("{foo}"), ""); static_assert(parse_string("{foo}"), "");
static_assert(parse_string("{:}"), ""); static_assert(parse_string("{:}"), "");
} }
#if FMT_UDL_TEMPLATE
TEST(FormatTest, UdlTemplate) {
EXPECT_EQ("foo", "foo"_format());
}
#endif