diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-02-28 23:44:45 (GMT) |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-02-28 23:44:45 (GMT) |
| commit | c176132d6393b7f8908d0d5f9934311273137c6e (patch) | |
| tree | 0aef154ac09e7385658f65907601cab3b19fafa2 | |
| parent | 56ba72a5630071e4b4c355cbb4af86e189ed5ba3 (diff) | |
| download | cpython-c176132d6393b7f8908d0d5f9934311273137c6e.zip cpython-c176132d6393b7f8908d0d5f9934311273137c6e.tar.gz cpython-c176132d6393b7f8908d0d5f9934311273137c6e.tar.bz2 | |
Warn about global statement at the module level.
Do better accounting for global variables.
| -rw-r--r-- | Python/compile.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Python/compile.c b/Python/compile.c index 3ff984b..80a5fbf 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4178,7 +4178,7 @@ symtable_check_shadow(struct symtable *st, PyObject *name, int flags) { char buf[500]; PyObject *children, *v; - PySymtableEntryObject *child; + PySymtableEntryObject *child = NULL; int i; if (!(flags & DEF_BOUND)) @@ -4202,7 +4202,9 @@ symtable_check_shadow(struct symtable *st, PyObject *name, int flags) if (!(cflags & DEF_BOUND)) break; } - + + assert(child != NULL); + sprintf(buf, "local name '%.100s' in '%.100s' shadows " "use of '%.100s' as global in nested scope '%.100s'", PyString_AS_STRING(name), @@ -4328,6 +4330,10 @@ symtable_load_symbols(struct compiling *c) if (PyDict_SetItem(c->c_globals, name, implicit) < 0) goto fail; + v = PyInt_FromLong(flags); + if (PyDict_SetItem(st->st_global, name, v)) + goto fail; + Py_DECREF(v); } } } @@ -4360,6 +4366,7 @@ symtable_init() st->st_nscopes = 0; st->st_errors = 0; st->st_tmpname = 0; + st->st_global_star = 0; st->st_private = NULL; return st; fail: @@ -4922,6 +4929,12 @@ symtable_global(struct symtable *st, node *n) { int i; + if (st->st_nscopes == 1) { + if (symtable_warn(st, + "global statement has no meaning at module level") < 0) + return; + } + for (i = 1; i < NCH(n); i += 2) { char *name = STR(CHILD(n, i)); int flags; @@ -4991,6 +5004,8 @@ symtable_import(struct symtable *st, node *n) } if (TYPE(CHILD(n, 3)) == STAR) { st->st_cur->ste_optimized |= OPT_IMPORT_STAR; + if (st->st_nscopes == 1) + st->st_global_star = 1; } else { for (i = 3; i < NCH(n); i += 2) { node *c = CHILD(n, i); |