summaryrefslogtreecommitdiff
path: root/py/builtinimport.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-13 11:56:02 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-13 11:56:02 +0100
commit4b01de44ba110394cac66f83a44a037fc58ae4e8 (patch)
treea9b3593097097430fce786ab4340685007319275 /py/builtinimport.c
parent3d484d9ad45a8fc3b088047249d1304af77ec667 (diff)
py: Add traceback info to syntax errors.
Should fix issue #463.
Diffstat (limited to 'py/builtinimport.c')
-rw-r--r--py/builtinimport.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 697244878..3fb658c27 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -100,15 +100,18 @@ void do_load(mp_obj_t module_obj, vstr_t *file) {
// parse the imported script
mp_parse_error_kind_t parse_error_kind;
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT, &parse_error_kind);
- mp_lexer_free(lex);
if (pn == MP_PARSE_NODE_NULL) {
// parse error; clean up and raise exception
+ mp_obj_t exc = mp_parse_make_exception(lex, parse_error_kind);
+ mp_lexer_free(lex);
mp_locals_set(old_locals);
mp_globals_set(old_globals);
- nlr_raise(mp_parse_make_exception(parse_error_kind));
+ nlr_raise(exc);
}
+ mp_lexer_free(lex);
+
// compile the imported script
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, false);
mp_parse_node_free(pn);