Ctrl-C was causing a soft-reset in REPL.

dhalbert · tannewt · commit acbca4451253 · 2017-09-06T14:47:23.000-07:00
Also allow an immediate ctrl-c in `input()`.
diff --git a/atmel-samd/mphalport.c b/atmel-samd/mphalport.c
@@ -11,6 +11,7 @@
 #include "lib/utils/interrupt_char.h"
 #include "py/mphal.h"
 #include "py/mpstate.h"
+#include "py/runtime.h"
 #include "py/smallint.h"
 #include "shared-bindings/time/__init__.h"
 
@@ -157,6 +158,11 @@ int mp_hal_stdin_rx_chr(void) {
         #ifdef MICROPY_VM_HOOK_LOOP
             MICROPY_VM_HOOK_LOOP
         #endif
+        // Check to see if we've been CTRL-Ced by autoreload or the user. Raise the exception if so.
+        if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+            mp_handle_pending();
+        }
+
         #ifdef USB_REPL
         if (reload_next_character) {
             return CHAR_CTRL_D;
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
@@ -121,9 +121,6 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         } else {
             mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
             ret = PYEXEC_EXCEPTION;
-            if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_KeyboardInterrupt)) {
-                ret = PYEXEC_FORCED_EXIT;
-            }
         }
     }
     if (result != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,6 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input`
`121`	`121`	`} else {`
`122`	`122`	`mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);`
`123`	`123`	`ret = PYEXEC_EXCEPTION;`
`124`		`- if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_KeyboardInterrupt)) {`
`125`		`- ret = PYEXEC_FORCED_EXIT;`
`126`		`- }`
`127`	`124`	`}`
`128`	`125`	`}`
`129`	`126`	`if (result != NULL) {`