mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-15 21:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup chrono formatter

Browse Source
This commit is contained in:
Victor Zverovich 2023-07-20 15:00:59 -07:00
parent e475859042
commit 77e0b0e228
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
include/fmt/chrono.h
View File

@ -2047,40 +2047,40 @@ template <typename Char> struct formatter<weekday, Char> {
template <typename Rep, typename Period, typename Char> template <typename Rep, typename Period, typename Char>
struct formatter<std::chrono::duration<Rep, Period>, Char> { struct formatter<std::chrono::duration<Rep, Period>, Char> {
private: private:
format_specs<Char> specs; format_specs<Char> specs_;
int precision = -1;
using arg_ref_type = detail::arg_ref<Char>; using arg_ref_type = detail::arg_ref<Char>;
arg_ref_type width_ref; arg_ref_type width_ref_;
arg_ref_type precision_ref; arg_ref_type precision_ref_;
bool localized = false; bool localized_ = false;
basic_string_view<Char> format_str; basic_string_view<Char> format_str_;
using duration = std::chrono::duration<Rep, Period>; using duration = std::chrono::duration<Rep, Period>;
using iterator = typename basic_format_parse_context<Char>::iterator;
struct parse_range { struct parse_range {
iterator begin; const Char* begin;
iterator end; const Char* end;
}; };
FMT_CONSTEXPR parse_range do_parse(basic_format_parse_context<Char>& ctx) { FMT_CONSTEXPR parse_range do_parse(basic_format_parse_context<Char>& ctx) {
auto begin = ctx.begin(), end = ctx.end(); auto begin = ctx.begin(), end = ctx.end();
if (begin == end || *begin == '}') return {begin, begin}; if (begin == end || *begin == '}') return {begin, begin};
begin = detail::parse_align(begin, end, specs); begin = detail::parse_align(begin, end, specs_);
if (begin == end) return {begin, begin}; if (begin == end) return {begin, begin};
begin = detail::parse_dynamic_spec(begin, end, specs.width, width_ref, ctx); begin =
detail::parse_dynamic_spec(begin, end, specs_.width, width_ref_, ctx);
if (begin == end) return {begin, begin}; if (begin == end) return {begin, begin};
auto checker = detail::chrono_format_checker(); auto checker = detail::chrono_format_checker();
if (*begin == '.') { if (*begin == '.') {
checker.has_precision_integral = !std::is_floating_point<Rep>::value; checker.has_precision_integral = !std::is_floating_point<Rep>::value;
begin = begin = detail::parse_precision(begin, end, specs_.precision,
detail::parse_precision(begin, end, precision, precision_ref, ctx); precision_ref_, ctx);
} }
if (begin != end && *begin == 'L') { if (begin != end && *begin == 'L') {
++begin; ++begin;
localized = true; localized_ = true;
} }
end = detail::parse_chrono_format(begin, end, checker); end = detail::parse_chrono_format(begin, end, checker);
return {begin, end}; return {begin, end};
@ -2090,7 +2090,7 @@ struct formatter<std::chrono::duration<Rep, Period>, Char> {
FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx) FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
-> decltype(ctx.begin()) { -> decltype(ctx.begin()) {
auto range = do_parse(ctx); auto range = do_parse(ctx);
format_str = basic_string_view<Char>( format_str_ = basic_string_view<Char>(
&*range.begin, detail::to_unsigned(range.end - range.begin)); &*range.begin, detail::to_unsigned(range.end - range.begin));
return range.end; return range.end;
} }
@ -2098,29 +2098,31 @@ struct formatter<std::chrono::duration<Rep, Period>, Char> {
template <typename FormatContext> template <typename FormatContext>
auto format(const duration& d, FormatContext& ctx) const auto format(const duration& d, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
auto specs_copy = specs; auto specs = specs_;
auto precision_copy = precision; auto precision = specs.precision;
auto begin = format_str.begin(), end = format_str.end(); specs.precision = -1;
auto begin = format_str_.begin(), end = format_str_.end();
// As a possible future optimization, we could avoid extra copying if width // As a possible future optimization, we could avoid extra copying if width
// is not specified. // is not specified.
basic_memory_buffer<Char> buf; auto buf = basic_memory_buffer<Char>();
auto out = std::back_inserter(buf); auto out = std::back_inserter(buf);
detail::handle_dynamic_spec<detail::width_checker>(specs_copy.width, detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
width_ref, ctx); ctx);
detail::handle_dynamic_spec<detail::precision_checker>(precision_copy, detail::handle_dynamic_spec<detail::precision_checker>(precision,
precision_ref, ctx); precision_ref_, ctx);
if (begin == end || *begin == '}') { if (begin == end || *begin == '}') {
out = detail::format_duration_value<Char>(out, d.count(), precision_copy); out = detail::format_duration_value<Char>(out, d.count(), precision);
detail::format_duration_unit<Char, Period>(out); detail::format_duration_unit<Char, Period>(out);
} else { } else {
detail::chrono_formatter<FormatContext, decltype(out), Rep, Period> f( using chrono_formatter =
ctx, out, d); detail::chrono_formatter<FormatContext, decltype(out), Rep, Period>;
f.precision = precision_copy; auto f = chrono_formatter(ctx, out, d);
f.localized = localized; f.precision = precision;
f.localized = localized_;
detail::parse_chrono_format(begin, end, f); detail::parse_chrono_format(begin, end, f);
} }
return detail::write( return detail::write(
ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs_copy); ctx.out(), basic_string_view<Char>(buf.data(), buf.size()), specs);
} }
}; };