Skip to content

gh-135148: Correctly handle f/t strings with comments and debug expressions#135198

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

Jump to bottom
Merged
pablogsal merged 4 commits into from
Jul 16, 2025
Merged

gh-135148: Correctly handle f/t strings with comments and debug expressions #135198

pablogsal merged 4 commits into from
Jul 16, 2025

Conversation

@pablogsal
Copy link
Member

@pablogsalpablogsal commented Jun 6, 2025•
edited by bedevere-app bot
Loading

@bedevere-appbedevere-appbot mentioned this pull request Jun 6, 2025
Closed
@pablogsalpablogsalforce-pushed the gh-135148 branch 2 times, most recently from bd49471 to 5f8456eCompareJune 6, 2025 01:22
pablogsal
pablogsal commented Jun 6, 2025
View reviewed changes
Parser/lexer/lexer.c Outdated
in_string=0; // Whether we're currently inside a string
string_quote=0; // The quote character for current string (' or ")

// Process each character of input
Copy link
MemberAuthor

@pablogsalpablogsalJun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lysnikolaou please read this carefully. I am mostly sure its correct but it really needs some extra eyes

@Wulian233Wulian233 mentioned this pull request Jun 6, 2025
Merged
lysnikolaou
lysnikolaou requested changes Jun 6, 2025
View reviewed changes
Copy link
Member

@lysnikolaoulysnikolaou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was thinking something very similar as a solution, too! I found one problem, but it looks good otherwise.

@bedevere-app
Copy link

bedevere-appbot commented Jun 6, 2025

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

lysnikolaou
lysnikolaou reviewed Jun 9, 2025
View reviewed changes
Copy link
Member

@lysnikolaoulysnikolaou left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good now! Thanks @pablogsal!

I left a couple of inline comments for some very minor improvements.

Parser/lexer/lexer.c
Comment on lines +141 to +147
if (!in_string){
in_string=1;
quote_char=ch;
}
elseif (ch==quote_char){
in_string=0;
}
Copy link
Member

@lysnikolaoulysnikolaouJun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only works because there's always an odd number of quotes in a STRING token and we're sure that all STRING tokens will be valid at this point. Maybe add a comment to explain that?

Parser/lexer/lexer.c Outdated
Comment on lines 127 to 128
charquote_char=0;
charstring_quote=0;
Copy link
Member

@lysnikolaoulysnikolaouJun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need both of these?

@lysnikolaou
Copy link
Member

lysnikolaou commented Jul 13, 2025

@pablogsal Ping here. Will we be able to get thins into 3.13 before the rc release? If you don't have time to work on it, I'm okay taking it over.

@pablogsal
Copy link
MemberAuthor

pablogsal commented Jul 13, 2025

I am travelling today :( If you want and have the time you can push the fixes to the PR and land it but if you don't have time maybe I can get to it at night.

lysnikolaou
lysnikolaou approved these changes Jul 16, 2025
View reviewed changes
Copy link
Member

@lysnikolaoulysnikolaou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a commit with a couple of additions. LGTM now! Let's merge it.

@pablogsalpablogsal merged commit ef66fb5 into python:mainJul 16, 2025
44 of 45 checks passed
@pablogsalpablogsal deleted the gh-135148 branch July 16, 2025 09:47
@lysnikolaou
Copy link
Member

lysnikolaou commented Jul 16, 2025

Are we backporting this?

@pablogsal
Copy link
MemberAuthor

pablogsal commented Jul 16, 2025

We should indeed

@pablogsalpablogsal added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jul 16, 2025
@miss-islington-app
Copy link

miss-islington-appbot commented Jul 16, 2025

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

miss-islington-appbot commented Jul 16, 2025

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app
Copy link

miss-islington-appbot commented Jul 16, 2025

Sorry, @pablogsal, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ef66fb597ba909ead2fbfc06f748aa7b7e9ea437 3.13

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 16, 2025
@pablogsal@miss-islington
pythongh-135148: Correctly handle f/t strings with comments and debug…
c08f2ab
… expressions (pythonGH-135198) (cherry picked from commit ef66fb5) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
@bedevere-app
Copy link

bedevere-appbot commented Jul 16, 2025

GH-136720 is a backport of this pull request to the 3.14 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.14 bugs and security fixes label Jul 16, 2025
pablogsal pushed a commit that referenced this pull request Jul 16, 2025
@miss-islington
[3.14]gh-135148: Correctly handle f/t strings with comments and debu…
9bf3464
…g expressions (GH-135198) (#136720)
@bedevere-app
Copy link

bedevere-appbot commented Jul 21, 2025

GH-136899 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.13 bugs and security fixes label Jul 21, 2025
lysnikolaou added a commit that referenced this pull request Jul 21, 2025
@lysnikolaou@pablogsal
[3.13]gh-135148: Correctly handle f/t strings with comments and debu…
c1085a0
…g expressions (#135198) (#136899) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@pablogsal@taegyunkim
pythongh-135148: Correctly handle f/t strings with comments and debug…
941dba0
… expressions (python#135198)
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@pablogsal@Agent-Hellboy
pythongh-135148: Correctly handle f/t strings with comments and debug…
a2fad4c
… expressions (python#135198)
kumaraditya303 pushed a commit to miss-islington/cpython that referenced this pull request Sep 9, 2025
@miss-islington@kumaraditya303
[3.14]pythongh-135148: Correctly handle f/t strings with comments an…
f671b96
…d debug expressions (pythonGH-135198) (python#136720)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lysnikolaoulysnikolaoulysnikolaou approved these changes

Assignees

@pablogsalpablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@pablogsal@lysnikolaou