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 e0b28c9e0d0025a21f3e246382778690b0fc5b6a..f3ba088939bda1d7d371b7d317b84fbee512c966 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1217,9 +1217,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);
@@ -1495,7 +1494,7 @@ symtable_visit_genexp(struct symtable *st, expr_ty e)
        VISIT(st, expr, outermost->iter);
        /* Create generator scope for the rest */
        if (!GET_IDENTIFIER(genexpr) ||
-           !symtable_enter_block(st, genexpr, FunctionBlock, (void *)e, 0)) {
+           !symtable_enter_block(st, genexpr, FunctionBlock, (void *)e, e->lineno)) {
                return 0;
        }
        st->st_cur->ste_generator = 1;