mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #323 from dhylands/fix-float-print

Browse Source 
Fix floating point printing of negative numbers in the range (0, -1.0)
This commit is contained in:
Damien George 2014-02-26 09:17:22 +00:00
commit e70700851a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stm/printf.c
View File

@ -219,9 +219,19 @@ int pfenv_printf(const pfenv_t *pfenv, const char *fmt, va_list args) {
mp_float_t d = va_arg(args, double);
int left = (int)d;
int right = (int)((d - (mp_float_t)(int)d) * 1000000.0);
chrs += pfenv_print_int(pfenv, left, 1, 10, 'a', flags, width);
chrs += pfenv_print_strn(pfenv, &dot, 1, flags, width);
chrs += pfenv_print_int(pfenv, right, 0, 10, 'a', PF_FLAG_ZERO_PAD, 6);
if (right < 0) {
if (left == 0) {
chrs += pfenv_print_strn(pfenv, "-0", 2, flags, width);
} else {
chrs += pfenv_print_int(pfenv, left, 1, 10, 'a', flags, width);
}
chrs += pfenv_print_strn(pfenv, &dot, 1, flags, width);
chrs += pfenv_print_int(pfenv, -right, 0, 10, 'a', PF_FLAG_ZERO_PAD, 6);
} else {
chrs += pfenv_print_int(pfenv, left, 1, 10, 'a', flags, width);
chrs += pfenv_print_strn(pfenv, &dot, 1, flags, width);
chrs += pfenv_print_int(pfenv, right, 0, 10, 'a', PF_FLAG_ZERO_PAD, 6);
}
break;
}
default: