diff options
author | Damien George <damien.p.george@gmail.com> | 2015-02-07 18:33:58 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2015-02-07 18:33:58 +0000 |
commit | 0bfc7638baa4c5a4a2351364ab770a188dcab302 (patch) | |
tree | 0127fcea13a875d37dd9cfa07dc6921bf387c578 /unix-cpy/main.c | |
parent | e1e359ff59d6bbf09441cc1f3965be63f1046182 (diff) | |
download | micropython-0bfc7638baa4c5a4a2351364ab770a188dcab302.tar.gz micropython-0bfc7638baa4c5a4a2351364ab770a188dcab302.zip |
py: Protect mp_parse and mp_compile with nlr push/pop block.
To enable parsing constants more efficiently, mp_parse should be allowed
to raise an exception, and mp_compile can already raise a MemoryError.
So these functions need to be protected by an nlr push/pop block.
This patch adds that feature in all places. This allows to simplify how
mp_parse and mp_compile are called: they now raise an exception if they
have an error and so explicit checking is not needed anymore.
Diffstat (limited to 'unix-cpy/main.c')
-rw-r--r-- | unix-cpy/main.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/unix-cpy/main.c b/unix-cpy/main.c index 245fc0b17a..e3803b9b3a 100644 --- a/unix-cpy/main.c +++ b/unix-cpy/main.c @@ -30,7 +30,6 @@ #include <string.h> #include "py/nlr.h" -#include "py/parsehelper.h" #include "py/compile.h" #include "py/runtime.h" #include "py/pfenv.h" @@ -51,17 +50,7 @@ void do_file(const char *file) { } else { // parse - mp_parse_error_kind_t parse_error_kind; - mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT, &parse_error_kind); - - if (pn == MP_PARSE_NODE_NULL) { - // parse error - mp_parse_show_exception(lex, parse_error_kind); - mp_lexer_free(lex); - return; - } - - mp_lexer_free(lex); + mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT); if (pn != MP_PARSE_NODE_NULL) { //printf("----------------\n"); @@ -72,10 +61,6 @@ void do_file(const char *file) { mp_obj_t module_fun = mp_compile(pn, 0, MP_EMIT_OPT_NONE, false); //printf("----------------\n"); - - if (mp_obj_is_exception_instance(module_fun)) { - mp_obj_print_exception(printf_wrapper, NULL, module_fun); - } } } } |