Fix bug 1441408 where a double colon didn't trigger extended slice semantics (applies patch 1452332)
This commit is contained in:
parent
db815abc70
commit
77858684e4
12
Python/ast.c
12
Python/ast.c
|
@ -1317,11 +1317,14 @@ ast_for_slice(struct compiling *c, const node *n)
|
||||||
|
|
||||||
ch = CHILD(n, NCH(n) - 1);
|
ch = CHILD(n, NCH(n) - 1);
|
||||||
if (TYPE(ch) == sliceop) {
|
if (TYPE(ch) == sliceop) {
|
||||||
if (NCH(ch) == 1)
|
if (NCH(ch) == 1) {
|
||||||
/* XXX: If only 1 child, then should just be a colon. Should we
|
/* No expression, so step is None */
|
||||||
just skip assigning and just get to the return? */
|
|
||||||
ch = CHILD(ch, 0);
|
ch = CHILD(ch, 0);
|
||||||
else
|
step = Name(new_identifier("None", c->c_arena), Load,
|
||||||
|
LINENO(ch), ch->n_col_offset, c->c_arena);
|
||||||
|
if (!step)
|
||||||
|
return NULL;
|
||||||
|
} else {
|
||||||
ch = CHILD(ch, 1);
|
ch = CHILD(ch, 1);
|
||||||
if (TYPE(ch) == test) {
|
if (TYPE(ch) == test) {
|
||||||
step = ast_for_expr(c, ch);
|
step = ast_for_expr(c, ch);
|
||||||
|
@ -1329,6 +1332,7 @@ ast_for_slice(struct compiling *c, const node *n)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Slice(lower, upper, step, c->c_arena);
|
return Slice(lower, upper, step, c->c_arena);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue