AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix locale-dependent formatting (#905)

Browse Source
This commit is contained in:
Victor Zverovich 2018-10-13 06:52:33 -07:00
parent 10e03e695b
commit ddd7caf38e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/format.h
View File

@ -988,6 +988,8 @@ struct no_thousands_sep {
template <typename Char>
void operator()(Char *) {}
enum { size = 0 };
};
// A functor that adds a thousands separator.
@ -1012,6 +1014,8 @@ class add_thousands_sep {
std::uninitialized_copy(sep_.data(), sep_.data() + sep_.size(),
internal::make_checked(buffer, sep_.size()));
}
enum { size = 1 };
};
template <typename Char>
@ -1052,10 +1056,12 @@ template <typename OutChar, typename UInt, typename Iterator,
inline Iterator format_decimal(
Iterator out, UInt value, unsigned num_digits, ThousandsSep sep) {
typedef typename ThousandsSep::char_type char_type;
// Buffer should be large enough to hold all digits (digits10 + 1) and null.
char_type buffer[std::numeric_limits<UInt>::digits10 + 2];
format_decimal(buffer, value, num_digits, sep);
return internal::copy_str<OutChar>(buffer, buffer + num_digits, out);
// Buffer should be large enough to hold all digits (<= digits10 + 1).
enum { max_size = std::numeric_limits<UInt>::digits10 + 1 };
FMT_ASSERT(ThousandsSep::size <= 1, "invalid separator");
char_type buffer[max_size + max_size / 3];
auto end = format_decimal(buffer, value, num_digits, sep);
return internal::copy_str<OutChar>(buffer, end, out);
}
template <typename OutChar, typename It, typename UInt>

2
test/format-test.cc
View File

@ -1378,6 +1378,8 @@ TEST(FormatterTest, FormatIntLocale) {
EXPECT_EQ("123", format("{:n}", 123));
EXPECT_EQ("1,234", format("{:n}", 1234));
EXPECT_EQ("1,234,567", format("{:n}", 1234567));
EXPECT_EQ("4,294,967,295",
format("{:n}", std::numeric_limits<uint32_t>::max()));
}
struct ConvertibleToLongLong {