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

Simplify variadic functions further

Browse Source
This commit is contained in:
Victor Zverovich
2018-09-30 22:19:32 -07:00
parent 2d7d0835d7
commit c3538a1eee
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/fmt/core.h
View File

@@ -1068,8 +1068,6 @@ class format_arg_store {
format_arg_store(const Args &... args) format_arg_store(const Args &... args)
: data_{internal::make_arg<IS_PACKED, Context>(args)...} {} : data_{internal::make_arg<IS_PACKED, Context>(args)...} {}
#endif #endif
basic_format_args<Context> operator*() const { return *this; }
}; };
#if !FMT_USE_CONSTEXPR11 #if !FMT_USE_CONSTEXPR11
@@ -1303,6 +1301,18 @@ template <typename... Args, typename S>
typename std::enable_if<is_compile_string<S>::value>::type typename std::enable_if<is_compile_string<S>::value>::type
check_format_string(S); check_format_string(S);
template <typename S, typename... Args>
struct checked_format_args: format_arg_store<
typename buffer_context<FMT_CHAR(S)>::type, Args...> {
checked_format_args(const S &format_str, const Args &... args):
format_arg_store<
typename buffer_context<FMT_CHAR(S)>::type, Args...>(args...) {
internal::check_format_string<Args...>(format_str);
}
basic_format_args<typename buffer_context<FMT_CHAR(S)>::type>
operator*() const { return *this; }
};
template <typename Char> template <typename Char>
std::basic_string<Char> vformat( std::basic_string<Char> vformat(
basic_string_view<Char> format_str, basic_string_view<Char> format_str,
@@ -1350,10 +1360,9 @@ inline typename std::enable_if<
std::back_insert_iterator<Container>>::type std::back_insert_iterator<Container>>::type
format_to(std::back_insert_iterator<Container> out, const S &format_str, format_to(std::back_insert_iterator<Container> out, const S &format_str,
const Args &... args) { const Args &... args) {
internal::check_format_string<Args...>(format_str); return vformat_to(
format_arg_store< out, basic_string_view<FMT_CHAR(S)>(format_str),
typename buffer_context<FMT_CHAR(S)>::type, Args...> as(args...); *internal::checked_format_args<S, Args...>(format_str, args...));
return vformat_to(out, basic_string_view<FMT_CHAR(S)>(format_str), as);
} }
template <typename S, typename Char = FMT_CHAR(S)> template <typename S, typename Char = FMT_CHAR(S)>
@@ -1377,13 +1386,9 @@ inline std::basic_string<Char> vformat(
template <typename S, typename... Args> template <typename S, typename... Args>
inline std::basic_string<FMT_CHAR(S)> format( inline std::basic_string<FMT_CHAR(S)> format(
const S &format_str, const Args &... args) { const S &format_str, const Args &... args) {
internal::check_format_string<Args...>(format_str); return internal::vformat(
// This should be just basic_string_view<FMT_CHAR(S)>(format_str),
// return vformat(format_str, make_format_args(args...)); *internal::checked_format_args<S, Args...>(format_str, args...));
// but gcc has trouble optimizing the latter, so break it down.
format_arg_store<
typename buffer_context<FMT_CHAR(S)>::type, Args...> as(args...);
return internal::vformat(basic_string_view<FMT_CHAR(S)>(format_str), *as);
} }
FMT_API void vprint(std::FILE *f, string_view format_str, format_args args); FMT_API void vprint(std::FILE *f, string_view format_str, format_args args);
@@ -1403,10 +1408,8 @@ FMT_API void vprint(std::FILE *f, wstring_view format_str, wformat_args args);
template <typename S, typename... Args> template <typename S, typename... Args>
inline typename std::enable_if<internal::is_format_string<S>::value>::type inline typename std::enable_if<internal::is_format_string<S>::value>::type
print(std::FILE *f, const S &format_str, const Args &... args) { print(std::FILE *f, const S &format_str, const Args &... args) {
internal::check_format_string<Args...>(format_str); vprint(f, basic_string_view<FMT_CHAR(S)>(format_str),
format_arg_store< *internal::checked_format_args<S, Args...>(format_str, args...));
typename buffer_context<FMT_CHAR(S)>::type, Args...> as(args...);
vprint(f, basic_string_view<FMT_CHAR(S)>(format_str), as);
} }
FMT_API void vprint(string_view format_str, format_args args); FMT_API void vprint(string_view format_str, format_args args);
@@ -1424,10 +1427,8 @@ FMT_API void vprint(wstring_view format_str, wformat_args args);
template <typename S, typename... Args> template <typename S, typename... Args>
inline typename std::enable_if<internal::is_format_string<S>::value>::type inline typename std::enable_if<internal::is_format_string<S>::value>::type
print(const S &format_str, const Args &... args) { print(const S &format_str, const Args &... args) {
internal::check_format_string<Args...>(format_str); vprint(basic_string_view<FMT_CHAR(S)>(format_str),
format_arg_store< *internal::checked_format_args<S, Args...>(format_str, args...));
typename buffer_context<FMT_CHAR(S)>::type, Args...> as(args...);
vprint(basic_string_view<FMT_CHAR(S)>(format_str), as);
} }
FMT_END_NAMESPACE FMT_END_NAMESPACE