mirror of
https://github.com/python/cpython.git
synced 2025-07-28 13:44:43 +00:00
the Slice in x[::] has to have step as None to help the interpreter
This commit is contained in:
parent
a2514f4ce9
commit
4879c907ce
3 changed files with 17 additions and 5 deletions
|
@ -150,7 +150,8 @@ class AST_Tests(unittest.TestCase):
|
||||||
slc = ast.parse("x[::]").body[0].value.slice
|
slc = ast.parse("x[::]").body[0].value.slice
|
||||||
self.assertIsNone(slc.upper)
|
self.assertIsNone(slc.upper)
|
||||||
self.assertIsNone(slc.lower)
|
self.assertIsNone(slc.lower)
|
||||||
self.assertIsNone(slc.step)
|
self.assertTrue(isinstance(slc.step, ast.Name))
|
||||||
|
self.assertEqual(slc.step.id, "None")
|
||||||
|
|
||||||
def test_from_import(self):
|
def test_from_import(self):
|
||||||
im = ast.parse("from . import y").body[0]
|
im = ast.parse("from . import y").body[0]
|
||||||
|
|
|
@ -44,9 +44,6 @@ Core and Builtins
|
||||||
|
|
||||||
- Assignment to None using import statements now raises a SyntaxError.
|
- Assignment to None using import statements now raises a SyntaxError.
|
||||||
|
|
||||||
- In the slice AST type, the step field will always be None if a step expression
|
|
||||||
is not specified.
|
|
||||||
|
|
||||||
- Issue #4547: When debugging a very large function, it was not always
|
- Issue #4547: When debugging a very large function, it was not always
|
||||||
possible to update the lineno attribute of the current frame.
|
possible to update the lineno attribute of the current frame.
|
||||||
|
|
||||||
|
|
16
Python/ast.c
16
Python/ast.c
|
@ -1471,7 +1471,21 @@ 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) {
|
||||||
|
/*
|
||||||
|
This is an extended slice (ie "x[::]") with no expression in the
|
||||||
|
step field. We set this literally to "None" in order to
|
||||||
|
disambiguate it from x[:]. (The interpreter might have to call
|
||||||
|
__getslice__ for x[:], but it must call __getitem__ for x[::].)
|
||||||
|
*/
|
||||||
|
identifier none = new_identifier("None", c->c_arena);
|
||||||
|
if (!none)
|
||||||
|
return NULL;
|
||||||
|
ch = CHILD(ch, 0);
|
||||||
|
step = Name(none, 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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue