gh-112943: Correctly compute end offsets for multiline tokens in the tokenize module #112949
Conversation
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
Member
pablogsal
commented
Dec 11, 2023
•
pablogsal
commented
- Issue: Change in tokenize.generate_tokens behaviour with non-ASCII #112943
…n the tokenize module
pablogsal
commented
Dec 11, 2023
| @@ -225,7 +225,7 @@ tokenizeriter_next(tokenizeriterobject *it) | |||
| col_offset = _PyPegen_byte_offset_to_character_offset(line, token.start - line_start); | |||
| } | |||
| if (token.end != NULL && token.end >= it->tok->line_start) { | |||
| end_col_offset = _PyPegen_byte_offset_to_character_offset(line, token.end - it->tok->line_start); | |||
| end_col_offset = _PyPegen_byte_offset_to_character_offset_raw(it->tok->line_start, token.end - it->tok->line_start); | |||
There was a problem hiding this comment.
it->tok->line_start holds the last line tokenised (the last line of the multi-line string) while line holds the entire multi-line string from the start to the end.
serhiy-storchaka
approved these changes
Dec 11, 2023
Co-authored-by: Serhiy Storchaka <[email protected]>
|
Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12. |
|
Sorry, @pablogsal, I could not cleanly backport this to |
|
GH-112957 is a backport of this pull request to the 3.12 branch. |
pablogsal
added a commit
to pablogsal/cpython
that referenced
this pull request
Dec 11, 2023
…okens in the tokenize module (pythonGH-112949) (cherry picked from commit a135a6d) Co-authored-by: Pablo Galindo Salgado <[email protected]>
pablogsal
added a commit
that referenced
this pull request
Dec 11, 2023
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
…n the tokenize module (python#112949)
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
…n the tokenize module (python#112949)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.