TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Implement mp_format_float for doubles and use where appropriate

Browse Source 
This allows using (almost) the same code for printing floats everywhere,
removes the dependency on sprintf and uses just snprintf and
applies an msvc-specific fix for snprintf in a single place so
nan/inf are now printed correctly.
This commit is contained in:
stijn
2015-05-16 10:54:19 +02:00
committed by Damien George
parent f5dd6f7f37
commit 861670ba2a
8 changed files with 97 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py/objfloat.c
View File

@@ -37,31 +37,24 @@
#if MICROPY_PY_BUILTINS_FLOAT
#include <math.h>
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
#include "py/formatfloat.h"
#endif
STATIC void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_float_t *o = o_in;
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
char buf[16];
mp_format_float(o->value, buf, sizeof(buf), 'g', 7, '\0');
mp_print_str(print, buf);
if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
// Python floats always have decimal point (unless inf or nan)
mp_print_str(print, ".0");
}
const int precision = 7;
#else
char buf[32];
sprintf(buf, "%.16g", (double) o->value);
const int precision = 16;
#endif
mp_format_float(o->value, buf, sizeof(buf), 'g', precision, '\0');
mp_print_str(print, buf);
if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
// Python floats always have decimal point (unless inf or nan)
mp_print_str(print, ".0");
}
#endif
}
STATIC mp_obj_t float_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {