mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py: Fix printing of "inf" and "nan" floating point values.

This commit is contained in:
Damien George 2015-04-22 16:51:29 +01:00
parent c52f1258a8
commit 956d765786
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/objfloat.c
View File

@ -49,16 +49,16 @@ STATIC void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
char buf[16]; char buf[16];
mp_format_float(o->value, buf, sizeof(buf), 'g', 7, '\0'); mp_format_float(o->value, buf, sizeof(buf), 'g', 7, '\0');
mp_print_str(print, buf); mp_print_str(print, buf);
if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL) { if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
// Python floats always have decimal point // Python floats always have decimal point (unless inf or nan)
mp_print_str(print, ".0"); mp_print_str(print, ".0");
} }
#else #else
char buf[32]; char buf[32];
sprintf(buf, "%.16g", (double) o->value); sprintf(buf, "%.16g", (double) o->value);
mp_print_str(print, buf); mp_print_str(print, buf);
if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL) { if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL && strchr(buf, 'n') == NULL) {
// Python floats always have decimal point // Python floats always have decimal point (unless inf or nan)
mp_print_str(print, ".0"); mp_print_str(print, ".0");
} }
#endif #endif

19
tests/float/float1.py
View File

@ -7,6 +7,25 @@ print(1.2)
# float construction # float construction
print(float(1.2)) print(float(1.2))
print(float("1.2"))
print(float("+1"))
print(float("1e1"))
print(float("1e+1"))
print(float("1e-1"))
print(float("inf"))
print(float("INF"))
print(float("infinity"))
print(float("INFINITY"))
print(float("nan"))
print(float("NaN"))
try:
float("1e+")
except ValueError:
print("ValueError")
try:
float("1z")
except ValueError:
print("ValueError")
# unary operators # unary operators
print(bool(0.0)) print(bool(0.0))