diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-10-31 11:28:50 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-10-31 11:28:50 +0000 |
| commit | 1559a978100762efd84666befd134d5975ae8d4b (patch) | |
| tree | b5910a620f1532ae722b865c1f71988e3f4d1e1c /py | |
| parent | fa73c9cb25f05ffa6df4c5d15cc754885c3415ff (diff) | |
| download | micropython-1559a978100762efd84666befd134d5975ae8d4b.tar.gz micropython-1559a978100762efd84666befd134d5975ae8d4b.zip | |
py: Add builtin round function.
Addresses issue #934.
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtin.c | 23 | ||||
| -rw-r--r-- | py/builtin.h | 1 | ||||
| -rw-r--r-- | py/builtintables.c | 1 | ||||
| -rw-r--r-- | py/qstrdefs.h | 1 |
4 files changed, 25 insertions, 1 deletions
diff --git a/py/builtin.c b/py/builtin.c index 133473d019..77b58575ae 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -448,9 +448,30 @@ STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) { vstr_free(vstr); return s; } - MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr); +STATIC mp_obj_t mp_builtin_round(mp_obj_t o_in) { + // TODO support second arg + if (MP_OBJ_IS_INT(o_in)) { + return o_in; + } +#if MICROPY_PY_BUILTINS_FLOAT + mp_float_t val = mp_obj_get_float(o_in); + mp_float_t rounded = MICROPY_FLOAT_C_FUN(round)(val); + mp_int_t r = rounded; + // make rounded value even if it was halfway between ints + if (val - rounded == 0.5) { + r = (r + 1) & (~1); + } else if (val - rounded == -0.5) { + r &= ~1; + } +#else + mp_int_t r = mp_obj_get_int(o_in); +#endif + return mp_obj_new_int(r); +} +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_round_obj, mp_builtin_round); + STATIC mp_obj_t mp_builtin_sum(mp_uint_t n_args, const mp_obj_t *args) { assert(1 <= n_args && n_args <= 2); mp_obj_t value; diff --git a/py/builtin.h b/py/builtin.h index 762e10d9d9..e102dab8e1 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -61,6 +61,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_ord_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_pow_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_print_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_repr_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_round_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sorted_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sum_obj); diff --git a/py/builtintables.c b/py/builtintables.c index 2a5ced52d9..b0d20417e5 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -118,6 +118,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_pow), (mp_obj_t)&mp_builtin_pow_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_print), (mp_obj_t)&mp_builtin_print_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_repr), (mp_obj_t)&mp_builtin_repr_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_round), (mp_obj_t)&mp_builtin_round_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_sorted), (mp_obj_t)&mp_builtin_sorted_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_sum), (mp_obj_t)&mp_builtin_sum_obj }, diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 64658b587c..74a29d2ee8 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -201,6 +201,7 @@ Q(range) Q(read) Q(repr) Q(reversed) +Q(round) Q(sorted) Q(staticmethod) Q(sum) |