Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 12:10:13 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

py: Raise exception if trying to convert inf/nan to int.

Browse Source
This commit is contained in:
Damien George
2015-01-02 23:04:09 +00:00
parent 6e0b6d02db
commit 6fd4b36bc5
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py/mpz.c
View File

@@ -711,16 +711,9 @@ typedef uint32_t mp_float_int_t;
// value == 0 || value < 1
mpz_init_zero(z);
} else if (u.p.exp == ((1 << EXP_SZ) - 1)) {
// inf or NaN
#if 0
// TODO: this probably isn't the right place to throw an exception
if(u.p.frc == 0)
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "cannot convert float infinity to integer"));
else
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "cannot convert float NaN to integer"));
#else
// u.p.frc == 0 indicates inf, else NaN
// should be handled by caller
mpz_init_zero(z);
#endif
} else {
const int adj_exp = (int)u.p.exp - ((1 << (EXP_SZ - 1)) - 1);
if (adj_exp < 0) {