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

Cleanup

Browse Source
This commit is contained in:
Vladislav Shchapov
2021-10-17 01:27:10 +05:00
committed by Victor Zverovich
parent aeb54b0dd9
commit 7a604cdd98
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/chrono.h
View File

@@ -1399,11 +1399,9 @@ struct tm_format_checker : null_chrono_spec_handler<tm_format_checker> {
FMT_CONSTEXPR void on_tz_name() {} FMT_CONSTEXPR void on_tz_name() {}
}; };
template <typename FormatContext, typename OutputIt> class tm_writer { template <typename OutputIt, typename Char> class tm_writer {
using char_type = typename FormatContext::char_type;
static constexpr int days_per_week = 7; static constexpr int days_per_week = 7;
FormatContext& ctx_;
OutputIt out_; OutputIt out_;
const std::tm& tm_; const std::tm& tm_;
@@ -1480,7 +1478,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
to_unsigned(to_nonnegative_int(year, max_value<int>())); to_unsigned(to_nonnegative_int(year, max_value<int>()));
const int num_digits = count_digits(n); const int num_digits = count_digits(n);
if (width > num_digits) out_ = std::fill_n(out_, width - num_digits, '0'); if (width > num_digits) out_ = std::fill_n(out_, width - num_digits, '0');
out_ = format_decimal<char_type>(out_, n, num_digits).end; out_ = format_decimal<Char>(out_, n, num_digits).end;
} }
} }
@@ -1488,7 +1486,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
// By prepending an extra space we can distinguish an empty result that // By prepending an extra space we can distinguish an empty result that
// indicates insufficient buffer size from a guaranteed non-empty result // indicates insufficient buffer size from a guaranteed non-empty result
// https://github.com/fmtlib/fmt/issues/2238 // https://github.com/fmtlib/fmt/issues/2238
char_type tm_format[5] = {' ', '%', 'x', '\0', '\0'}; Char tm_format[5] = {' ', '%', 'x', '\0', '\0'};
if (modifier) { if (modifier) {
tm_format[2] = modifier; tm_format[2] = modifier;
tm_format[3] = format; tm_format[3] = format;
@@ -1496,7 +1494,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
tm_format[2] = format; tm_format[2] = format;
} }
basic_memory_buffer<char_type> buf; basic_memory_buffer<Char> buf;
for (;;) { for (;;) {
size_t size = buf.capacity(); size_t size = buf.capacity();
size_t count = detail::strftime(buf.data(), size, tm_format, &tm_); size_t count = detail::strftime(buf.data(), size, tm_format, &tm_);
@@ -1508,17 +1506,16 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
buf.reserve(buf.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH)); buf.reserve(buf.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH));
} }
// Remove the extra space. // Remove the extra space.
out_ = copy_str<char_type>(buf.begin() + 1, buf.end(), out_); out_ = copy_str<Char>(buf.begin() + 1, buf.end(), out_);
} }
public: public:
explicit tm_writer(FormatContext& ctx, OutputIt out, const std::tm& tm) explicit tm_writer(OutputIt out, const std::tm& tm) : out_(out), tm_(tm) {}
: ctx_(ctx), out_(out), tm_(tm) {}
OutputIt out() const { return out_; } OutputIt out() const { return out_; }
FMT_CONSTEXPR void on_text(const char_type* begin, const char_type* end) { FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
out_ = copy_str<char_type>(begin, end, out_); out_ = copy_str<Char>(begin, end, out_);
} }
void on_abbr_weekday() { format_localized('a'); } void on_abbr_weekday() { format_localized('a'); }
void on_full_weekday() { format_localized('A'); } void on_full_weekday() { format_localized('A'); }
@@ -1551,7 +1548,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
write_digit2_separated(buf, to_unsigned(tm_.tm_mon + 1), write_digit2_separated(buf, to_unsigned(tm_.tm_mon + 1),
to_unsigned(tm_.tm_mday), to_unsigned(tm_.tm_mday),
to_unsigned(split_year_lower(tm_year())), '/'); to_unsigned(split_year_lower(tm_year())), '/');
out_ = copy_str<char_type>(std::begin(buf), std::end(buf), out_); out_ = copy_str<Char>(std::begin(buf), std::end(buf), out_);
} }
void on_iso_date() { void on_iso_date() {
auto year = tm_year(); auto year = tm_year();
@@ -1566,7 +1563,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
} }
write_digit2_separated(buf + 2, year % 100, to_unsigned(tm_.tm_mon + 1), write_digit2_separated(buf + 2, year % 100, to_unsigned(tm_.tm_mon + 1),
to_unsigned(tm_.tm_mday), '-'); to_unsigned(tm_.tm_mday), '-');
out_ = copy_str<char_type>(std::begin(buf) + offset, std::end(buf), out_); out_ = copy_str<Char>(std::begin(buf) + offset, std::end(buf), out_);
} }
void on_utc_offset() { format_localized('z'); } void on_utc_offset() { format_localized('z'); }
void on_tz_name() { format_localized('Z'); } void on_tz_name() { format_localized('Z'); }
@@ -1594,7 +1591,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
} else if (upper >= 0 && upper < 100) } else if (upper >= 0 && upper < 100)
write2(to_unsigned(upper)); write2(to_unsigned(upper));
else else
out_ = write<char_type>(out_, upper); out_ = write<Char>(out_, upper);
} else } else
format_localized('C', 'E'); format_localized('C', 'E');
} }
@@ -1684,7 +1681,7 @@ template <typename FormatContext, typename OutputIt> class tm_writer {
write_digit2_separated(buf, to_unsigned(tm_.tm_hour), write_digit2_separated(buf, to_unsigned(tm_.tm_hour),
to_unsigned(tm_.tm_min), to_unsigned(tm_.tm_sec), to_unsigned(tm_.tm_min), to_unsigned(tm_.tm_sec),
':'); ':');
out_ = copy_str<char_type>(std::begin(buf), std::end(buf), out_); out_ = copy_str<Char>(std::begin(buf), std::end(buf), out_);
} }
void on_am_pm() { format_localized('p'); } void on_am_pm() { format_localized('p'); }
@@ -1762,7 +1759,7 @@ template <typename Char> struct formatter<std::tm, Char> {
template <typename FormatContext> template <typename FormatContext>
auto format(const std::tm& tm, FormatContext& ctx) const auto format(const std::tm& tm, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
detail::tm_writer<FormatContext, decltype(ctx.out())> f(ctx, ctx.out(), tm); detail::tm_writer<decltype(ctx.out()), Char> f(ctx.out(), tm);
if (spec_ == spec::year_month_day) if (spec_ == spec::year_month_day)
f.on_iso_date(); f.on_iso_date();
else if (spec_ == spec::hh_mm_ss) else if (spec_ == spec::hh_mm_ss)