From 517507c6d5d740ab548faddb9e0c57092d19a188 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 23 Sep 2016 20:26:30 +0200 Subject: [PATCH] Issue #28100: Refactor error messages, patch by Ivan Levkivskyi --- Python/symtable.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c index f762904240f..bf30eccdabb 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1282,14 +1282,12 @@ 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) { - msg = GLOBAL_ANNOT; - } - if (cur & DEF_LOCAL) { - msg = GLOBAL_AFTER_ASSIGN; - } - else { + if (cur & USE) { msg = GLOBAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { + msg = GLOBAL_ANNOT; + } else { /* DEF_LOCAL */ + msg = GLOBAL_AFTER_ASSIGN; } PyErr_Format(PyExc_SyntaxError, msg, name); @@ -1315,14 +1313,12 @@ 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) { - msg = NONLOCAL_ANNOT; - } - if (cur & DEF_LOCAL) { - msg = NONLOCAL_AFTER_ASSIGN; - } - else { + if (cur & USE) { msg = NONLOCAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { + msg = NONLOCAL_ANNOT; + } else { /* DEF_LOCAL */ + msg = NONLOCAL_AFTER_ASSIGN; } PyErr_Format(PyExc_SyntaxError, msg, name); PyErr_SyntaxLocationObject(st->st_filename,