languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 09:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #14741: Merge fix from 3.2.

Browse source
This commit is contained in:
Mark Dickinson 2012-05-07 17:25:14 +01:00
parent 72f6095d4f da029fb293
commit 943cab2fec
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_parser.py
View file

@ -110,6 +110,8 @@ def test_expressions(self):
self.check_expr("lambda x, *y, **z: 0")
self.check_expr("(x for x in range(10))")
self.check_expr("foo(x for x in range(10))")
self.check_expr("...")
self.check_expr("a[...]")
def test_simple_expression(self):
# expr_stmt

2
Misc/NEWS
View file

@ -20,6 +20,8 @@ Core and Builtins
Library
-------
- Issue #14741: Fix missing support for Ellipsis ('...') in parser module.
- Issue #14697: Fix missing support for set displays and set comprehensions in
parser module.

6
Modules/parsermodule.c
View file

@ -2419,17 +2419,13 @@ validate_atom(node *tree)
break;
case NAME:
case NUMBER:
case ELLIPSIS:
res = (nch == 1);
break;
case STRING:
for (pos = 1; res && (pos < nch); ++pos)
res = validate_ntype(CHILD(tree, pos), STRING);
break;
case DOT:
res = (nch == 3 &&
validate_ntype(CHILD(tree, 1), DOT) &&
validate_ntype(CHILD(tree, 2), DOT));
break;
default:
res = 0;
break;