Merge pull request adafruit#8840 from tannewt/reload_from_repl

dhalbert · web-flow · commit d7716de96839 · 2024-01-25T16:28:06.000-05:00
Make `supervisor.reload()` from REPL work
diff --git a/main.c b/main.c
@@ -1099,7 +1099,7 @@ int __attribute__((used)) main(void) {
             exit_code = run_repl(get_safe_mode());
             supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
         }
-        if (exit_code == PYEXEC_FORCED_EXIT) {
+        if (exit_code & (PYEXEC_FORCED_EXIT | PYEXEC_RELOAD)) {
             if (!simulate_reset) {
                 serial_write_compressed(MP_ERROR_TEXT("soft reboot\n"));
             }
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
@@ -602,7 +602,7 @@ int pyexec_raw_repl(void) {
         }
 
         int ret = parse_compile_execute(&line, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF | EXEC_FLAG_SOURCE_IS_VSTR, NULL);
-        if (ret & PYEXEC_FORCED_EXIT) {
+        if (ret & (PYEXEC_FORCED_EXIT | PYEXEC_RELOAD)) {
             return ret;
         }
     }
@@ -739,7 +739,7 @@ int pyexec_friendly_repl(void) {
         }
 
         ret = parse_compile_execute(&line, parse_input_kind, EXEC_FLAG_ALLOW_DEBUGGING | EXEC_FLAG_IS_REPL | EXEC_FLAG_SOURCE_IS_VSTR, NULL);
-        if (ret & PYEXEC_FORCED_EXIT) {
+        if (ret & (PYEXEC_FORCED_EXIT | PYEXEC_RELOAD)) {
             return ret;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1099,7 +1099,7 @@ int __attribute__((used)) main(void) {`
`1099`	`1099`	`exit_code = run_repl(get_safe_mode());`
`1100`	`1100`	`supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);`
`1101`	`1101`	`}`
`1102`		`- if (exit_code == PYEXEC_FORCED_EXIT) {`
	`1102`	`+ if (exit_code & (PYEXEC_FORCED_EXIT \| PYEXEC_RELOAD)) {`
`1103`	`1103`	`if (!simulate_reset) {`
`1104`	`1104`	`serial_write_compressed(MP_ERROR_TEXT("soft reboot\n"));`
`1105`	`1105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ int pyexec_raw_repl(void) {`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`int ret = parse_compile_execute(&line, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF \| EXEC_FLAG_SOURCE_IS_VSTR, NULL);`
`605`		`- if (ret & PYEXEC_FORCED_EXIT) {`
	`605`	`+ if (ret & (PYEXEC_FORCED_EXIT \| PYEXEC_RELOAD)) {`
`606`	`606`	`return ret;`
`607`	`607`	`}`
`608`	`608`	`}`
`@@ -739,7 +739,7 @@ int pyexec_friendly_repl(void) {`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`ret = parse_compile_execute(&line, parse_input_kind, EXEC_FLAG_ALLOW_DEBUGGING \| EXEC_FLAG_IS_REPL \| EXEC_FLAG_SOURCE_IS_VSTR, NULL);`
`742`		`- if (ret & PYEXEC_FORCED_EXIT) {`
	`742`	`+ if (ret & (PYEXEC_FORCED_EXIT \| PYEXEC_RELOAD)) {`
`743`	`743`	`return ret;`
`744`	`744`	`}`
`745`	`745`	`}`