Skip to content

bpo-40334: Support type comments #19780

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
gvanrossum merged 12 commits into from
Apr 30, 2020
Merged

bpo-40334: Support type comments #19780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e17bb92
First steps towards supporting type comments
gvanrossum Apr 26, 2020
2e4126c
Support func_type_input in new parser
gvanrossum Apr 27, 2020
7b446fb
Support '# type: ignore <tag>'
gvanrossum Apr 28, 2020
ed95a14
Support per-argument type comments ('long form')
gvanrossum Apr 29, 2020
acb69b3
Fix segfault in long-form argument type comments
gvanrossum Apr 29, 2020
1e8f7fd
Fix failing test_ast by refactoring param rules
gvanrossum Apr 29, 2020
da253f3
Merge remote-tracking branch 'origin/master' into type-comments
gvanrossum Apr 29, 2020
86d9f69
Fix bug in add_type_comment()
gvanrossum Apr 29, 2020
c8a2888
Suggestions from code review
gvanrossum Apr 29, 2020
fd2794b
Refactoring some things in response to review
gvanrossum Apr 30, 2020
d081578
More thorough error checks in NEW_TYPE_COMMENT
gvanrossum Apr 30, 2020
fecd8e8
Add CHECK() around _PyPegen_seq_append_to_end() call
gvanrossum Apr 30, 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
Prev Previous commit
Next Next commit
Suggestions from code review
  • Loading branch information
@gvanrossum
gvanrossum committed Apr 29, 2020
commit c8a2888e5d7f5a337fdd8b3b0ebb34d919c68d50
8 changes: 4 additions & 4 deletions Grammar/python.gram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ _PyPegen_parse(Parser *p)
file[mod_ty]: a=[statements] ENDMARKER { _PyPegen_make_module(p, a) }
interactive[mod_ty]: a=statement_newline { Interactive(a, p->arena) }
eval[mod_ty]: a=expressions NEWLINE* ENDMARKER { Expression(a, p->arena) }
func_type[mod_ty]: '(' a=[type_expressions] ')' '->' b=expression { FunctionType(a, b, p->arena) }
func_type[mod_ty]: '(' a=[type_expressions] ')' '->' b=expression NEWLINE* ENDMARKER { FunctionType(a, b, p->arena) }
fstring[expr_ty]: star_expressions

# type_expressions allow */** but ignore them
Expand Down Expand Up @@ -192,7 +192,7 @@ function_def_raw[stmt_ty]:
(is_async ? _Py_AsyncFunctionDef : _Py_FunctionDef)(n->v.Name.id,
(params) ? params : CHECK(_PyPegen_empty_arguments(p)),
b, NULL, a, NEW_TYPE_COMMENT(tc), EXTRA) }
func_type_comment[PyObject *]:
func_type_comment[PyObject*]:
| NEWLINE t=TYPE_COMMENT &(NEWLINE INDENT) { t } # Must be followed by indented block
| invalid_double_type_comments
| TYPE_COMMENT
Expand Down Expand Up @@ -244,8 +244,8 @@ kwds[arg_ty]:
# The latter form is for a final parameter without trailing comma.
#
param_no_default[arg_ty]:
| a=param ',' tc=TYPE_COMMENT? { _PyPegen_add_type_comment(p, a, tc) }
| a=param tc=TYPE_COMMENT? &')' { _PyPegen_add_type_comment(p, a, tc) }
| a=param ',' tc=TYPE_COMMENT? { _PyPegen_add_type_comment_to_arg(p, a, tc) }
| a=param tc=TYPE_COMMENT? &')' { _PyPegen_add_type_comment_to_arg(p, a, tc) }
param_with_default[NameDefaultPair*]:
| a=param c=default ',' tc=TYPE_COMMENT? { _PyPegen_name_default_pair(p, a, c, tc) }
| a=param c=default tc=TYPE_COMMENT? &')' { _PyPegen_name_default_pair(p, a, c, tc) }
Expand Down
Loading