mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py: Fix SyntaxError exception: don't have a block name, so pass NULL.

This commit is contained in:
Damien George 2014-04-13 15:01:28 +01:00
parent 73496fbbe4
commit 0e4ba25834
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
py/obj.c
View File

@ -55,10 +55,17 @@ void mp_obj_print_exception(mp_obj_t exc) {
printf("Traceback (most recent call last):\n"); printf("Traceback (most recent call last):\n");
for (int i = n - 3; i >= 0; i -= 3) { for (int i = n - 3; i >= 0; i -= 3) {
#if MICROPY_ENABLE_SOURCE_LINE #if MICROPY_ENABLE_SOURCE_LINE
printf(" File \"%s\", line %d, in %s\n", qstr_str(values[i]), (int)values[i + 1], qstr_str(values[i + 2])); printf(" File \"%s\", line %d", qstr_str(values[i]), (int)values[i + 1]);
#else #else
printf(" File \"%s\", in %s\n", qstr_str(values[i]), qstr_str(values[i + 2])); printf(" File \"%s\"", qstr_str(values[i]));
#endif #endif
// the block name can be NULL if it's unknown
qstr block = values[i + 2];
if (block == MP_QSTR_NULL) {
printf("\n");
} else {
printf(", in %s\n", qstr_str(block));
}
} }
} }
} }

3
py/parsehelper.c
View File

@ -61,7 +61,8 @@ mp_obj_t mp_parse_make_exception(mp_lexer_t *lex, mp_parse_error_kind_t parse_er
} }
// add traceback to give info about file name and location // add traceback to give info about file name and location
mp_obj_exception_add_traceback(exc, mp_lexer_source_name(lex), mp_lexer_cur(lex)->src_line, mp_lexer_cur(lex)->src_column); // we don't have a 'block' name, so just pass the NULL qstr to indicate this
mp_obj_exception_add_traceback(exc, mp_lexer_source_name(lex), mp_lexer_cur(lex)->src_line, MP_QSTR_NULL);
return exc; return exc;
} }