epagris/embfmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- float printing reworked

Browse Source
This commit is contained in:
Wiesner András 2024-12-14 11:26:39 +01:00
parent 853e252235
commit 4d5b5b8164
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
embformat.c
View File

@ -301,11 +301,26 @@ static int pfn_double(va_list *va, FmtWord *fmt, char *outbuf, size_t free_space
// separate into integer and fractional part // separate into integer and fractional part
uint64_t int_part = (uint64_t)d; // integer part uint64_t int_part = (uint64_t)d; // integer part
int sum_copy_len = 0; // summed copy length
// get only the fractional part of the number
double d_frac = d - (double)int_part;
// multiply it by 10**precision and round it to the nearest integer
double frac_extended = d_frac * powerf(10, fmt->precision + 1);
uint64_t frac_part = round_to_base((uint64_t)frac_extended, 10) / 10;
// if rounding results a new integer digit
uint32_t additional_integer = frac_part / 10;
frac_part -= additional_integer * 10;
int_part += additional_integer;
// print integer part
int copy_len = print_number(int_part, negative, &int_fmt, outbuf, free_space); int copy_len = print_number(int_part, negative, &int_fmt, outbuf, free_space);
free_space -= copy_len; free_space -= copy_len;
outbuf += copy_len; outbuf += copy_len;
sum_copy_len += copy_len;
int sum_copy_len = copy_len; // summed copy length
// fractional part // fractional part
if (fmt->precision > 0) { if (fmt->precision > 0) {
@ -315,17 +330,9 @@ static int pfn_double(va_list *va, FmtWord *fmt, char *outbuf, size_t free_space
free_space--; free_space--;
sum_copy_len++; sum_copy_len++;
*outbuf = '\0';
// prepare format for printing fractional part // prepare format for printing fractional part
FmtWord frac_fmt = {.flags = FLAG_LEADING_ZEROS, .width = fmt->precision, .type = UNSIGNED_INTEGER}; FmtWord frac_fmt = {.flags = FLAG_LEADING_ZEROS, .width = fmt->precision, .type = UNSIGNED_INTEGER};
// get only the fractional part of the number
double d_frac = d - (double)int_part;
// multiply it by 10**precision and round it to the nearest integer
uint64_t frac_part = round_to_base(d_frac * powerf(10, fmt->precision + 1), 10) / 10;
// print fractional part // print fractional part
copy_len = print_number(frac_part, false, &frac_fmt, outbuf, free_space); copy_len = print_number(frac_part, false, &frac_fmt, outbuf, free_space);
free_space -= copy_len; free_space -= copy_len;
@ -333,6 +340,8 @@ static int pfn_double(va_list *va, FmtWord *fmt, char *outbuf, size_t free_space
sum_copy_len += copy_len; sum_copy_len += copy_len;
} }
*outbuf = '\0';
// print exponential if format requires // print exponential if format requires
if (fmt->type == DOUBLE_EXPONENTIAL) { if (fmt->type == DOUBLE_EXPONENTIAL) {
// print 'e' // print 'e'
@ -347,7 +356,7 @@ static int pfn_double(va_list *va, FmtWord *fmt, char *outbuf, size_t free_space
unsigned int exponent_abs = exponent > 0 ? exponent : -exponent; unsigned int exponent_abs = exponent > 0 ? exponent : -exponent;
copy_len = print_number(exponent_abs, exponent < 0, &exponent_fmt, outbuf, free_space); int copy_len = print_number(exponent_abs, exponent < 0, &exponent_fmt, outbuf, free_space);
free_space -= copy_len; free_space -= copy_len;
outbuf += copy_len; outbuf += copy_len;
sum_copy_len += copy_len; sum_copy_len += copy_len;