mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-10-02 04:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize argument capture

Browse Source
This commit is contained in:
Victor Zverovich 2018-09-08 13:09:44 -07:00
parent a3ba6b4f62
commit 918bb1ce8f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/fmt/core.h
View File

@ -576,12 +576,14 @@ class value {
} }
}; };
template <typename Context, type TYPE> // Value initializer used to delay conversion to value and reduce memory churn.
struct typed_value : value<Context> { template <typename Context, typename T, type TYPE>
struct init {
T val;
static const type type_tag = TYPE; static const type type_tag = TYPE;
template <typename T> FMT_CONSTEXPR init(const T &v) : val(v) {}
FMT_CONSTEXPR typed_value(const T &val) : value<Context>(val) {} FMT_CONSTEXPR operator value<Context>() const { return value<Context>(val); }
}; };
template <typename Context, typename T> template <typename Context, typename T>
@ -589,15 +591,13 @@ FMT_CONSTEXPR basic_format_arg<Context> make_arg(const T &value);
#define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \ #define FMT_MAKE_VALUE(TAG, ArgType, ValueType) \
template <typename C> \ template <typename C> \
FMT_CONSTEXPR typed_value<C, TAG> make_value(ArgType val) { \ FMT_CONSTEXPR init<C, ValueType, TAG> make_value(ArgType val) { \
return static_cast<ValueType>(val); \ return static_cast<ValueType>(val); \
} }
#define FMT_MAKE_VALUE_SAME(TAG, Type) \ #define FMT_MAKE_VALUE_SAME(TAG, Type) \
template <typename C> \ template <typename C> \
FMT_CONSTEXPR typed_value<C, TAG> make_value(Type val) { \ FMT_CONSTEXPR init<C, Type, TAG> make_value(Type val) { return val; }
return val; \
}
FMT_MAKE_VALUE(bool_type, bool, int) FMT_MAKE_VALUE(bool_type, bool, int)
FMT_MAKE_VALUE(int_type, short, int) FMT_MAKE_VALUE(int_type, short, int)
@ -625,7 +625,7 @@ FMT_MAKE_VALUE(char_type, char, int)
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) #if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
template <typename C> template <typename C>
inline typed_value<C, char_type> make_value(wchar_t val) { inline init<C, int, char_type> make_value(wchar_t val) {
require_wchar<typename C::char_type>(); require_wchar<typename C::char_type>();
return static_cast<int>(val); return static_cast<int>(val);
} }
@ -672,13 +672,13 @@ typename std::enable_if<!std::is_same<T, typename C::char_type>::value>::type
template <typename C, typename T> template <typename C, typename T>
inline typename std::enable_if< inline typename std::enable_if<
std::is_enum<T>::value && convert_to_int<T, typename C::char_type>::value, std::is_enum<T>::value && convert_to_int<T, typename C::char_type>::value,
typed_value<C, int_type>>::type init<C, int, int_type>>::type
make_value(const T &val) { return static_cast<int>(val); } make_value(const T &val) { return static_cast<int>(val); }
template <typename C, typename T, typename Char = typename C::char_type> template <typename C, typename T, typename Char = typename C::char_type>
inline typename std::enable_if< inline typename std::enable_if<
std::is_constructible<basic_string_view<Char>, T>::value, std::is_constructible<basic_string_view<Char>, T>::value,
typed_value<C, string_type>>::type init<C, basic_string_view<Char>, string_type>>::type
make_value(const T &val) { return basic_string_view<Char>(val); } make_value(const T &val) { return basic_string_view<Char>(val); }
template <typename C, typename T, typename Char = typename C::char_type> template <typename C, typename T, typename Char = typename C::char_type>
@ -688,11 +688,11 @@ inline typename std::enable_if<
!std::is_constructible<basic_string_view<Char>, T>::value, !std::is_constructible<basic_string_view<Char>, T>::value,
// Implicit conversion to std::string is not handled here because it's // Implicit conversion to std::string is not handled here because it's
// unsafe: https://github.com/fmtlib/fmt/issues/729 // unsafe: https://github.com/fmtlib/fmt/issues/729
typed_value<C, custom_type>>::type init<C, const T &, custom_type>>::type
make_value(const T &val) { return val; } make_value(const T &val) { return val; }
template <typename C, typename T> template <typename C, typename T>
typed_value<C, named_arg_type> init<C, const void*, named_arg_type>
make_value(const named_arg<T, typename C::char_type> &val) { make_value(const named_arg<T, typename C::char_type> &val) {
basic_format_arg<C> arg = make_arg<C>(val.value); basic_format_arg<C> arg = make_arg<C>(val.value);
std::memcpy(val.data, &arg, sizeof(arg)); std::memcpy(val.data, &arg, sizeof(arg));

2
test/core-test.cc
View File

@ -448,7 +448,7 @@ struct custom_context {
TEST(UtilTest, MakeValueWithCustomFormatter) { TEST(UtilTest, MakeValueWithCustomFormatter) {
::Test t; ::Test t;
fmt::internal::value<custom_context> arg = fmt::internal::value<custom_context> arg =
fmt::internal::make_value<custom_context>(t); fmt::internal::make_value<custom_context>(t);
custom_context ctx = {false}; custom_context ctx = {false};
arg.custom.format(&t, ctx); arg.custom.format(&t, ctx);
EXPECT_TRUE(ctx.called); EXPECT_TRUE(ctx.called);