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

Improve error reporting

Browse Source
This commit is contained in:
Aamr El Kazdadi 2019-12-08 03:46:55 +01:00
parent 95dfdc6cc4
commit f6ac897b72
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/fmt/core.h
View File

@ -809,7 +809,9 @@ template <typename Context> class value {
private: private:
// Formats an argument of a custom type, such as a user-defined class. // Formats an argument of a custom type, such as a user-defined class.
template <typename T, typename Formatter> template <typename T, typename Formatter,
FMT_ENABLE_IF(has_formatter<T, Context>::value ||
has_fallback_formatter<T, Context>::value)>
static void format_custom_arg( static void format_custom_arg(
const void* arg, basic_format_parse_context<char_type>& parse_ctx, const void* arg, basic_format_parse_context<char_type>& parse_ctx,
Context& ctx) { Context& ctx) {
@ -817,6 +819,16 @@ template <typename Context> class value {
parse_ctx.advance_to(f.parse(parse_ctx)); parse_ctx.advance_to(f.parse(parse_ctx));
ctx.advance_to(f.format(*static_cast<const T*>(arg), ctx)); ctx.advance_to(f.format(*static_cast<const T*>(arg), ctx));
} }
template <typename T, typename Formatter,
FMT_ENABLE_IF(!has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)>
static void format_custom_arg(
const void* arg, basic_format_parse_context<char_type>& parse_ctx,
Context& ctx) {
(void)arg;
(void)parse_ctx;
(void)ctx;
}
}; };
template <typename Context, typename T> template <typename Context, typename T>
@ -828,6 +840,14 @@ enum { long_short = sizeof(long) == sizeof(int) };
using long_type = conditional_t<long_short, int, long long>; using long_type = conditional_t<long_short, int, long long>;
using ulong_type = conditional_t<long_short, unsigned, unsigned long long>; using ulong_type = conditional_t<long_short, unsigned, unsigned long long>;
template <typename From, typename... To> struct is_convertible_to_any {};
template <typename From>
struct is_convertible_to_any<From> : std::false_type {};
template <typename From, typename FirstTo, typename... To>
struct is_convertible_to_any<From, FirstTo, To...>
: conditional_t<std::is_convertible<From, FirstTo>::value, std::true_type,
is_convertible_to_any<From, To...>> {};
// Maps formatting arguments to core types. // Maps formatting arguments to core types.
template <typename Context> struct arg_mapper { template <typename Context> struct arg_mapper {
using char_type = typename Context::char_type; using char_type = typename Context::char_type;
@ -878,8 +898,7 @@ template <typename Context> struct arg_mapper {
FMT_ENABLE_IF( FMT_ENABLE_IF(
std::is_constructible<std_string_view<char_type>, T>::value && std::is_constructible<std_string_view<char_type>, T>::value &&
!std::is_constructible<basic_string_view<char_type>, T>::value && !std::is_constructible<basic_string_view<char_type>, T>::value &&
!is_string<T>::value && !is_string<T>::value && !has_formatter<T, Context>::value &&
!has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)> !has_fallback_formatter<T, Context>::value)>
FMT_CONSTEXPR basic_string_view<char_type> map(const T& val) { FMT_CONSTEXPR basic_string_view<char_type> map(const T& val) {
return std_string_view<char_type>(val); return std_string_view<char_type>(val);
@ -923,6 +942,32 @@ template <typename Context> struct arg_mapper {
return val; return val;
} }
template <
typename T,
FMT_ENABLE_IF(
!is_convertible_to_any<
const T&, signed char, unsigned char, short, unsigned short, int,
unsigned, long, unsigned long, long long, unsigned long long,
int128_t, uint128_t, bool, float, double, long double, char_type*,
const char_type*, const char*, const signed char*,
const unsigned char*, void*, const void*,
std::nullptr_t>::value &&
!std::is_constructible<basic_string_view<char_type>, T>::value &&
!std::is_constructible<std_string_view<char_type>, T>::value &&
!is_string<T>::value && !is_char<T>::value &&
!std::is_enum<T>::value && !has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)>
FMT_CONSTEXPR const T& map(const T& val) {
static_assert(
has_formatter<T, Context>::value ||
has_fallback_formatter<T, Context>::value,
"Cannot format argument. To enable the use of ostream operator<< "
"include fmt/ostream.h. Otherwise specialize the formatter<T> struct "
"template and implement parse and format methods.");
return val;
}
template <typename T> template <typename T>
FMT_CONSTEXPR const named_arg_base<char_type>& map( FMT_CONSTEXPR const named_arg_base<char_type>& map(
const named_arg<T, char_type>& val) { const named_arg<T, char_type>& val) {