Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add localized formatting to non-decimal presentation types of ints #3750

Merged
merged 10 commits into from
Dec 15, 2023
Merged

Add localized formatting to non-decimal presentation types of ints #3750

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d1ac2bb
add locale formatting to non-decimal numerics
js324 Dec 11, 2023
4d2ecf9
small code formatting
js324 Dec 11, 2023
69eadea
Merge remote-tracking branch 'upstream/master' into locale-format
js324 Dec 11, 2023
394acce
test change
js324 Dec 11, 2023
9b855d4
fix build
js324 Dec 11, 2023
a9c9c0c
fix unsigned warning
js324 Dec 11, 2023
6430e11
fix build
js324 Dec 11, 2023
46c90ca
fix build
js324 Dec 11, 2023
621b17e
fix build
js324 Dec 12, 2023
08c0a2d
use buffer instead of array
js324 Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions include/fmt/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2124,13 +2124,14 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
const format_specs<Char>& specs,
const digit_grouping<Char>& grouping) -> OutputIt {
static_assert(std::is_same<uint64_or_128_t<UInt>, UInt>::value, "");
auto minimum = [](int a, int b) { return a < b ? a : b; };
int num_digits = 0;
char digits[40];
char digits[40];

switch (specs.type) {
case presentation_type::none:
case presentation_type::dec: {
num_digits = std::min(count_digits(value), 40);
js324 marked this conversation as resolved.
Show resolved Hide resolved
num_digits = minimum(count_digits(value), 40);
format_decimal(digits, value, num_digits);
break;
}
Expand All @@ -2139,7 +2140,7 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
bool upper = specs.type == presentation_type::hex_upper;
if (specs.alt)
prefix_append(prefix, unsigned(upper ? 'X' : 'x') << 8 | '0');
num_digits = std::min(count_digits<4>(value), 40);
num_digits = minimum(count_digits<4>(value), 40);
format_uint<4>(digits, value, num_digits, upper);
break;
}
Expand All @@ -2148,12 +2149,12 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
bool upper = specs.type == presentation_type::bin_upper;
if (specs.alt)
prefix_append(prefix, unsigned(upper ? 'B' : 'b') << 8 | '0');
num_digits = std::min(count_digits<1>(value), 40);
num_digits = minimum(count_digits<1>(value), 40);
format_uint<1>(digits, value, num_digits);
break;
}
case presentation_type::oct: {
num_digits = std::min(count_digits<3>(value), 40);
num_digits = minimum(count_digits<3>(value), 40);
// Octal prefix '0' is counted as a digit, so only add it if precision
// is not greater than the number of digits.
if (specs.alt && specs.precision <= num_digits && value != 0)
Expand All @@ -2170,9 +2171,9 @@ auto write_int(OutputIt out, UInt value, unsigned prefix,
unsigned size = (prefix != 0 ? prefix >> 24 : 0) + to_unsigned(num_digits) +
to_unsigned(grouping.count_separators(num_digits));
return write_padded<align::right>(
out, specs, size, size, [&](reserve_iterator<OutputIt> it) {
out, specs, size, size, [=](reserve_iterator<OutputIt> it) {
for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8)
*it++ = static_cast<Char>(p & 0xff);
*it++ = static_cast<Char>(p & 0xff);
return grouping.apply(it, string_view(digits, to_unsigned(num_digits)));
});
}
Expand Down
Loading