Add SystemExit exception and use it in unix/ and stmhal/ ports.

dpgeorge · dpgeorge · commit 7a4ddd24281a · 2014-05-24T23:32:19.000+01:00
Addresses issue adafruit#598.
diff --git a/py/obj.h b/py/obj.h
@@ -344,6 +344,7 @@ extern const mp_obj_type_t mp_type_RuntimeError;
 extern const mp_obj_type_t mp_type_StopIteration;
 extern const mp_obj_type_t mp_type_SyntaxError;
 extern const mp_obj_type_t mp_type_SystemError;
+extern const mp_obj_type_t mp_type_SystemExit;
 extern const mp_obj_type_t mp_type_TypeError;
 extern const mp_obj_type_t mp_type_ValueError;
 extern const mp_obj_type_t mp_type_ZeroDivisionError;
diff --git a/py/objexcept.c b/py/objexcept.c
@@ -159,7 +159,7 @@ const mp_obj_type_t mp_type_ ## exc_name = { \
 // List of all exceptions, arranged as in the table at:
 // http://docs.python.org/3.3/library/exceptions.html
 MP_DEFINE_EXCEPTION_BASE(BaseException)
-//MP_DEFINE_EXCEPTION(SystemExit, BaseException)
+MP_DEFINE_EXCEPTION(SystemExit, BaseException)
 //MP_DEFINE_EXCEPTION(KeyboardInterrupt, BaseException)
 MP_DEFINE_EXCEPTION(GeneratorExit, BaseException)
 MP_DEFINE_EXCEPTION(Exception, BaseException)
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
@@ -102,6 +102,7 @@ Q(OverflowError)
 Q(RuntimeError)
 Q(SyntaxError)
 Q(SystemError)
+Q(SystemExit)
 Q(TypeError)
 Q(UnboundLocalError)
 Q(ValueError)
diff --git a/stmhal/main.c b/stmhal/main.c
@@ -556,7 +556,6 @@ STATIC NORETURN mp_obj_t mp_sys_exit(uint n_args, const mp_obj_t *args) {
     if (n_args > 0) {
         rc = mp_obj_get_int(args[0]);
     }
-    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_NotImplementedError,
-        "sys.exit(%d) called, is not fully implemented", rc));
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_SystemExit, mp_obj_new_int(rc)));
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);
diff --git a/unix/main.c b/unix/main.c
@@ -123,6 +123,11 @@ STATIC int execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind,
         return 0;
     } else {
         // uncaught exception
+        // 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_print_exception((mp_obj_t)nlr.ret_val);
         return 1;
     }
@@ -383,7 +388,7 @@ STATIC mp_obj_t mp_sys_exit(uint n_args, const mp_obj_t *args) {
     if (n_args > 0) {
         rc = mp_obj_get_int(args[0]);
     }
-    exit(rc);
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_SystemExit, mp_obj_new_int(rc)));
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);
 

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,6 @@ STATIC NORETURN mp_obj_t mp_sys_exit(uint n_args, const mp_obj_t *args) {`
`556`	`556`	`if (n_args > 0) {`
`557`	`557`	`rc = mp_obj_get_int(args[0]);`
`558`	`558`	`}`
`559`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_NotImplementedError,`
`560`		`- "sys.exit(%d) called, is not fully implemented", rc));`
	`559`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_SystemExit, mp_obj_new_int(rc)));`
`561`	`560`	`}`
`562`	`561`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,11 @@ STATIC int execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind,`
`123`	`123`	`return 0;`
`124`	`124`	`} else {`
`125`	`125`	`// uncaught exception`
	`126`	`+ // check for SystemExit`
	`127`	`+ mp_obj_t exc = (mp_obj_t)nlr.ret_val;`
	`128`	`+ if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_SystemExit)) {`
	`129`	`+ exit(mp_obj_get_int(mp_obj_exception_get_value(exc)));`
	`130`	`+ }`
`126`	`131`	`mp_obj_print_exception((mp_obj_t)nlr.ret_val);`
`127`	`132`	`return 1;`
`128`	`133`	`}`
`@@ -383,7 +388,7 @@ STATIC mp_obj_t mp_sys_exit(uint n_args, const mp_obj_t *args) {`
`383`	`388`	`if (n_args > 0) {`
`384`	`389`	`rc = mp_obj_get_int(args[0]);`
`385`	`390`	`}`
`386`		`- exit(rc);`
	`391`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_SystemExit, mp_obj_new_int(rc)));`
`387`	`392`	`}`
`388`	`393`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);`
`389`	`394`