TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: VM never throws an exception, instead returns a status and value.

Browse Source 
Addresses issue #290, and hopefully sets up things to allow generators
throwing exceptions, etc.
This commit is contained in:
Damien George
2014-02-15 22:55:00 +00:00
parent 36109d246f
commit c8f78bc280
6 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py/objfun.c
View File

@@ -152,10 +152,15 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_o
uint use_def_args = self->n_args - n_args;
mp_map_t *old_globals = rt_globals_get();
rt_globals_set(self->globals);
mp_obj_t result = mp_execute_byte_code(self->bytecode, args, n_args, self->def_args + self->n_def_args - use_def_args, use_def_args, self->n_state);
mp_obj_t result;
mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code(self->bytecode, args, n_args, self->def_args + self->n_def_args - use_def_args, use_def_args, self->n_state, &result);
rt_globals_set(old_globals);
return result;
if (vm_return_kind == MP_VM_RETURN_NORMAL) {
return result;
} else { // MP_VM_RETURN_EXCEPTION
nlr_jump(result);
}
}
const mp_obj_type_t fun_bc_type = {