From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 20 Nov 2009 01:19:41 +0000 (+0000)
Subject: Merged revisions 76423-76424 via svnmerge from
X-Git-Tag: v3.2a1~2146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3ebc1f93030b6cc84cee8b620b4f69321c87bbb;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76423-76424 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76423 | benjamin.peterson | 2009-11-19 19:15:53 -0600 (Thu, 19 Nov 2009) | 1 line

  provide line number for lambdas
........
  r76424 | benjamin.peterson | 2009-11-19 19:16:58 -0600 (Thu, 19 Nov 2009) | 1 line

  genexps have linenos
........
---

diff --git a/Python/symtable.c b/Python/symtable.c
index e0e63daa098c..7fa01b899ee4 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1323,9 +1323,8 @@ symtable_visit_expr(struct symtable *st, expr_ty e)
 			return 0;
 		if (e->v.Lambda.args->defaults)
 			VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
-		/* XXX how to get line numbers for expressions */
 		if (!symtable_enter_block(st, lambda,
-                                          FunctionBlock, (void *)e, 0))
+                                          FunctionBlock, (void *)e, e->lineno))
 			return 0;
 		VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
 		VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
@@ -1623,7 +1622,7 @@ symtable_handle_comprehension(struct symtable *st, expr_ty e,
 	VISIT(st, expr, outermost->iter);
 	/* Create comprehension scope for the rest */
 	if (!scope_name ||
-	    !symtable_enter_block(st, scope_name, FunctionBlock, (void *)e, 0)) {
+	    !symtable_enter_block(st, scope_name, FunctionBlock, (void *)e, e->lineno)) {
 		return 0;
 	}
 	st->st_cur->ste_generator = is_generator;