gh-135148: Correctly handle f/t strings with comments and debug expressions #135198
+76
−20
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
bd49471 to
5f8456e
Compare
pablogsal
commented
Jun 6, 2025
Parser/lexer/lexer.c
Outdated
|
|
||
| // Process each character of input |
There was a problem hiding this comment.
@lysnikolaou please read this carefully. I am mostly sure its correct but it really needs some extra eyes
lysnikolaou
requested changes
Jun 6, 2025
Parser/lexer/lexer.c
Outdated
Comment on lines
189
to
197
| if (i > 0 && tok_mode->last_expr_buffer[i-1] == ch && | ||
| i > 1 && tok_mode->last_expr_buffer[i-2] == ch) { | ||
| // Found triple quote - copy all three quotes | ||
| result[j++] = ch; | ||
| result[j++] = ch; | ||
| result[j++] = ch; | ||
| i += 2; // Skip the other two quotes | ||
| continue; | ||
| } |
There was a problem hiding this comment.
I don't think this is gonna work as intended. Let's say we have a triple-quoted string. Then, I think the following sequence is going to happen:
ch == '"',!in_string, so we're doingin_string = 1; string_quote = ch;ch == '"',in_string,ch == string_quote, but the insideiffails because we're only on the second quote, so we're settingin_string = 0backch == '"',!in_stringand we're settingin_string = 1again.
For example the following does not work correctly:
>>> f'{ # some comment goes here
... """hello"""=}'
' \n"""hello"""""\'hello\''Same goes for the construct above where we're doing the hash detection. Example that fails there:
>>> f'{""" # no c
... """ # c
... =}'
'""" # no c\n""" # c\n=\' # no c\\n\''There was a problem hiding this comment.
Good catch sir!
I have pushed a version that addresses this and simplifies stuff a bit
|
When you're done making the requested changes, leave the comment: |
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.
Uh oh!
There was an error while loading. Please reload this page.