fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the 'n' float format specifier

Browse Source
This commit is contained in:
Victor Zverovich
2019-07-03 16:36:23 -07:00
parent f487ddbdfa
commit c9d5a08ed8
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/format.h
View File

@ -1097,6 +1097,9 @@ FMT_CONSTEXPR void handle_float_type_spec(char spec, Handler&& handler) {
case 'A': case 'A':
handler.on_hex(); handler.on_hex();
break; break;
case 'n':
handler.on_num();
break;
default: default:
handler.on_error(); handler.on_error();
break; break;
@ -1159,6 +1162,7 @@ class float_type_checker : private ErrorHandler {
FMT_CONSTEXPR void on_fixed() {} FMT_CONSTEXPR void on_fixed() {}
FMT_CONSTEXPR void on_percent() {} FMT_CONSTEXPR void on_percent() {}
FMT_CONSTEXPR void on_hex() {} FMT_CONSTEXPR void on_hex() {}
FMT_CONSTEXPR void on_num() {}
FMT_CONSTEXPR void on_error() { FMT_CONSTEXPR void on_error() {
ErrorHandler::on_error("invalid type specifier"); ErrorHandler::on_error("invalid type specifier");
@ -2642,9 +2646,14 @@ struct float_spec_handler {
bool upper; bool upper;
bool fixed; bool fixed;
bool as_percentage; bool as_percentage;
bool use_locale;
explicit float_spec_handler(char t) explicit float_spec_handler(char t)
: type(t), upper(false), fixed(false), as_percentage(false) {} : type(t),
upper(false),
fixed(false),
as_percentage(false),
use_locale(false) {}
void on_general() { void on_general() {
if (type == 'G') upper = true; if (type == 'G') upper = true;
@ -2668,6 +2677,8 @@ struct float_spec_handler {
if (type == 'A') upper = true; if (type == 'A') upper = true;
} }
void on_num() { use_locale = true; }
FMT_NORETURN void on_error() { FMT_NORETURN void on_error() {
FMT_THROW(format_error("invalid type specifier")); FMT_THROW(format_error("invalid type specifier"));
} }
@ -2728,6 +2739,7 @@ void internal::basic_writer<Range>::write_double(T value,
} else if (spec.align() == ALIGN_DEFAULT) { } else if (spec.align() == ALIGN_DEFAULT) {
as.align_ = ALIGN_RIGHT; as.align_ = ALIGN_RIGHT;
} }
// TODO: add thousands separators if handler.use_locale is set
if (use_grisu) { if (use_grisu) {
auto params = internal::gen_digits_params(); auto params = internal::gen_digits_params();
params.fixed = handler.fixed; params.fixed = handler.fixed;

6
test/format-test.cc
View File

@ -1424,7 +1424,7 @@ TEST(FormatterTest, FormatFloat) {
} }
TEST(FormatterTest, FormatDouble) { TEST(FormatterTest, FormatDouble) {
check_unknown_types(1.2, "eEfFgGaA%", "double"); check_unknown_types(1.2, "eEfFgGaAn%", "double");
EXPECT_EQ("0.0", format("{:}", 0.0)); EXPECT_EQ("0.0", format("{:}", 0.0));
EXPECT_EQ("0.000000", format("{:f}", 0.0)); EXPECT_EQ("0.000000", format("{:f}", 0.0));
EXPECT_EQ("0", format("{:g}", 0.0)); EXPECT_EQ("0", format("{:g}", 0.0));
@ -1447,6 +1447,10 @@ TEST(FormatterTest, FormatDouble) {
EXPECT_EQ(buffer, format("{:A}", -42.0)); EXPECT_EQ(buffer, format("{:A}", -42.0));
} }
TEST(FormatterTest, FormatDoubleLocale) {
EXPECT_EQ("1.23", format("{:n}", 1.23));
}
TEST(FormatterTest, PrecisionRounding) { TEST(FormatterTest, PrecisionRounding) {
EXPECT_EQ("0", format("{:.0f}", 0.0)); EXPECT_EQ("0", format("{:.0f}", 0.0));
EXPECT_EQ("0", format("{:.0f}", 0.01)); EXPECT_EQ("0", format("{:.0f}", 0.01));