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

Minor cleanup

Browse Source
This commit is contained in:
Victor Zverovich
2024-09-01 13:29:12 -07:00
parent 7c66216008
commit 7e3aa6d982
1 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
include/fmt/base.h
View File

@ -216,15 +216,15 @@
# define FMT_DEPRECATED /* deprecated */ # define FMT_DEPRECATED /* deprecated */
#endif #endif
#ifndef FMT_NO_UNIQUE_ADDRESS #ifdef FMT_NO_UNIQUE_ADDRESS
# if FMT_CPLUSPLUS >= 202002L // Use the provided definition.
# if FMT_HAS_CPP_ATTRIBUTE(no_unique_address) #elif FMT_CPLUSPLUS < 202002L
# define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]] // Not supported.
#elif FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
# define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485). // VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485).
# elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION #elif FMT_MSC_VERSION >= 1929 && !FMT_CLANG_VERSION
# define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]] # define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
# endif
# endif
#endif #endif
#ifndef FMT_NO_UNIQUE_ADDRESS #ifndef FMT_NO_UNIQUE_ADDRESS
# define FMT_NO_UNIQUE_ADDRESS # define FMT_NO_UNIQUE_ADDRESS
@ -633,14 +633,31 @@ template <typename Char> class basic_string_view {
} }
}; };
FMT_EXPORT FMT_EXPORT using string_view = basic_string_view<char>;
using string_view = basic_string_view<char>;
/// Specifies if `T` is a character type. Can be specialized by users. /// Specifies if `T` is a character type. Can be specialized by users.
FMT_EXPORT
template <typename T> struct is_char : std::false_type {}; template <typename T> struct is_char : std::false_type {};
template <> struct is_char<char> : std::true_type {}; template <> struct is_char<char> : std::true_type {};
template <typename T> class basic_appender;
class context;
template <typename OutputIt, typename Char> class generic_context;
template <typename Char>
using buffered_context =
conditional_t<std::is_same<Char, char>::value, context,
generic_context<basic_appender<Char>, Char>>;
template <typename Context> struct arg_mapper;
FMT_EXPORT template <typename Context> class basic_format_arg;
FMT_EXPORT template <typename Context> class basic_format_args;
FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
// A separate type would result in shorter symbols but break ABI compatibility
// between clang and gcc on ARM (#1919).
using format_args = basic_format_args<context>;
namespace detail { namespace detail {
// Constructs fmt::basic_string_view<Char> from types implicitly convertible // Constructs fmt::basic_string_view<Char> from types implicitly convertible
@ -747,6 +764,47 @@ enum {
cstring_set = set(type::cstring_type), cstring_set = set(type::cstring_type),
pointer_set = set(type::pointer_type) pointer_set = set(type::pointer_type)
}; };
struct view {};
template <typename Char, typename T> struct named_arg : view {
const Char* name;
const T& value;
named_arg(const Char* n, const T& v) : name(n), value(v) {}
};
template <typename Char> struct named_arg_info {
const Char* name;
int id;
};
template <typename T> struct is_named_arg : std::false_type {};
template <typename T> struct is_statically_named_arg : std::false_type {};
template <typename Char, typename T>
struct is_named_arg<named_arg<Char, T>> : std::true_type {};
template <typename Char, typename T>
auto unwrap_named_arg(const named_arg<Char, T>& arg) -> const T& {
return arg.value;
}
template <typename T,
FMT_ENABLE_IF(!is_named_arg<remove_reference_t<T>>::value)>
auto unwrap_named_arg(T&& value) -> T&& {
return value;
}
template <bool B = false> constexpr auto count() -> size_t { return B ? 1 : 0; }
template <bool B1, bool B2, bool... Tail> constexpr auto count() -> size_t {
return (B1 ? 1 : 0) + count<B2, Tail...>();
}
template <typename... Args> constexpr auto count_named_args() -> size_t {
return count<is_named_arg<Args>::value...>();
}
template <typename... Args> constexpr auto count_static_named_args() -> size_t {
return count<is_statically_named_arg<Args>::value...>();
}
} // namespace detail } // namespace detail
/// Reports a format error at compile time or, via a `format_error` exception, /// Reports a format error at compile time or, via a `format_error` exception,
@ -1768,9 +1826,8 @@ FMT_CONSTEXPR void parse_context<Char>::do_check_arg_id(int id) {
// formatting has its own validation. // formatting has its own validation.
if (detail::is_constant_evaluated() && if (detail::is_constant_evaluated() &&
(!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) { (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
using context = detail::compile_parse_context<Char>; auto ctx = static_cast<detail::compile_parse_context<Char>*>(this);
if (id >= static_cast<context*>(this)->num_args()) if (id >= ctx->num_args()) report_error("argument not found");
report_error("argument not found");
} }
} }
@ -1778,29 +1835,11 @@ template <typename Char>
FMT_CONSTEXPR void parse_context<Char>::check_dynamic_spec(int arg_id) { FMT_CONSTEXPR void parse_context<Char>::check_dynamic_spec(int arg_id) {
if (detail::is_constant_evaluated() && if (detail::is_constant_evaluated() &&
(!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) { (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 1200)) {
using context = detail::compile_parse_context<Char>; auto ctx = static_cast<detail::compile_parse_context<Char>*>(this);
static_cast<context*>(this)->check_dynamic_spec(arg_id); ctx->check_dynamic_spec(arg_id);
} }
} }
FMT_EXPORT template <typename Context> class basic_format_arg;
FMT_EXPORT template <typename Context> class basic_format_args;
FMT_EXPORT template <typename Context> class dynamic_format_arg_store;
class context;
template <typename OutputIt, typename Char> class generic_context;
template <typename T> class basic_appender;
template <typename Char>
using buffered_context =
conditional_t<std::is_same<Char, char>::value, context,
generic_context<basic_appender<Char>, Char>>;
// A separate type would result in shorter symbols but break ABI compatibility
// between clang and gcc on ARM (#1919).
using format_args = basic_format_args<context>;
// A formatter for objects of type T. // A formatter for objects of type T.
FMT_EXPORT FMT_EXPORT
template <typename T, typename Char = char, typename Enable = void> template <typename T, typename Char = char, typename Enable = void>
@ -1929,47 +1968,6 @@ auto get_iterator(buffer<T>&, OutputIt out) -> OutputIt {
return out; return out;
} }
struct view {};
template <typename Char, typename T> struct named_arg : view {
const Char* name;
const T& value;
named_arg(const Char* n, const T& v) : name(n), value(v) {}
};
template <typename Char> struct named_arg_info {
const Char* name;
int id;
};
template <typename T> struct is_named_arg : std::false_type {};
template <typename T> struct is_statically_named_arg : std::false_type {};
template <typename Char, typename T>
struct is_named_arg<named_arg<Char, T>> : std::true_type {};
template <typename Char, typename T>
auto unwrap_named_arg(const named_arg<Char, T>& arg) -> const T& {
return arg.value;
}
template <typename T,
FMT_ENABLE_IF(!is_named_arg<remove_reference_t<T>>::value)>
auto unwrap_named_arg(T&& value) -> T&& {
return value;
}
template <bool B = false> constexpr auto count() -> size_t { return B ? 1 : 0; }
template <bool B1, bool B2, bool... Tail> constexpr auto count() -> size_t {
return (B1 ? 1 : 0) + count<B2, Tail...>();
}
template <typename... Args> constexpr auto count_named_args() -> size_t {
return count<is_named_arg<Args>::value...>();
}
template <typename... Args> constexpr auto count_static_named_args() -> size_t {
return count<is_statically_named_arg<Args>::value...>();
}
struct unformattable {}; struct unformattable {};
struct unformattable_char : unformattable {}; struct unformattable_char : unformattable {};
struct unformattable_pointer : unformattable {}; struct unformattable_pointer : unformattable {};