diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-01 21:21:50 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-01 21:21:50 +0100 |
| commit | 084ef373fb6e634c2b4e06803a4dd5eb3f8f359c (patch) | |
| tree | 510b117ef7876d0d839a8874f0b93823a811578e /py/modmath.c | |
| parent | e3e050029677bdd19d99f8ee6135ad78eb9d52e6 (diff) | |
py: Fix math.{ceil,floor,trunc} to return int.
Diffstat (limited to 'py/modmath.c')
| -rw-r--r-- | py/modmath.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/py/modmath.c b/py/modmath.c index c3ea55f93..f80b73ab5 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -17,10 +17,14 @@ mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj, mp_obj_t y_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj), mp_obj_get_float(y_obj))); } \ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_math_## py_name ## _obj, mp_math_ ## py_name); -#define MATH_FUN_BOOL1(py_name, c_name) \ +#define MATH_FUN_1_TO_BOOL(py_name, c_name) \ mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { return MP_BOOL(c_name(mp_obj_get_float(x_obj))); } \ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name); +#define MATH_FUN_1_TO_INT(py_name, c_name) \ + mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { return mp_obj_new_int((machine_int_t)MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ + STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name); + STATIC const mp_obj_float_t mp_math_e_obj = {{&mp_type_float}, M_E}; STATIC const mp_obj_float_t mp_math_pi_obj = {{&mp_type_float}, M_PI}; @@ -44,15 +48,15 @@ MATH_FUN_1(acos, acos) MATH_FUN_1(asin, asin) MATH_FUN_1(atan, atan) MATH_FUN_2(atan2, atan2) -MATH_FUN_1(ceil, ceil) +MATH_FUN_1_TO_INT(ceil, ceil) MATH_FUN_2(copysign, copysign) MATH_FUN_1(fabs, fabs) -MATH_FUN_1(floor, floor) //TODO: delegate to x.__floor__() if x is not a float +MATH_FUN_1_TO_INT(floor, floor) //TODO: delegate to x.__floor__() if x is not a float MATH_FUN_2(fmod, fmod) -MATH_FUN_BOOL1(isfinite, isfinite) -MATH_FUN_BOOL1(isinf, isinf) -MATH_FUN_BOOL1(isnan, isnan) -MATH_FUN_1(trunc, trunc) +MATH_FUN_1_TO_BOOL(isfinite, isfinite) +MATH_FUN_1_TO_BOOL(isinf, isinf) +MATH_FUN_1_TO_BOOL(isnan, isnan) +MATH_FUN_1_TO_INT(trunc, trunc) MATH_FUN_2(ldexp, ldexp) MATH_FUN_1(erf, erf) MATH_FUN_1(erfc, erfc) |