Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
11c1dee1
Commit
11c1dee1
authored
May 07, 2012
by
Mark Dickinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #14697: Fix missing parser module support for set displays and set comprehensions.
parent
cf360b92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
105 additions
and
21 deletions
+105
-21
Lib/test/test_parser.py
Lib/test/test_parser.py
+23
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/parsermodule.c
Modules/parsermodule.c
+79
-21
No files found.
Lib/test/test_parser.py
View file @
11c1dee1
...
...
@@ -305,6 +305,29 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
"except Exception as e:
\
n
"
" raise ValueError from e
\
n
"
)
def
test_set_displays
(
self
):
self
.
check_expr
(
'{2}'
)
self
.
check_expr
(
'{2,}'
)
self
.
check_expr
(
'{2, 3}'
)
self
.
check_expr
(
'{2, 3,}'
)
def
test_dict_displays
(
self
):
self
.
check_expr
(
'{}'
)
self
.
check_expr
(
'{a:b}'
)
self
.
check_expr
(
'{a:b,}'
)
self
.
check_expr
(
'{a:b, c:d}'
)
self
.
check_expr
(
'{a:b, c:d,}'
)
def
test_set_comprehensions
(
self
):
self
.
check_expr
(
'{x for x in seq}'
)
self
.
check_expr
(
'{f(x) for x in seq}'
)
self
.
check_expr
(
'{f(x) for x in seq if condition(x)}'
)
def
test_dict_comprehensions
(
self
):
self
.
check_expr
(
'{x:x for x in seq}'
)
self
.
check_expr
(
'{x**2:x[3] for x in seq if condition(x)}'
)
self
.
check_expr
(
'{x:x for x in seq1 for y in seq2 if condition(x, y)}'
)
#
# Second, we take *invalid* trees and make sure we get ParserError
...
...
Misc/NEWS
View file @
11c1dee1
...
...
@@ -61,6 +61,9 @@ Core and Builtins
Library
-------
- Issue #14697: Fix missing support for set displays and set comprehensions in
parser module.
- Issue #14701: Fix missing support for 'raise ... from' in parser module.
- Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running
...
...
Modules/parsermodule.c
View file @
11c1dee1
...
...
@@ -2865,34 +2865,92 @@ validate_exprlist(node *tree)
validate_expr_or_star_expr
,
"exprlist"
));
}
/*
* dictorsetmaker:
*
* (test ':' test (comp_for | (',' test ':' test)* [','])) |
* (test (comp_for | (',' test)* [',']))
*/
static
int
validate_dictorsetmaker
(
node
*
tree
)
{
int
nch
=
NCH
(
tree
);
int
res
=
(
validate_ntype
(
tree
,
dictorsetmaker
)
&&
(
nch
>=
3
)
&&
validate_test
(
CHILD
(
tree
,
0
))
&&
validate_colon
(
CHILD
(
tree
,
1
))
&&
validate_test
(
CHILD
(
tree
,
2
)));
int
res
;
int
i
=
0
;
res
=
validate_ntype
(
tree
,
dictorsetmaker
);
if
(
!
res
)
return
0
;
if
(
res
&&
((
nch
%
4
)
==
0
))
res
=
validate_comma
(
CHILD
(
tree
,
--
nch
));
else
if
(
res
)
res
=
((
nch
%
4
)
==
3
);
if
(
res
&&
(
nch
>
3
))
{
int
pos
=
3
;
/* ( ',' test ':' test )* */
while
(
res
&&
(
pos
<
nch
))
{
res
=
(
validate_comma
(
CHILD
(
tree
,
pos
))
&&
validate_test
(
CHILD
(
tree
,
pos
+
1
))
&&
validate_colon
(
CHILD
(
tree
,
pos
+
2
))
&&
validate_test
(
CHILD
(
tree
,
pos
+
3
)));
pos
+=
4
;
if
(
nch
-
i
<
1
)
{
(
void
)
validate_numnodes
(
tree
,
1
,
"dictorsetmaker"
);
return
0
;
}
res
=
validate_test
(
CHILD
(
tree
,
i
++
));
if
(
!
res
)
return
0
;
if
(
nch
-
i
>=
2
&&
TYPE
(
CHILD
(
tree
,
i
))
==
COLON
)
{
/* Dictionary display or dictionary comprehension. */
res
=
(
validate_colon
(
CHILD
(
tree
,
i
++
))
&&
validate_test
(
CHILD
(
tree
,
i
++
)));
if
(
!
res
)
return
0
;
if
(
nch
-
i
>=
1
&&
TYPE
(
CHILD
(
tree
,
i
))
==
comp_for
)
{
/* Dictionary comprehension. */
res
=
validate_comp_for
(
CHILD
(
tree
,
i
++
));
if
(
!
res
)
return
0
;
}
else
{
/* Dictionary display. */
while
(
nch
-
i
>=
4
)
{
res
=
(
validate_comma
(
CHILD
(
tree
,
i
++
))
&&
validate_test
(
CHILD
(
tree
,
i
++
))
&&
validate_colon
(
CHILD
(
tree
,
i
++
))
&&
validate_test
(
CHILD
(
tree
,
i
++
)));
if
(
!
res
)
return
0
;
}
if
(
nch
-
i
==
1
)
{
res
=
validate_comma
(
CHILD
(
tree
,
i
++
));
if
(
!
res
)
return
0
;
}
}
}
return
(
res
);
else
{
/* Set display or set comprehension. */
if
(
nch
-
i
>=
1
&&
TYPE
(
CHILD
(
tree
,
i
))
==
comp_for
)
{
/* Set comprehension. */
res
=
validate_comp_for
(
CHILD
(
tree
,
i
++
));
if
(
!
res
)
return
0
;
}
else
{
/* Set display. */
while
(
nch
-
i
>=
2
)
{
res
=
(
validate_comma
(
CHILD
(
tree
,
i
++
))
&&
validate_test
(
CHILD
(
tree
,
i
++
)));
if
(
!
res
)
return
0
;
}
if
(
nch
-
i
==
1
)
{
res
=
validate_comma
(
CHILD
(
tree
,
i
++
));
if
(
!
res
)
return
0
;
}
}
}
if
(
nch
-
i
>
0
)
{
err_string
(
"Illegal trailing nodes for dictorsetmaker."
);
return
0
;
}
return
1
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment