Skip to content

bpo-40493: fix function type comment parsing#19894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 4 commits into from
May 4, 2020
Merged

bpo-40493: fix function type comment parsing #19894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a3c990
grammar: allow *args and **kwargs without normal arguments for func_type
May 4, 2020
541fba6
test_type_comments: test *args and **kwargs without normal args
May 4, 2020
3df691b
Update Grammar/python.gram
hauntsaninja May 4, 2020
7370e68
Regenerate parser
May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Grammar/python.gram
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,10 @@ type_expressions[asdl_seq*]:
_PyPegen_seq_append_to_end(p, CHECK(_PyPegen_seq_append_to_end(p, a, b)), c) }
| a=','.expression+ ',' '*' b=expression { _PyPegen_seq_append_to_end(p, a, b) }
| a=','.expression+ ',' '**' b=expression { _PyPegen_seq_append_to_end(p, a, b) }
| '*' a=expression ',' '**' b=expression {
_PyPegen_seq_append_to_end(p, CHECK(_PyPegen_singleton_seq(p, a)), b) }
| '*' a=expression { _PyPegen_singleton_seq(p, a) }
| '**' a=expression { _PyPegen_singleton_seq(p, a) }
| ','.expression+

statements[asdl_seq*]: a=statement+ { _PyPegen_seq_flatten(p, a) }
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_type_comments.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -399,6 +399,14 @@ def parse_func_type_input(source):
self.assertEqual(tree.argtypes[2].id, "Any")
self.assertEqual(tree.returns.id, "float")

tree = parse_func_type_input("(*int) -> None")
self.assertEqual(tree.argtypes[0].id, "int")
tree = parse_func_type_input("(**int) -> None")
self.assertEqual(tree.argtypes[0].id, "int")
tree = parse_func_type_input("(*int, **str) -> None")
self.assertEqual(tree.argtypes[0].id, "int")
self.assertEqual(tree.argtypes[1].id, "str")

with self.assertRaises(SyntaxError):
tree = parse_func_type_input("(int, *str, *Any) -> float")

Expand Down
66 changes: 66 additions & 0 deletions Parser/pegen/parse.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,9 @@ fstring_rule(Parser *p)
// | ','.expression+ ',' '*' expression ',' '**' expression
// | ','.expression+ ',' '*' expression
// | ','.expression+ ',' '**' expression
// | '*' expression ',' '**' expression
// | '*' expression
// | '**' expression
// | ','.expression+
static asdl_seq*
type_expressions_rule(Parser *p)
Expand DownExpand Up@@ -915,6 +918,69 @@ type_expressions_rule(Parser *p)
}
p->mark = mark;
}
{ // '*' expression ',' '**' expression
expr_ty a;
expr_ty b;
Token * literal;
Token * literal_1;
Token * literal_2;
if (
(literal = _PyPegen_expect_token(p, 16))
&&
(a = expression_rule(p))
&&
(literal_1 = _PyPegen_expect_token(p, 12))
&&
(literal_2 = _PyPegen_expect_token(p, 35))
&&
(b = expression_rule(p))
)
{
res = _PyPegen_seq_append_to_end ( p , CHECK ( _PyPegen_singleton_seq ( p , a ) ) , b );
if (res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
return NULL;
}
goto done;
}
p->mark = mark;
}
{ // '*' expression
expr_ty a;
Token * literal;
if (
(literal = _PyPegen_expect_token(p, 16))
&&
(a = expression_rule(p))
)
{
res = _PyPegen_singleton_seq ( p , a );
if (res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
return NULL;
}
goto done;
}
p->mark = mark;
}
{ // '**' expression
expr_ty a;
Token * literal;
if (
(literal = _PyPegen_expect_token(p, 35))
&&
(a = expression_rule(p))
)
{
res = _PyPegen_singleton_seq ( p , a );
if (res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
return NULL;
}
goto done;
}
p->mark = mark;
}
{ // ','.expression+
asdl_seq * _gather_9_var;
if (
Expand Down