From 180045bce9282c4a658284e01348f57841e39cdd Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 14 Mar 2017 11:26:43 +1100 Subject: [PATCH] zephyr/main: Move lexer constructor to within NLR handler block. And raise an exception when mp_lexer_new_from_file is called. --- zephyr/main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/zephyr/main.c b/zephyr/main.c index 25bd88f768..1f8589a6c9 100644 --- a/zephyr/main.c +++ b/zephyr/main.c @@ -44,14 +44,9 @@ #include "lib/mp-readline/readline.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) { - printf("MemoryError: lexer could not allocate memory\n"); - 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); @@ -130,7 +125,7 @@ void gc_collect(void) { } mp_lexer_t *mp_lexer_new_from_file(const char *filename) { - return NULL; + mp_raise_OSError(ENOENT); } mp_import_stat_t mp_import_stat(const char *path) {