python-checkins at python
Nov 19, 2009, 6:20 PM
Post #1 of 1
(143 views)
Permalink
|
|
r76427 - in python/branches/release31-maint: Python/symtable.c
|
|
Author: benjamin.peterson
Date: Fri Nov 20 02:21:35 2009
New Revision: 76427
Log:
Merged revisions 76425 via svnmerge from
svn+ssh://pythondev [at] svn/python/branches/py3k
................
r76425 | benjamin.peterson | 2009-11-19 19:19:41 -0600 (Thu, 19 Nov 2009) | 13 lines
Merged revisions 76423-76424 via svnmerge from
svn+ssh://pythondev [at] svn/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
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Python/symtable.c
Modified: python/branches/release31-maint/Python/symtable.c
==============================================================================
--- python/branches/release31-maint/Python/symtable.c (original)
+++ python/branches/release31-maint/Python/symtable.c Fri Nov 20 02:21:35 2009
@@ -1331,9 +1331,8 @@
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);
@@ -1631,7 +1630,7 @@
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;
_______________________________________________
Python-checkins mailing list
Python-checkins [at] python
http://mail.python.org/mailman/listinfo/python-checkins
|
