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

to_string supports types with format_as

Browse Source
This commit is contained in:
Martin Jeřábek 2023-07-27 20:46:43 +02:00
parent f4214ae8dd
commit ffae428ba4
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/format.h
View File

@ -3700,7 +3700,8 @@ template <
bool check = bool check =
std::is_enum<T>::value && !std::is_same<T, Char>::value && std::is_enum<T>::value && !std::is_same<T, Char>::value &&
mapped_type_constant<T, basic_format_context<OutputIt, Char>>::value != mapped_type_constant<T, basic_format_context<OutputIt, Char>>::value !=
type::custom_type, type::custom_type &&
!detail::has_format_as<T>::value,
FMT_ENABLE_IF(check)> FMT_ENABLE_IF(check)>
FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt { FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt {
return write<Char>(out, static_cast<underlying_t<T>>(value)); return write<Char>(out, static_cast<underlying_t<T>>(value));
@ -3745,6 +3746,7 @@ template <typename Char, typename OutputIt, typename T,
FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t< FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
std::is_class<T>::value && !is_string<T>::value && std::is_class<T>::value && !is_string<T>::value &&
!is_floating_point<T>::value && !std::is_same<T, Char>::value && !is_floating_point<T>::value && !std::is_same<T, Char>::value &&
!detail::has_format_as<T>::value &&
!std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map( !std::is_same<T, remove_cvref_t<decltype(arg_mapper<Context>().map(
value))>>::value, value))>>::value,
OutputIt> { OutputIt> {
@ -3754,12 +3756,20 @@ FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t<
template <typename Char, typename OutputIt, typename T, template <typename Char, typename OutputIt, typename T,
typename Context = basic_format_context<OutputIt, Char>> typename Context = basic_format_context<OutputIt, Char>>
FMT_CONSTEXPR auto write(OutputIt out, const T& value) FMT_CONSTEXPR auto write(OutputIt out, const T& value)
-> enable_if_t<mapped_type_constant<T, Context>::value == type::custom_type, -> enable_if_t<mapped_type_constant<T, Context>::value == type::custom_type &&
!detail::has_format_as<T>::value,
OutputIt> { OutputIt> {
auto ctx = Context(out, {}, {}); auto ctx = Context(out, {}, {});
return typename Context::template formatter_type<T>().format(value, ctx); return typename Context::template formatter_type<T>().format(value, ctx);
} }
template <typename Char, typename OutputIt, typename T>
FMT_CONSTEXPR auto write(OutputIt out, const T& value)
-> enable_if_t<detail::has_format_as<T>::value,
OutputIt> {
return write<Char>(out, format_as(value));
}
// An argument visitor that formats the argument and writes it via the output // An argument visitor that formats the argument and writes it via the output
// iterator. It's a class and not a generic lambda for compatibility with C++11. // iterator. It's a class and not a generic lambda for compatibility with C++11.
template <typename Char> struct default_arg_formatter { template <typename Char> struct default_arg_formatter {

7
test/format-test.cc
View File

@ -2140,6 +2140,13 @@ TEST(format_test, format_as) {
EXPECT_EQ(fmt::format("{}", test::struct_as_int()), "42"); EXPECT_EQ(fmt::format("{}", test::struct_as_int()), "42");
} }
TEST(format_test, format_as_to_string) {
EXPECT_EQ(fmt::to_string(test::scoped_enum_as_int()), "42");
EXPECT_EQ(fmt::to_string(test::scoped_enum_as_string_view()), "foo");
EXPECT_EQ(fmt::to_string(test::scoped_enum_as_string()), "foo");
EXPECT_EQ(fmt::to_string(test::struct_as_int()), "42");
}
template <typename Char, typename T> bool check_enabled_formatter() { template <typename Char, typename T> bool check_enabled_formatter() {
static_assert(std::is_default_constructible<fmt::formatter<T, Char>>::value, static_assert(std::is_default_constructible<fmt::formatter<T, Char>>::value,
""); "");