commit 558a016e2c02157aa610ae55e72e14a18e43abc5
author Damien George <damien.p.george@gmail.com> Mon Sep 07 16:55:02 2015 +0100
committer Damien George <damien.p.george@gmail.com> Mon Sep 07 16:55:02 2015 +0100
tree d4152f14ff7baa9a6759bbd407a45e14e8c640f3
parent 3a2171e4061f3a6e3f00c28edf78ff9473355887

py/compile: Refine SyntaxError for repeated use of global/nonlocal.

py/compile.c

diff --git a/py/compile.c b/py/compile.c
index 8580c8c..34f377f 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1355,9 +1355,8 @@
 STATIC void compile_declare_global(compiler_t *comp, mp_parse_node_t pn, qstr qst) {
     bool added;
     id_info_t *id_info = scope_find_or_add_id(comp->scope_cur, qst, &added);
-    if (!added) {
-        // TODO this is not compliant with CPython
-        compile_syntax_error(comp, pn, "identifier already used");
+    if (!added && id_info->kind != ID_INFO_KIND_GLOBAL_EXPLICIT) {
+        compile_syntax_error(comp, pn, "identifier redefined as global");
         return;
     }
     id_info->kind = ID_INFO_KIND_GLOBAL_EXPLICIT;
@@ -1382,9 +1381,8 @@
 STATIC void compile_declare_nonlocal(compiler_t *comp, mp_parse_node_t pn, qstr qst) {
     bool added;
     id_info_t *id_info = scope_find_or_add_id(comp->scope_cur, qst, &added);
-    if (!added) {
-        // TODO this is not compliant with CPython
-        compile_syntax_error(comp, pn, "identifier already used");
+    if (!added && id_info->kind != ID_INFO_KIND_FREE) {
+        compile_syntax_error(comp, pn, "identifier redefined as nonlocal");
         return;
     }
     id_info_t *id_info2 = scope_find_local_in_parent(comp->scope_cur, qst);