diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-08-16 14:32:06 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-08-16 14:32:06 +0100 |
| commit | 8f81b5cb4bebf6aeaecf3f19a92be288f633c542 (patch) | |
| tree | cdbef6f235845383e5a21cf9fb9f062f7fd1adf6 | |
| parent | b63be37be171dd9a88912e848a380fe035711d99 (diff) | |
| download | micropython-8f81b5cb4bebf6aeaecf3f19a92be288f633c542.tar.gz micropython-8f81b5cb4bebf6aeaecf3f19a92be288f633c542.zip | |
py: Put SystemExit in builtin namespace.
Also fix unix port so that SystemExit with no arg exits with value 0.
| -rw-r--r-- | py/builtintables.c | 1 | ||||
| -rw-r--r-- | unix/main.c | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/py/builtintables.c b/py/builtintables.c index e55e93b33a..08b6b16493 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -138,6 +138,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_StopIteration), (mp_obj_t)&mp_type_StopIteration }, { MP_OBJ_NEW_QSTR(MP_QSTR_SyntaxError), (mp_obj_t)&mp_type_SyntaxError }, { MP_OBJ_NEW_QSTR(MP_QSTR_SystemError), (mp_obj_t)&mp_type_SystemError }, + { MP_OBJ_NEW_QSTR(MP_QSTR_SystemExit), (mp_obj_t)&mp_type_SystemExit }, { MP_OBJ_NEW_QSTR(MP_QSTR_TypeError), (mp_obj_t)&mp_type_TypeError }, { MP_OBJ_NEW_QSTR(MP_QSTR_ValueError), (mp_obj_t)&mp_type_ValueError }, { MP_OBJ_NEW_QSTR(MP_QSTR_ZeroDivisionError), (mp_obj_t)&mp_type_ZeroDivisionError }, diff --git a/unix/main.c b/unix/main.c index 9f9f07c255..dd3fa533c2 100644 --- a/unix/main.c +++ b/unix/main.c @@ -130,7 +130,12 @@ STATIC int execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, // check for SystemExit mp_obj_t exc = (mp_obj_t)nlr.ret_val; if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_SystemExit)) { - exit(mp_obj_get_int(mp_obj_exception_get_value(exc))); + mp_obj_t exit_val = mp_obj_exception_get_value(exc); + mp_int_t val; + if (!mp_obj_get_int_maybe(exit_val, &val)) { + val = 0; + } + exit(val); } mp_obj_print_exception((mp_obj_t)nlr.ret_val); return 1; |