summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
Diffstat (limited to 'py')
-rw-r--r--py/builtin.c23
-rw-r--r--py/builtin.h1
-rw-r--r--py/builtintables.c1
-rw-r--r--py/qstrdefs.h1
4 files changed, 25 insertions, 1 deletions
diff --git a/py/builtin.c b/py/builtin.c
index 133473d01..77b58575a 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 762e10d9d..e102dab8e 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 2a5ced52d..b0d20417e 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 64658b587..74a29d2ee 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)