From c72a5f8c79514ac93b62e1a767a5d413105d7dd6 Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 14 Mar 2017 11:24:26 +1100 Subject: [PATCH] bare-arm/main: Move lexer constructor to within NLR handler block. And raise an exception when mp_lexer_new_from_file is called. --- bare-arm/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bare-arm/main.c b/bare-arm/main.c index 99a7f926ef..938414dfe8 100644 --- a/bare-arm/main.c +++ b/bare-arm/main.c @@ -6,15 +6,12 @@ #include "py/compile.h" #include "py/runtime.h" #include "py/repl.h" +#include "py/mperrno.h" void do_str(const char *src, mp_parse_input_kind_t input_kind) { - mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0); - if (lex == NULL) { - return; - } - nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { + mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0); qstr source_name = lex->source_name; mp_parse_tree_t parse_tree = mp_parse(lex, input_kind); mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true); @@ -35,7 +32,7 @@ int main(int argc, char **argv) { } mp_lexer_t *mp_lexer_new_from_file(const char *filename) { - return NULL; + mp_raise_OSError(MP_ENOENT); } mp_import_stat_t mp_import_stat(const char *path) {