mirror/magic_enum
1
0
Fork 0
mirror of https://github.com/Neargye/magic_enum.git synced 2026-01-09 23:34:23 +00:00
Code Activity

fix 379 (#382)

Browse source
This commit is contained in:
Daniil Goncharov 2025-02-20 12:37:47 +04:00 • committed by GitHub
parent 61a4f20581
commit ff6e5dd1c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

76
include/magic_enum/magic_enum_format.hpp
View file

@ -35,44 +35,35 @@
#include "magic_enum.hpp" #include "magic_enum.hpp"
#include "magic_enum_flags.hpp" #include "magic_enum_flags.hpp"
#if !defined(MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT) namespace magic_enum::detail {
# define MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT 1
# define MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT_AUTO_DEFINE
#endif
namespace magic_enum::customize { template <typename E, std::enable_if_t<std::is_enum_v<std::decay_t<E>>, int> = 0>
// customize enum to enable/disable automatic std::format std::string format_as(E e) {
template <typename E> using D = std::decay_t<E>;
constexpr bool enum_format_enabled() noexcept { static_assert(std::is_same_v<char, magic_enum::string_view::value_type>, "magic_enum::formatter requires string_view::value_type type same as char.");
return MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT; if constexpr (magic_enum::detail::supported<D>::value) {
if constexpr (magic_enum::detail::subtype_v<D> == magic_enum::detail::enum_subtype::flags) {
if (const auto name = magic_enum::enum_flags_name<D>(e); !name.empty()) {
return {name.data(), name.size()};
}
} else {
if (const auto name = magic_enum::enum_name<D>(e); !name.empty()) {
return {name.data(), name.size()};
}
}
} }
} // magic_enum::customize return std::to_string(magic_enum::enum_integer<D>(e));
}
} // namespace magic_enum::format
#if defined(__cpp_lib_format) #if defined(__cpp_lib_format)
#ifndef MAGIC_ENUM_USE_STD_MODULE
#include <format>
#endif
template <typename E> template <typename E>
struct std::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>> && magic_enum::customize::enum_format_enabled<E>(), char>> : std::formatter<std::string_view, char> { struct std::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>>, char>> : std::formatter<std::string_view, char> {
template <class FormatContext> template <class FormatContext>
auto format(E e, FormatContext& ctx) const { auto format(E e, FormatContext& ctx) const {
static_assert(std::is_same_v<char, string_view::value_type>, "formatter requires string_view::value_type type same as char."); return std::formatter<std::string_view, char>::format(magic_enum::detail::format_as<E>(e), ctx);
using D = std::decay_t<E>;
if constexpr (magic_enum::detail::supported<D>::value) {
if constexpr (magic_enum::detail::subtype_v<D> == magic_enum::detail::enum_subtype::flags) {
if (const auto name = magic_enum::enum_flags_name<D>(e); !name.empty()) {
return formatter<std::string_view, char>::format(std::string_view{name.data(), name.size()}, ctx);
}
} else {
if (const auto name = magic_enum::enum_name<D>(e); !name.empty()) {
return formatter<std::string_view, char>::format(std::string_view{name.data(), name.size()}, ctx);
}
}
}
return formatter<std::string_view, char>::format(std::to_string(magic_enum::enum_integer<D>(e)), ctx);
} }
}; };
@ -80,35 +71,14 @@ struct std::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>> && mag
#if defined(FMT_VERSION) #if defined(FMT_VERSION)
#include <fmt/format.h>
template <typename E> template <typename E>
struct fmt::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>> && magic_enum::customize::enum_format_enabled<E>(), char>> : fmt::formatter<std::string_view> { struct fmt::formatter<E, std::enable_if_t<std::is_enum_v<std::decay_t<E>>, char>> : fmt::formatter<std::string_view, char> {
template <class FormatContext> template <class FormatContext>
auto format(E e, FormatContext& ctx) const { auto format(E e, FormatContext& ctx) const {
static_assert(std::is_same_v<char, string_view::value_type>, "formatter requires string_view::value_type type same as char."); return fmt::formatter<std::string_view, char>::format(magic_enum::detail::format_as<E>(e), ctx);
using D = std::decay_t<E>;
if constexpr (magic_enum::detail::supported<D>::value) {
if constexpr (magic_enum::detail::subtype_v<D> == magic_enum::detail::enum_subtype::flags) {
if (const auto name = magic_enum::enum_flags_name<D>(e); !name.empty()) {
return formatter<std::string_view, char>::format(std::string_view{name.data(), name.size()}, ctx);
}
} else {
if (const auto name = magic_enum::enum_name<D>(e); !name.empty()) {
return formatter<std::string_view, char>::format(std::string_view{name.data(), name.size()}, ctx);
}
}
}
return formatter<std::string_view, char>::format(std::to_string(magic_enum::enum_integer<D>(e)), ctx);
} }
}; };
#endif #endif
#if defined(MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT_AUTO_DEFINE)
# undef MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT
# undef MAGIC_ENUM_DEFAULT_ENABLE_ENUM_FORMAT_AUTO_DEFINE
#endif
#endif // NEARGYE_MAGIC_ENUM_FORMAT_HPP #endif // NEARGYE_MAGIC_ENUM_FORMAT_HPP

1
test/test.cpp
View file

@ -1176,6 +1176,7 @@ TEST_CASE("multdimensional-switch-case") {
#if defined(__cpp_lib_format) #if defined(__cpp_lib_format)
#include <format>
#include <magic_enum/magic_enum_format.hpp> #include <magic_enum/magic_enum_format.hpp>
TEST_CASE("format-base") { TEST_CASE("format-base") {