unix/main: Replace execute_from_lexer with pyexec_vstr in do_str.

pi-anl · pi-anl · commit 11241dae20fc · 2025-07-22T15:30:13.000+10:00
Consolidates string execution to use the standard pyexec interface
for consistency with other ports.

Simplify execute_from_lexer for remaining usage:
Remove unused LEX_SRC_VSTR and LEX_SRC_FILENAME cases, keeping only
LEX_SRC_STR for REPL and LEX_SRC_STDIN for stdin execution.

Signed-off-by: Andrew Leech &lt;andrew.leech@planetinnovation.com.au&gt;
diff --git a/ports/unix/main.c b/ports/unix/main.c
@@ -110,8 +110,6 @@ static int handle_uncaught_exception(mp_obj_base_t *exc) {
 }
 
 #define LEX_SRC_STR (1)
-#define LEX_SRC_VSTR (2)
-#define LEX_SRC_FILENAME (3)
 #define LEX_SRC_STDIN (4)
 
 // Returns standard error codes: 0 for success, 1 for all other errors,
@@ -127,12 +125,6 @@ static int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
         if (source_kind == LEX_SRC_STR) {
             const char *line = source;
             lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line, strlen(line), false);
-        } else if (source_kind == LEX_SRC_VSTR) {
-            const vstr_t *vstr = source;
-            lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
-        } else if (source_kind == LEX_SRC_FILENAME) {
-            const char *filename = (const char *)source;
-            lex = mp_lexer_new_from_file(qstr_from_str(filename));
         } else { // LEX_SRC_STDIN
             lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
         }
@@ -259,7 +251,18 @@ static int do_file(const char *file) {
 }
 
 static int do_str(const char *str) {
-    return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
+    vstr_t vstr;
+    vstr_init(&vstr, strlen(str));
+    vstr_add_strn(&vstr, str, strlen(str));
+    int ret = pyexec_vstr(&vstr, false);
+    vstr_clear(&vstr);
+    if (ret == 1) {
+        return 0; // success
+    } else if (ret & PYEXEC_FORCED_EXIT) {
+        return ret; // SystemExit with exit value in lower 8 bits
+    } else {
+        return 1; // exception
+    }
 }
 
 static void print_help(char **argv) {
