TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Add mp_raise_type helper macro and use it where appropriate.

Browse Source 
This provides a more consistent C-level API to raise exceptions, ie moving
away from nlr_raise towards mp_raise_XXX.  It also reduces code size by a
small amount on some ports.
This commit is contained in:
Damien George
2020-02-11 13:17:41 +11:00
parent 7679e3be96
commit 97eca38c4f
12 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py/modbuiltins.c
View File

@@ -244,10 +244,10 @@ STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
vstr_init(&line, 16);
int ret = mp_hal_readline(&line, "");
if (ret == CHAR_CTRL_C) {
nlr_raise(mp_obj_new_exception(&mp_type_KeyboardInterrupt));
mp_raise_type(&mp_type_KeyboardInterrupt);
}
if (line.len == 0 && ret == CHAR_CTRL_D) {
nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
mp_raise_type(&mp_type_EOFError);
}
return mp_obj_new_str_from_vstr(&mp_type_str, &line);
}
@@ -321,7 +321,7 @@ STATIC mp_obj_t mp_builtin_next(size_t n_args, const mp_obj_t *args) {
if (n_args == 1) {
mp_obj_t ret = mp_iternext_allow_raise(args[0]);
if (ret == MP_OBJ_STOP_ITERATION) {
nlr_raise(mp_obj_new_exception(&mp_type_StopIteration));
mp_raise_type(&mp_type_StopIteration);
} else {
return ret;
}
@@ -335,7 +335,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_next_obj, 1, 2, mp_builtin_next);
STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
mp_obj_t ret = mp_iternext_allow_raise(o);
if (ret == MP_OBJ_STOP_ITERATION) {
nlr_raise(mp_obj_new_exception(&mp_type_StopIteration));
mp_raise_type(&mp_type_StopIteration);
} else {
return ret;
}