diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2019-05-22 15:23:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 15:23:24 -0700 |
| commit | 63b253c33a2e56bc6c6ccb902d89d0c0b27f7d8f (patch) | |
| tree | d3579baa02247e22a56928b0c8851871bd82fe2f /py | |
| parent | a888fe4c8e12144141b9c0730d3d25ebea33cbc7 (diff) | |
| parent | 32b0f1c78ee26ddb8d689d30d6d95241f69ae838 (diff) | |
Merge pull request #1906 from adafruit/4.0.x
Merge in all bug fixes from 4.0.1 into master
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_mpconfig.h | 1 | ||||
| -rw-r--r-- | py/modbuiltins.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index f957886f4..0575bcfe0 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -89,6 +89,7 @@ #define MICROPY_PY_BUILTINS_MIN_MAX (1) #define MICROPY_PY_BUILTINS_PROPERTY (1) #define MICROPY_PY_BUILTINS_REVERSED (1) +#define MICROPY_PY_BUILTINS_ROUND_INT (1) #define MICROPY_PY_BUILTINS_SET (1) #define MICROPY_PY_BUILTINS_SLICE (1) #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1) diff --git a/py/modbuiltins.c b/py/modbuiltins.c index 124dcd05a..e764f1987 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -455,13 +455,13 @@ STATIC mp_obj_t mp_builtin_round(size_t n_args, const mp_obj_t *args) { return o_in; } - #if !MICROPY_PY_BUILTINS_ROUND_INT - mp_raise_NotImplementedError(NULL); - #else mp_int_t num_dig = mp_obj_get_int(args[1]); if (num_dig >= 0) { return o_in; } + #if !MICROPY_PY_BUILTINS_ROUND_INT + mp_raise_NotImplementedError(NULL); + #else mp_obj_t mult = mp_binary_op(MP_BINARY_OP_POWER, MP_OBJ_NEW_SMALL_INT(10), MP_OBJ_NEW_SMALL_INT(-num_dig)); mp_obj_t half_mult = mp_binary_op(MP_BINARY_OP_FLOOR_DIVIDE, mult, MP_OBJ_NEW_SMALL_INT(2)); |