summaryrefslogtreecommitdiffstats
path: root/Python/ast.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-02 15:52:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-02 15:52:56 (GMT)
commitf86d1fdab79cd6cab150fffecbc76388cb5b7f92 (patch)
tree2fac42729f6139812ed9d7798a898d8a04077d52 /Python/ast.c
parent0e259f18f7ada32dd1a37ac883ea17df9c60bc53 (diff)
parent7a66fc22ad62563d0907c2fc91229656acfa0dd6 (diff)
downloadcpython-f86d1fdab79cd6cab150fffecbc76388cb5b7f92.zip
cpython-f86d1fdab79cd6cab150fffecbc76388cb5b7f92.tar.gz
cpython-f86d1fdab79cd6cab150fffecbc76388cb5b7f92.tar.bz2
merge 3.4 (#21295)
Diffstat (limited to 'Python/ast.c')
-rw-r--r--Python/ast.c35
1 files changed, 13 insertions, 22 deletions
diff --git a/Python/ast.c b/Python/ast.c
index d6bddf1..2f1ae60 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1127,7 +1127,7 @@ ast_for_arg(struct compiling *c, const node *n)
identifier name;
expr_ty annotation = NULL;
node *ch;
- arg_ty tmp;
+ arg_ty ret;
assert(TYPE(n) == tfpdef || TYPE(n) == vfpdef);
ch = CHILD(n, 0);
@@ -1143,13 +1143,12 @@ ast_for_arg(struct compiling *c, const node *n)
return NULL;
}
- tmp = arg(name, annotation, c->c_arena);
- if (!tmp)
+ ret = arg(name, annotation, c->c_arena);
+ if (!ret)
return NULL;
-
- tmp->lineno = LINENO(n);
- tmp->col_offset = n->n_col_offset;
- return tmp;
+ ret->lineno = LINENO(n);
+ ret->col_offset = n->n_col_offset;
+ return ret;
}
/* returns -1 if failed to handle keyword only arguments
@@ -2107,22 +2106,15 @@ ast_for_trailer(struct compiling *c, const node *n, expr_ty left_expr)
if (NCH(n) == 2)
return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
n->n_col_offset, c->c_arena);
- else {
- expr_ty tmp = ast_for_call(c, CHILD(n, 1), left_expr);
- if (!tmp)
- return NULL;
-
- tmp->lineno = LINENO(n);
- tmp->col_offset = n->n_col_offset;
- return tmp;
- }
+ else
+ return ast_for_call(c, CHILD(n, 1), left_expr);
}
- else if (TYPE(CHILD(n, 0)) == DOT ) {
+ else if (TYPE(CHILD(n, 0)) == DOT) {
PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1));
if (!attr_id)
return NULL;
return Attribute(left_expr, attr_id, Load,
- LINENO(CHILD(n, 1)), CHILD(n, 1)->n_col_offset, c->c_arena);
+ LINENO(n), n->n_col_offset, c->c_arena);
}
else {
REQ(CHILD(n, 0), LSQB);
@@ -2223,16 +2215,15 @@ ast_for_power(struct compiling *c, const node *n)
tmp = ast_for_trailer(c, ch, e);
if (!tmp)
return NULL;
+ tmp->lineno = e->lineno;
+ tmp->col_offset = e->col_offset;
e = tmp;
}
if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
if (!f)
return NULL;
- tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
- if (!tmp)
- return NULL;
- e = tmp;
+ e = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
}
return e;
}