feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Simplify format string checks

Browse Source
This commit is contained in:
Victor Zverovich
2020-07-19 08:42:02 -07:00
parent d615137ca0
commit 9f0c003371
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/color.h
View File

@ -496,7 +496,7 @@ void vformat_to(basic_memory_buffer<Char>& buf, const text_style& ts,
template <typename S, typename Char = char_t<S>> template <typename S, typename Char = char_t<S>>
void vprint(std::FILE* f, const text_style& ts, const S& format, void vprint(std::FILE* f, const text_style& ts, const S& format,
basic_format_args<buffer_context<Char>> args) { basic_format_args<buffer_context<type_identity_t<Char>>> args) {
basic_memory_buffer<Char> buf; basic_memory_buffer<Char> buf;
detail::vformat_to(buf, ts, to_string_view(format), args); detail::vformat_to(buf, ts, to_string_view(format), args);
buf.push_back(Char(0)); buf.push_back(Char(0));
@ -514,10 +514,8 @@ template <typename S, typename... Args,
FMT_ENABLE_IF(detail::is_string<S>::value)> FMT_ENABLE_IF(detail::is_string<S>::value)>
void print(std::FILE* f, const text_style& ts, const S& format_str, void print(std::FILE* f, const text_style& ts, const S& format_str,
const Args&... args) { const Args&... args) {
detail::check_format_string<Args...>(format_str); vprint(f, ts, format_str,
using context = buffer_context<char_t<S>>; detail::make_args_checked<Args...>(format_str, args...));
format_arg_store<context, Args...> as{args...};
vprint(f, ts, format_str, basic_format_args<context>(as));
} }
/** /**

9
include/fmt/format.h
View File

@ -3503,10 +3503,8 @@ template <typename S, typename... Args, size_t SIZE = inline_buffer_size,
typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>> typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
inline typename buffer_context<Char>::iterator format_to( inline typename buffer_context<Char>::iterator format_to(
basic_memory_buffer<Char, SIZE>& buf, const S& format_str, Args&&... args) { basic_memory_buffer<Char, SIZE>& buf, const S& format_str, Args&&... args) {
detail::check_format_string<Args...>(format_str); const auto& vargs = detail::make_args_checked<Args...>(format_str, args...);
using context = buffer_context<Char>; return detail::vformat_to(buf, to_string_view(format_str), vargs);
return detail::vformat_to(buf, to_string_view(format_str),
make_format_args<context>(args...));
} }
template <typename OutputIt, typename Char = char> template <typename OutputIt, typename Char = char>
@ -3604,8 +3602,7 @@ template <typename Char, Char... CHARS> class udl_formatter {
template <typename... Args> template <typename... Args>
std::basic_string<Char> operator()(Args&&... args) const { std::basic_string<Char> operator()(Args&&... args) const {
static FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'}; static FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'};
check_format_string<remove_cvref_t<Args>...>(FMT_STRING(s)); return format(FMT_STRING(s), std::forward<Args>(args)...);
return format(s, std::forward<Args>(args)...);
} }
}; };
# else # else

18
include/fmt/locale.h
View File

@ -55,10 +55,13 @@ template <typename S, typename OutputIt, typename... Args,
detail::is_output_iterator<OutputIt>::value, char_t<S>>> detail::is_output_iterator<OutputIt>::value, char_t<S>>>
inline OutputIt vformat_to( inline OutputIt vformat_to(
OutputIt out, const std::locale& loc, const S& format_str, OutputIt out, const std::locale& loc, const S& format_str,
format_args_t<type_identity_t<OutputIt>, Char> args) { basic_format_args<buffer_context<type_identity_t<Char>>> args) {
using af = detail::arg_formatter<OutputIt, Char>; decltype(detail::get_buffer<Char>(out)) buf(detail::get_buffer_init(out));
return vformat_to<af>(out, to_string_view(format_str), args, using af =
detail::locale_ref(loc)); detail::arg_formatter<typename buffer_context<Char>::iterator, Char>;
vformat_to<af>(detail::buffer_appender<Char>(buf), to_string_view(format_str),
args, detail::locale_ref(loc));
return detail::get_iterator(buf);
} }
template <typename OutputIt, typename S, typename... Args, template <typename OutputIt, typename S, typename... Args,
@ -66,11 +69,8 @@ template <typename OutputIt, typename S, typename... Args,
detail::is_string<S>::value)> detail::is_string<S>::value)>
inline OutputIt format_to(OutputIt out, const std::locale& loc, inline OutputIt format_to(OutputIt out, const std::locale& loc,
const S& format_str, Args&&... args) { const S& format_str, Args&&... args) {
detail::check_format_string<Args...>(format_str); const auto& vargs = detail::make_args_checked<Args...>(format_str, args...);
using context = format_context_t<OutputIt, char_t<S>>; return vformat_to(out, loc, to_string_view(format_str), vargs);
format_arg_store<context, Args...> as{args...};
return vformat_to(out, loc, to_string_view(format_str),
basic_format_args<context>(as));
} }
FMT_END_NAMESPACE FMT_END_NAMESPACE