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

formatting: Add support for dropping trailing zeroes #71

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

formatting: Add support for dropping trailing zeroes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions include/frg/formatting.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ namespace _fmt_basics {
template<Sink S, typename T>
void print_float(S &sink, T number, int width = 0, int precision = 6,
char padding = ' ', bool left_justify = false, bool use_capitals = false,
bool group_thousands = false, locale_options locale_opts = {}) {
bool group_thousands = false, bool drop_trailing_decimal_zeroes = false, locale_options locale_opts = {}) {
(void)group_thousands;

bool has_sign = false;
Expand Down Expand Up @@ -307,7 +307,7 @@ namespace _fmt_basics {
i++;
}

while (i < precision) {
while (i < precision && !drop_trailing_decimal_zeroes) {
sink.append('0');
i++;
}
Expand Down
26 changes: 23 additions & 3 deletions include/frg/printf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ void do_printf_floats(S &sink, char t, format_options opts,
printf_size_mod szmod, va_struct *vsp, locale_options locale_opts = {}) {
int precision_or_default = opts.precision.has_value() ? *opts.precision : 6;
bool use_capitals = true;
bool drop_trailing_decimal_zeroes = false;
switch(t) {
case 'f':
use_capitals = false;
Expand All @@ -481,21 +482,40 @@ void do_printf_floats(S &sink, char t, format_options opts,
_fmt_basics::print_float(sink, pop_arg<long double>(vsp, &opts),
opts.minimum_width, precision_or_default,
opts.fill_zeros ? '0' : ' ', opts.left_justify, use_capitals,
opts.group_thousands, locale_opts);
opts.group_thousands, drop_trailing_decimal_zeroes, locale_opts);
break;
}
#endif
FRG_ASSERT(szmod == printf_size_mod::default_size || szmod == printf_size_mod::long_size);
_fmt_basics::print_float(sink, pop_arg<double>(vsp, &opts),
opts.minimum_width, precision_or_default,
opts.fill_zeros ? '0' : ' ', opts.left_justify, use_capitals,
opts.group_thousands, locale_opts);
opts.group_thousands, drop_trailing_decimal_zeroes, locale_opts);
break;
case 'g':
use_capitals = false;
drop_trailing_decimal_zeroes = true;
[[fallthrough]];
case 'G':
#ifndef FRG_DONT_USE_LONG_DOUBLE
if (szmod == printf_size_mod::longdouble_size) {
_fmt_basics::print_float(sink, pop_arg<long double>(vsp, &opts),
opts.minimum_width, precision_or_default,
opts.fill_zeros ? '0' : ' ', opts.left_justify, use_capitals,
opts.group_thousands, drop_trailing_decimal_zeroes, locale_opts);
break;
}
#endif
FRG_ASSERT(szmod == printf_size_mod::default_size || szmod == printf_size_mod::long_size);
_fmt_basics::print_float(sink, pop_arg<double>(vsp, &opts),
opts.minimum_width, precision_or_default,
opts.fill_zeros ? '0' : ' ', opts.left_justify, use_capitals,
opts.group_thousands, drop_trailing_decimal_zeroes, locale_opts);
break;
case 'e':
case 'E':
sink.append("%f");
sink.append("%");
sink.append(t);
break;
default:
FRG_ASSERT(!"Unexpected printf terminal");
Expand Down
Loading