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

More showpoint fixes and tests (#1498)

Browse Source
This commit is contained in:
Victor Zverovich 2019-12-30 10:28:27 -10:00
parent 455a7c0787
commit c85efef312
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/format-inl.h
View File

@ -1112,7 +1112,7 @@ int snprintf_float(T value, int precision, float_specs specs,
char format[max_format_size]; char format[max_format_size];
char* format_ptr = format; char* format_ptr = format;
*format_ptr++ = '%'; *format_ptr++ = '%';
if (specs.showpoint) *format_ptr++ = '#'; if (specs.showpoint && specs.format == float_format::hex) *format_ptr++ = '#';
if (precision >= 0) { if (precision >= 0) {
*format_ptr++ = '.'; *format_ptr++ = '.';
*format_ptr++ = '*'; *format_ptr++ = '*';
@ -1351,7 +1351,8 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
internal::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size())); internal::utf8_to_utf16 u16(string_view(buffer.data(), buffer.size()));
auto written = DWORD(); auto written = DWORD();
if (!WriteConsoleW(reinterpret_cast<HANDLE>(_get_osfhandle(fd)), if (!WriteConsoleW(reinterpret_cast<HANDLE>(_get_osfhandle(fd)),
u16.c_str(), static_cast<DWORD>(u16.size()), &written, nullptr)) { u16.c_str(), static_cast<DWORD>(u16.size()), &written,
nullptr)) {
throw format_error("failed to write to console"); throw format_error("failed to write to console");
} }
return; return;

3
include/fmt/format.h
View File

@ -1125,9 +1125,10 @@ template <typename Char> class float_writer {
if (specs_.precision >= 0 && specs_.precision < num_zeros) if (specs_.precision >= 0 && specs_.precision < num_zeros)
num_zeros = specs_.precision; num_zeros = specs_.precision;
int num_digits = num_digits_; int num_digits = num_digits_;
// Remove trailing zeros.
if (!specs_.showpoint) if (!specs_.showpoint)
while (num_digits > 0 && digits_[num_digits - 1] == '0') --num_digits; while (num_digits > 0 && digits_[num_digits - 1] == '0') --num_digits;
if (num_zeros != 0 || num_digits != 0) { if (num_zeros != 0 || num_digits != 0 || specs_.showpoint) {
*it++ = decimal_point_; *it++ = decimal_point_;
it = std::fill_n(it, num_zeros, static_cast<Char>('0')); it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
it = copy_str<Char>(digits_, digits_ + num_digits, it); it = copy_str<Char>(digits_, digits_ + num_digits, it);

3
test/format-test.cc
View File

@ -926,6 +926,9 @@ TEST(FormatterTest, HashFlag) {
EXPECT_EQ("-42.0", format("{0:#}", -42.0)); EXPECT_EQ("-42.0", format("{0:#}", -42.0));
EXPECT_EQ("-42.0", format("{0:#}", -42.0l)); EXPECT_EQ("-42.0", format("{0:#}", -42.0l));
EXPECT_EQ("4.e+01", format("{:#.0e}", 42.0)); EXPECT_EQ("4.e+01", format("{:#.0e}", 42.0));
EXPECT_EQ("0.", format("{:#.0f}", 0.01));
auto s = format("{:#.0f}", 0.5); // MSVC's printf uses wrong rounding mode.
EXPECT_TRUE(s == "0." || s == "1.");
EXPECT_THROW_MSG(format("{0:#", 'c'), format_error, EXPECT_THROW_MSG(format("{0:#", 'c'), format_error,
"missing '}' in format string"); "missing '}' in format string");
EXPECT_THROW_MSG(format("{0:#}", 'c'), format_error, EXPECT_THROW_MSG(format("{0:#}", 'c'), format_error,