FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.12] gh-104866: Tokenize should emit NEWLINE after exiting block with comment (GH-104870) by miss-islington · Pull Request #104872 · python/cpython · GitHub

/ cpython Public

[3.12] gh-104866: Tokenize should emit NEWLINE after exiting block with comment (GH-104870) #104872

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
terryjreedy merged 2 commits into from
May 24, 2023
Conversation 2 Commits 2 Checks 0 Files changed
Merged

[3.12] gh-104866: Tokenize should emit NEWLINE after exiting block with comment (GH-104870) #104872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3ea89
gh-104866: Tokenize should emit NEWLINE after exiting block with comm…
lysnikolaou May 24, 2023
d855e89
Merge branch '3.12' into backport-c90a862-3.12
terryjreedy May 24, 2023
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 17 additions & 0 deletions Lib/test/test_tokenize.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,23 @@ async def bar(): pass
DEDENT '' (6, 12) (6, 12)
""")

def test_newline_after_parenthesized_block_with_comment(self):
self.check_tokenize('''\
[
# A comment here
1
]
''', """\
OP '[' (1, 0) (1, 1)
NL '\\n' (1, 1) (1, 2)
COMMENT '# A comment here' (2, 4) (2, 20)
NL '\\n' (2, 20) (2, 21)
NUMBER '1' (3, 4) (3, 5)
NL '\\n' (3, 5) (3, 6)
OP ']' (4, 0) (4, 1)
NEWLINE '\\n' (4, 1) (4, 2)
""")

class GenerateTokensTest(TokenizeTest):
def check_tokenize(self, s, expected):
# Format the tokens in s in a table format.
Expand Down
9 changes: 6 additions & 3 deletions Parser/tokenizer.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2007,6 +2007,9 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
tok->atbol = 1;
if (blankline || tok->level > 0) {
if (tok->tok_extra_tokens) {
if (tok->comment_newline) {
tok->comment_newline = 0;
}
p_start = tok->start;
p_end = tok->cur;
return MAKE_TOKEN(NL);
Expand All @@ -2015,9 +2018,9 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
}
if (tok->comment_newline && tok->tok_extra_tokens) {
tok->comment_newline = 0;
p_start = tok->start;
p_end = tok->cur;
return MAKE_TOKEN(NL);
p_start = tok->start;
p_end = tok->cur;
return MAKE_TOKEN(NL);
}
p_start = tok->start;
p_end = tok->cur - 1; /* Leave '\n' out of the string */
Expand Down
Back | FazBrowse Home | New Git URL