Issue #28100: Refactor error messages, patch by Ivan Levkivskyi

tiran · tiran · commit 517507c6d5d7 · 2016-09-23T20:26:30.000+02:00
diff --git 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,
