From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 16 Nov 2005 12:45:24 +0000 (+0000)
Subject: Bring handling of genexpr in line with other anonymous scope names
X-Git-Tag: v2.5a0~1154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99b2533539dbc98fe7e5b3ac95e71879afca1c2c;p=thirdparty%2FPython%2Fcpython.git

Bring handling of genexpr in line with other anonymous scope names
---

diff --git a/Python/symtable.c b/Python/symtable.c
index 2681cbda336b..fad7cec638df 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -170,7 +170,7 @@ static int symtable_visit_params_nested(struct symtable *st, asdl_seq *args);
 static int symtable_implicit_arg(struct symtable *st, int pos);
 
 
-static identifier top = NULL, lambda = NULL;
+static identifier top = NULL, lambda = NULL, genexpr = NULL;
 
 #define GET_IDENTIFIER(VAR) \
 	((VAR) ? (VAR) : ((VAR) = PyString_InternFromString(# VAR)))
@@ -1329,14 +1329,13 @@ symtable_visit_slice(struct symtable *st, slice_ty s)
 static int 
 symtable_visit_genexp(struct symtable *st, expr_ty e)
 {
-	identifier tmp;
 	comprehension_ty outermost = ((comprehension_ty)
 			 (asdl_seq_GET(e->v.GeneratorExp.generators, 0)));
 	/* Outermost iterator is evaluated in current scope */
 	VISIT(st, expr, outermost->iter);
 	/* Create generator scope for the rest */
-	tmp = PyString_FromString("<genexpr>");
-	if (!symtable_enter_block(st, tmp, FunctionBlock, (void *)e, 0)) {
+	if (!symtable_enter_block(st, GET_IDENTIFIER(genexpr),
+				  FunctionBlock, (void *)e, 0)) {
 		return 0;
 	}
 	st->st_cur->ste_generator = 1;