(original) (raw)

changeset: 104037:966b57281536 branch: 3.6 parent: 104035:ab8e3dfee2f5 user: Christian Heimes christian@python.org date: Fri Sep 23 20:26:30 2016 +0200 files: Python/symtable.c description: Issue #28100: Refactor error messages, patch by Ivan Levkivskyi diff -r ab8e3dfee2f5 -r 966b57281536 Python/symtable.c --- a/Python/symtable.c Fri Sep 23 20:24:39 2016 +0200 +++ b/Python/symtable.c Fri Sep 23 20:26:30 2016 +0200 @@ -1282,15 +1282,13 @@ 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 @@ 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, /christian@python.org