diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-08-20 23:42:35 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-10-20 12:35:17 +0100 |
| commit | 7e359c648b1f92e709c5ff4b7089011967ebb9f5 (patch) | |
| tree | c931595a8e46512c83d5e77b5a8aa14ff5810b9c /py/modmath.c | |
| parent | aaef1851a748af95f8b105ef2d1d4f35e6ede02b (diff) | |
| download | micropython-7e359c648b1f92e709c5ff4b7089011967ebb9f5.tar.gz micropython-7e359c648b1f92e709c5ff4b7089011967ebb9f5.zip | |
py: Move float e/pi consts to objfloat and make mp_obj_float_t private.
Diffstat (limited to 'py/modmath.c')
| -rw-r--r-- | py/modmath.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/py/modmath.c b/py/modmath.c index e1f6b9ea08..ec74e974e8 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -52,12 +52,6 @@ STATIC mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { mp_int_t x = MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj)); return mp_obj_new_int(x); } \ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name); -// These are also used by cmath.c -/// \constant e - base of the natural logarithm -const mp_obj_float_t mp_math_e_obj = {{&mp_type_float}, M_E}; -/// \constant pi - the ratio of a circle's circumference to its diameter -const mp_obj_float_t mp_math_pi_obj = {{&mp_type_float}, M_PI}; - /// \function sqrt(x) /// Returns the square root of `x`. MATH_FUN_1(sqrt, sqrt) @@ -188,8 +182,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees); STATIC const mp_map_elem_t mp_module_math_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_math) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_e), (mp_obj_t)&mp_math_e_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_pi), (mp_obj_t)&mp_math_pi_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_e), mp_const_float_e }, + { MP_OBJ_NEW_QSTR(MP_QSTR_pi), mp_const_float_pi }, { MP_OBJ_NEW_QSTR(MP_QSTR_sqrt), (mp_obj_t)&mp_math_sqrt_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_pow), (mp_obj_t)&mp_math_pow_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_exp), (mp_obj_t)&mp_math_exp_obj }, |