diff options
| author | Christian Heimes <christian@python.org> | 2016-09-23 20:26:41 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2016-09-23 20:26:41 +0200 |
| commit | 20ef89ecef5d19db45f5f973f67d819525de53ca (patch) | |
| tree | 45d874fa0703a35de5ffb7364e93f844cf2bab12 /Python | |
| parent | fec86273228396b3aaf9e7ab8093b860544842fb (diff) | |
| parent | 517507c6d5d740ab548faddb9e0c57092d19a188 (diff) | |
| download | cpython-git-20ef89ecef5d19db45f5f973f67d819525de53ca.tar.gz | |
Issue #28100: Refactor error messages, patch by Ivan Levkivskyi
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/symtable.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Python/symtable.c b/Python/symtable.c index f762904240..bf30eccdab 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1282,15 +1282,13 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) VISIT_QUIT(st, 0); if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { char* msg; - if (cur & DEF_ANNOT) { + if (cur & USE) { + msg = GLOBAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { msg = GLOBAL_ANNOT; - } - if (cur & DEF_LOCAL) { + } else { /* DEF_LOCAL */ msg = GLOBAL_AFTER_ASSIGN; } - else { - msg = GLOBAL_AFTER_USE; - } PyErr_Format(PyExc_SyntaxError, msg, name); PyErr_SyntaxLocationObject(st->st_filename, @@ -1315,15 +1313,13 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) VISIT_QUIT(st, 0); if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { char* msg; - if (cur & DEF_ANNOT) { + if (cur & USE) { + msg = NONLOCAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { msg = NONLOCAL_ANNOT; - } - if (cur & DEF_LOCAL) { + } else { /* DEF_LOCAL */ msg = NONLOCAL_AFTER_ASSIGN; } - else { - msg = NONLOCAL_AFTER_USE; - } PyErr_Format(PyExc_SyntaxError, msg, name); PyErr_SyntaxLocationObject(st->st_filename, s->lineno, |