diff options
| -rw-r--r-- | py/mpqstrraw.h | 1 | ||||
| -rw-r--r-- | py/objint.c | 8 | ||||
| -rw-r--r-- | py/runtime.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/py/mpqstrraw.h b/py/mpqstrraw.h index 6674a2c398..328cb73fac 100644 --- a/py/mpqstrraw.h +++ b/py/mpqstrraw.h @@ -32,6 +32,7 @@ Q(OSError) Q(SyntaxError) Q(TypeError) Q(ValueError) +Q(OverflowError) Q(abs) Q(all) diff --git a/py/objint.c b/py/objint.c index 937bff7ae3..59181eaf6d 100644 --- a/py/objint.c +++ b/py/objint.c @@ -56,7 +56,7 @@ mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { // This is called only with strings whose value doesn't fit in SMALL_INT mp_obj_t mp_obj_new_int_from_long_str(const char *s) { - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "long int not supported in this build")); return mp_const_none; } @@ -66,8 +66,7 @@ mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) { if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) { return MP_OBJ_NEW_SMALL_INT(value); } - // TODO: Raise exception - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "small int overflow")); return mp_const_none; } @@ -75,8 +74,7 @@ mp_obj_t mp_obj_new_int(machine_int_t value) { if (MP_OBJ_FITS_SMALL_INT(value)) { return MP_OBJ_NEW_SMALL_INT(value); } - // TODO: Raise exception - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "small int overflow")); return mp_const_none; } #endif diff --git a/py/runtime.c b/py/runtime.c index d6ef6f9be2..0d1381cff8 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -89,6 +89,9 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_TypeError, mp_obj_new_exception(MP_QSTR_TypeError)); mp_map_add_qstr(&map_builtins, MP_QSTR_SyntaxError, mp_obj_new_exception(MP_QSTR_SyntaxError)); mp_map_add_qstr(&map_builtins, MP_QSTR_ValueError, mp_obj_new_exception(MP_QSTR_ValueError)); + // Somehow CPython managed to have OverflowError not inherit from ValueError ;-/ + // TODO: For MICROPY_CPYTHON_COMPAT==0 use ValueError to avoid exc proliferation + mp_map_add_qstr(&map_builtins, MP_QSTR_OverflowError, mp_obj_new_exception(MP_QSTR_OverflowError)); mp_map_add_qstr(&map_builtins, MP_QSTR_OSError, mp_obj_new_exception(MP_QSTR_OSError)); mp_map_add_qstr(&map_builtins, MP_QSTR_AssertionError, mp_obj_new_exception(MP_QSTR_AssertionError)); |