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

Different implementation of FMT_STATICALLY_WIDEN

Browse Source
This commit is contained in:
Barry Revzin 2022-07-27 07:11:45 -05:00
parent 3a560b7dd9
commit 2e281620fc
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/fmt/ranges.h
View File

@ -319,9 +319,13 @@ inline FMT_CONSTEXPR const wchar_t* choose_literal(
return literal; return literal;
} }
#define FMT_STATICALLY_WIDEN(CharT, Literal) \ template <typename CharT, CharT... C> struct string_literal {
::fmt::detail::choose_literal(std::is_same<char, CharT>(), Literal, \ static constexpr CharT value[] = {C...};
L##Literal) constexpr operator basic_string_view<CharT>() const {
return {value, sizeof...(C)};
}
};
} // namespace detail } // namespace detail
template <typename T> struct is_tuple_like { template <typename T> struct is_tuple_like {
@ -339,9 +343,11 @@ struct formatter<TupleT, Char,
enable_if_t<fmt::is_tuple_like<TupleT>::value && enable_if_t<fmt::is_tuple_like<TupleT>::value &&
fmt::is_tuple_formattable<TupleT, Char>::value>> { fmt::is_tuple_formattable<TupleT, Char>::value>> {
private: private:
basic_string_view<Char> separator_ = FMT_STATICALLY_WIDEN(Char, ", "); basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
basic_string_view<Char> opening_bracket_ = FMT_STATICALLY_WIDEN(Char, "("); basic_string_view<Char> opening_bracket_ =
basic_string_view<Char> closing_bracket_ = FMT_STATICALLY_WIDEN(Char, ")"); detail::string_literal<Char, '('>{};
basic_string_view<Char> closing_bracket_ =
detail::string_literal<Char, ')'>{};
// C++11 generic lambda for format(). // C++11 generic lambda for format().
template <typename FormatContext> struct format_each { template <typename FormatContext> struct format_each {
@ -435,9 +441,11 @@ struct range_formatter<
private: private:
detail::range_formatter_type<Char, T> underlying_; detail::range_formatter_type<Char, T> underlying_;
bool custom_specs_ = false; bool custom_specs_ = false;
basic_string_view<Char> separator_ = FMT_STATICALLY_WIDEN(Char, ", "); basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
basic_string_view<Char> opening_bracket_ = FMT_STATICALLY_WIDEN(Char, "["); basic_string_view<Char> opening_bracket_ =
basic_string_view<Char> closing_bracket_ = FMT_STATICALLY_WIDEN(Char, "]"); detail::string_literal<Char, '['>{};
basic_string_view<Char> closing_bracket_ =
detail::string_literal<Char, ']'>{};
template <class U> template <class U>
FMT_CONSTEXPR static auto maybe_set_debug_format(U& u, int) FMT_CONSTEXPR static auto maybe_set_debug_format(U& u, int)
@ -545,15 +553,16 @@ struct range_default_formatter<
FMT_CONSTEXPR range_default_formatter() { init(range_format_constant<K>()); } FMT_CONSTEXPR range_default_formatter() { init(range_format_constant<K>()); }
FMT_CONSTEXPR void init(range_format_constant<range_format::set>) { FMT_CONSTEXPR void init(range_format_constant<range_format::set>) {
underlying_.set_brackets(FMT_STATICALLY_WIDEN(Char, "{"), underlying_.set_brackets(detail::string_literal<Char, '{'>{},
FMT_STATICALLY_WIDEN(Char, "}")); detail::string_literal<Char, '}'>{});
} }
FMT_CONSTEXPR void init(range_format_constant<range_format::map>) { FMT_CONSTEXPR void init(range_format_constant<range_format::map>) {
underlying_.set_brackets(FMT_STATICALLY_WIDEN(Char, "{"), underlying_.set_brackets(detail::string_literal<Char, '{'>{},
FMT_STATICALLY_WIDEN(Char, "}")); detail::string_literal<Char, '}'>{});
underlying_.underlying().set_brackets({}, {}); underlying_.underlying().set_brackets({}, {});
underlying_.underlying().set_separator(FMT_STATICALLY_WIDEN(Char, ": ")); underlying_.underlying().set_separator(
detail::string_literal<Char, ':', ' '>{});
} }
FMT_CONSTEXPR void init(range_format_constant<range_format::sequence>) {} FMT_CONSTEXPR void init(range_format_constant<range_format::sequence>) {}