Added formatter for std::source_location
This commit is contained in:
parent
5cfd28d476
commit
54eaa8c8f4
@ -38,6 +38,10 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
|
||||||
|
# include <source_location>
|
||||||
|
#endif
|
||||||
|
|
||||||
// GCC 4 does not support FMT_HAS_INCLUDE.
|
// GCC 4 does not support FMT_HAS_INCLUDE.
|
||||||
#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
|
#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
|
||||||
# include <cxxabi.h>
|
# include <cxxabi.h>
|
||||||
@ -228,6 +232,33 @@ struct formatter<std::optional<T>, Char,
|
|||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // __cpp_lib_optional
|
#endif // __cpp_lib_optional
|
||||||
|
|
||||||
|
#ifdef __cpp_lib_source_location
|
||||||
|
FMT_BEGIN_NAMESPACE
|
||||||
|
FMT_EXPORT
|
||||||
|
template <typename Char>
|
||||||
|
struct formatter<std::source_location, Char,
|
||||||
|
std::enable_if_t<is_formattable<Char>::value>> {
|
||||||
|
template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
|
||||||
|
return ctx.begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const std::source_location& loc, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto out = ctx.out();
|
||||||
|
out = detail::write_bytes(out, loc.file_name(), format_specs<Char>());
|
||||||
|
out = detail::write<Char>(out, Char(':'));
|
||||||
|
out = detail::write<Char>(out, loc.line());
|
||||||
|
out = detail::write<Char>(out, Char(':'));
|
||||||
|
out = detail::write<Char>(out, loc.column());
|
||||||
|
out = detail::write<Char>(out, ": ");
|
||||||
|
out = detail::write<Char>(out, loc.function_name());
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
FMT_END_NAMESPACE
|
||||||
|
#endif
|
||||||
|
|
||||||
#if FMT_CPP_LIB_VARIANT
|
#if FMT_CPP_LIB_VARIANT
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|||||||
@ -62,6 +62,16 @@ TEST(std_test, thread_id) {
|
|||||||
EXPECT_FALSE(fmt::format("{}", std::this_thread::get_id()).empty());
|
EXPECT_FALSE(fmt::format("{}", std::this_thread::get_id()).empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __cpp_lib_source_location
|
||||||
|
TEST(std_test, source_location) {
|
||||||
|
std::source_location loc = std::source_location::current();
|
||||||
|
EXPECT_EQ(fmt::format("{}", loc), std::string(loc.file_name()) + ":" +
|
||||||
|
std::to_string(loc.line()) + ":" +
|
||||||
|
std::to_string(loc.column()) + ": " +
|
||||||
|
loc.function_name());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
TEST(std_test, optional) {
|
TEST(std_test, optional) {
|
||||||
#ifdef __cpp_lib_optional
|
#ifdef __cpp_lib_optional
|
||||||
EXPECT_EQ(fmt::format("{}", std::optional<int>{}), "none");
|
EXPECT_EQ(fmt::format("{}", std::optional<int>{}), "none");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user