Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-08-30 22:40:40 +02:00
Code Issues Actions Packages Projects Releases Wiki 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

3
py/objexcept.c
View File

@@ -27,6 +27,7 @@ STATIC void mp_obj_exception_print(void (*print)(void *env, const char *fmt, ...
print(env, "%s: %s", qstr_str(o->base.type->name), vstr_str(o->msg));
} else {
// Yes, that's how CPython has it
// TODO now that exceptions are classes and instances, I think this needs to be changed to match CPython
if (kind == PRINT_REPR) {
print(env, "%s", qstr_str(o->base.type->name));
}
@@ -162,7 +163,7 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, machine_uint_t
// for traceback, we are just using the list object for convenience, it's not really a list of Python objects
if (self->traceback == MP_OBJ_NULL) {
self->traceback = mp_obj_new_list(3, NULL);
self->traceback = mp_obj_new_list(0, NULL);
}
mp_obj_list_append(self->traceback, (mp_obj_t)(machine_uint_t)file);
mp_obj_list_append(self->traceback, (mp_obj_t)(machine_uint_t)line);