External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 4999a4aff5 into 050f3f1f0e

Browse Source
This commit is contained in:
bhaskar-priya 2018-03-29 18:07:09 +00:00 committed by GitHub
commit a1c15d58ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/fmt/format.h
View File

@ -1590,7 +1590,7 @@ class specs_setter {
FMT_CONSTEXPR specs_setter(const specs_setter &other) : specs_(other.specs_) {}
FMT_CONSTEXPR void on_align(alignment align) { specs_.align_ = align; }
FMT_CONSTEXPR void on_fill(Char fill) { specs_.fill_ = fill; }
FMT_CONSTEXPR void on_fill(Char fill_char) { specs_.fill_ = fill_char; }
FMT_CONSTEXPR void on_plus() { specs_.flags_ |= SIGN_FLAG | PLUS_FLAG; }
FMT_CONSTEXPR void on_minus() { specs_.flags_ |= MINUS_FLAG; }
FMT_CONSTEXPR void on_space() { specs_.flags_ |= SIGN_FLAG; }
@ -1601,7 +1601,7 @@ class specs_setter {
specs_.fill_ = '0';
}
FMT_CONSTEXPR void on_width(unsigned width) { specs_.width_ = width; }
FMT_CONSTEXPR void on_width(unsigned width_value) { specs_.width_ = width_value; }
FMT_CONSTEXPR void on_precision(unsigned precision) {
specs_.precision_ = precision;
}
@ -2296,7 +2296,7 @@ class basic_writer {
void write_int(unsigned num_digits, string_view prefix,
const Spec &spec, F f) {
std::size_t size = prefix.size() + num_digits;
char_type fill = static_cast<char_type>(spec.fill());
char_type fill_char = static_cast<char_type>(spec.fill());
std::size_t padding = 0;
if (spec.align() == ALIGN_NUMERIC) {
if (spec.width() > size) {
@ -2306,12 +2306,12 @@ class basic_writer {
} else if (spec.precision() > static_cast<int>(num_digits)) {
size = prefix.size() + spec.precision();
padding = spec.precision() - num_digits;
fill = '0';
fill_char = '0';
}
align_spec as = spec;
if (spec.align() == ALIGN_DEFAULT)
as.align_ = ALIGN_RIGHT;
write_padded(size, as, padded_int_writer<F>{prefix, fill, padding, f});
write_padded(size, as, padded_int_writer<F>{prefix, fill_char, padding, f});
}
// Writes a decimal integer.
@ -2619,23 +2619,23 @@ template <typename Range>
template <typename F>
void basic_writer<Range>::write_padded(
std::size_t size, const align_spec &spec, F f) {
unsigned width = spec.width();
if (width <= size)
unsigned width_value = spec.width();
if (width_value <= size)
return f(reserve(size));
auto &&it = reserve(width);
char_type fill = internal::char_traits<char_type>::cast(spec.fill());
std::size_t padding = width - size;
auto &&it = reserve(width_value);
char_type fill_char = internal::char_traits<char_type>::cast(spec.fill());
std::size_t padding = width_value - size;
if (spec.align() == ALIGN_RIGHT) {
it = std::fill_n(it, padding, fill);
it = std::fill_n(it, padding, fill_char);
f(it);
} else if (spec.align() == ALIGN_CENTER) {
std::size_t left_padding = padding / 2;
it = std::fill_n(it, left_padding, fill);
it = std::fill_n(it, left_padding, fill_char);
f(it);
it = std::fill_n(it, padding - left_padding, fill);
it = std::fill_n(it, padding - left_padding, fill_char);
} else {
f(it);
it = std::fill_n(it, padding, fill);
it = std::fill_n(it, padding, fill_char);
}
}
@ -2729,11 +2729,11 @@ void basic_writer<Range>::write_double(T value, const format_specs &spec) {
basic_memory_buffer<char_type> buffer;
unsigned width = spec.width();
unsigned width_value = spec.width();
if (sign) {
buffer.reserve(width > 1u ? width : 1u);
if (width > 0)
--width;
buffer.reserve(width_value > 1u ? width_value : 1u);
if (width_value > 0)
--width_value;
}
// Build format string.
@ -2741,7 +2741,7 @@ void basic_writer<Range>::write_double(T value, const format_specs &spec) {
char_type format[MAX_FORMAT_SIZE];
char_type *format_ptr = format;
*format_ptr++ = '%';
unsigned width_for_sprintf = width;
unsigned width_for_sprintf = width_value;
if (spec.flag(HASH_FLAG))
*format_ptr++ = '#';
width_for_sprintf = 0;