remove tmpname support since it's no longer used

diff --git a/Include/symtable.h b/Include/symtable.h
index 32b4ebff33627dad9ed16b9e8a5fcd955511c4aa..29cd846cd5b66dc81c9fce3cdab6fee9f797b6c2 100644 (file)
--- a/Include/symtable.h
+++ b/Include/symtable.h
@@ -19,7 +19,6 @@ struct symtable {
        PyObject *st_global;     /* borrowed ref to MODULE in st_symbols */
        int st_nblocks;          /* number of blocks */
        PyObject *st_private;        /* name of current class or NULL */
-        int st_tmpname;          /* temporary name counter */
        PyFutureFeatures *st_future; /* module's future features */
 };
 
@@ -43,7 +42,6 @@ typedef struct _symtable_entry {
                                            an argument */
        int ste_lineno;          /* first line of block */
        int ste_opt_lineno;      /* lineno of last exec or import * */
-       int ste_tmpname;         /* counter for listcomp temp vars */
        struct symtable *ste_table;
 } PySTEntryObject;
 

diff --git a/Python/compile.c b/Python/compile.c
index 29cd95055365954cfd80712638c1b81c22f447f9..3b5f5ef0a77ff15d62c63d105680c9784390c21f 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -111,7 +111,6 @@ struct compiler_unit {
           members, you can reach all early allocated blocks. */
        basicblock *u_blocks;
        basicblock *u_curblock; /* pointer to current block */
-       int u_tmpname;          /* temporary variables for list comps */
 
        int u_nfblocks;
        struct fblockinfo u_fblock[CO_MAXBLOCKS];
@@ -468,7 +467,6 @@ compiler_enter_scope(struct compiler *c, identifier name, void *key,
        }
 
        u->u_blocks = NULL;
-       u->u_tmpname = 0;
        u->u_nfblocks = 0;
        u->u_firstlineno = lineno;
        u->u_lineno = 0;

diff --git a/Python/symtable.c b/Python/symtable.c
index ab5f9660747e9ee160cf0ba6e6257fa3c0acfdf4..423679ef8031db119daadc6687c7cf41e71ef308 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -32,7 +32,6 @@ ste_new(struct symtable *st, identifier name, _Py_block_ty block,
                goto fail;
        ste->ste_table = st;
        ste->ste_id = k;
-       ste->ste_tmpname = 0;
 
        ste->ste_name = name;
        Py_INCREF(name);
@@ -60,7 +59,6 @@ ste_new(struct symtable *st, identifier name, _Py_block_ty block,
        ste->ste_varargs = 0;
        ste->ste_varkeywords = 0;
        ste->ste_opt_lineno = 0;
-       ste->ste_tmpname = 0;
        ste->ste_lineno = lineno;
 
        if (st->st_cur != NULL &&
@@ -204,7 +202,6 @@ symtable_new(void)
        if ((st->st_symbols = PyDict_New()) == NULL)
                goto fail; 
        st->st_cur = NULL;
-       st->st_tmpname = 0;
        st->st_private = NULL;
        return st;
  fail:
@@ -994,23 +991,6 @@ error:
        } \
 }
 
-static int
-symtable_new_tmpname(struct symtable *st)
-{
-       char tmpname[256];
-       identifier tmp;
-
-       PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
-                     ++st->st_cur->ste_tmpname);
-       tmp = PyString_InternFromString(tmpname);
-       if (!tmp)
-               return 0;
-       if (!symtable_add_def(st, tmp, DEF_LOCAL))
-               return 0;
-       Py_DECREF(tmp);
-       return 1;
-}
-
 static int
 symtable_visit_stmt(struct symtable *st, stmt_ty s)
 {
@@ -1184,12 +1164,8 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
                /* nothing to do here */
                break;
         case With_kind:
-               if (!symtable_new_tmpname(st))
-                       return 0;
                 VISIT(st, expr, s->v.With.context_expr);
                 if (s->v.With.optional_vars) {
-                       if (!symtable_new_tmpname(st))
-                               return 0;
                         VISIT(st, expr, s->v.With.optional_vars);
                 }
                 VISIT_SEQ(st, stmt, s->v.With.body);
@@ -1237,8 +1213,6 @@ symtable_visit_expr(struct symtable *st, expr_ty e)
                VISIT_SEQ(st, expr, e->v.Dict.values);
                break;
         case ListComp_kind:
-               if (!symtable_new_tmpname(st))
-                       return 0;
                VISIT(st, expr, e->v.ListComp.elt);
                VISIT_SEQ(st, comprehension, e->v.ListComp.generators);
                break;