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

Fix handling of thousand separator (#1927)

Browse Source
This commit is contained in:
Victor Zverovich 2020-10-10 07:23:36 -07:00
parent bf19051a9f
commit a5e7e7db95
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/fmt/format.h
View File

@ -1686,9 +1686,9 @@ template <typename OutputIt, typename Char, typename UInt> struct int_writer {
// Index of a decimal digit with the least significant digit having index 0. // Index of a decimal digit with the least significant digit having index 0.
int digit_index = 0; int digit_index = 0;
group = groups.cbegin(); group = groups.cbegin();
auto p = buffer.data() + size; auto p = buffer.data() + size - 1;
for (int i = num_digits - 1; i >= 0; --i) { for (int i = num_digits - 1; i > 0; --i) {
*--p = static_cast<Char>(digits[i]); *p-- = static_cast<Char>(digits[i]);
if (*group <= 0 || ++digit_index % *group != 0 || if (*group <= 0 || ++digit_index % *group != 0 ||
*group == max_value<char>()) *group == max_value<char>())
continue; continue;
@ -1696,11 +1696,12 @@ template <typename OutputIt, typename Char, typename UInt> struct int_writer {
digit_index = 0; digit_index = 0;
++group; ++group;
} }
p -= s.size();
std::uninitialized_copy(s.data(), s.data() + s.size(), std::uninitialized_copy(s.data(), s.data() + s.size(),
make_checked(p, s.size())); make_checked(p, s.size()));
p -= s.size();
} }
if (prefix_size != 0) p[-1] = static_cast<Char>('-'); *p-- = static_cast<Char>(*digits);
if (prefix_size != 0) *p = static_cast<Char>('-');
auto data = buffer.data(); auto data = buffer.data();
out = write_padded<align::right>( out = write_padded<align::right>(
out, specs, usize, usize, out, specs, usize, usize,

1
test/locale-test.cc
View File

@ -52,6 +52,7 @@ TEST(LocaleTest, Format) {
EXPECT_EQ("1234567", fmt::format(std::locale(), "{:L}", 1234567)); EXPECT_EQ("1234567", fmt::format(std::locale(), "{:L}", 1234567));
EXPECT_EQ("1~234~567", fmt::format(loc, "{:L}", 1234567)); EXPECT_EQ("1~234~567", fmt::format(loc, "{:L}", 1234567));
EXPECT_EQ("-1~234~567", fmt::format(loc, "{:L}", -1234567)); EXPECT_EQ("-1~234~567", fmt::format(loc, "{:L}", -1234567));
EXPECT_EQ("-256", fmt::format(loc, "{:L}", -256));
fmt::format_arg_store<fmt::format_context, int> as{1234567}; fmt::format_arg_store<fmt::format_context, int> as{1234567};
EXPECT_EQ("1~234~567", fmt::vformat(loc, "{:L}", fmt::format_args(as))); EXPECT_EQ("1~234~567", fmt::vformat(loc, "{:L}", fmt::format_args(as)));
std::string s; std::string s;