Skip to content

gh-128152: Argument Clinic: don't parse CPP directives inside C comments #128464

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
merged 2 commits into from
Jan 4, 2025
Merged

gh-128152: Argument Clinic: don't parse CPP directives inside C comments #128464

merged 2 commits into from
Jan 4, 2025

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jan 3, 2025 •
edited
Loading

Resolves #128152

@erlend-aasland erlend-aasland requested a review from picnixz January 3, 2025 22:52
@erlend-aasland erlend-aasland changed the title clinic/empty comments gh-128152: Argument Clinic: don't parse CPP directives inside C comments Jan 3, 2025
@bedevere-app bedevere-app bot mentioned this pull request Jan 3, 2025
Closed
@erlend-aasland erlend-aasland added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Jan 3, 2025
picnixz
picnixz approved these changes Jan 3, 2025
View reviewed changes
Copy link
Member

@picnixz picnixz left a comment

Choose a reason for hiding this comment

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

I'm not an expert in AC but this looks good. At least, I can now use empty lines in python input. By the way, I think I've just understood that CPP stands for Clinic Pre-Processor/Processing and not for C++....

@erlend-aasland
Copy link
Contributor Author

I can now use empty lines in python input

Yes, # prefixed lines are now correctly passed on as Python code. For clinic input blocks, they are correctly ignored as "Clinic comments":

cpython/Tools/clinic/libclinic/dsl_parser.py

Lines 493 to 496 in f157485

def valid_line(self, line: str) -> bool:
# ignore comment-only lines
if line.lstrip().startswith('#'):
return False

@erlend-aasland erlend-aasland mentioned this pull request Jan 3, 2025
Closed
@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 3, 2025 •
edited
Loading

Thanks for the quick review! I'll land this tomorrow.

@erlend-aasland erlend-aasland self-assigned this Jan 3, 2025
@erlend-aasland erlend-aasland merged commit a4e773c into python:main Jan 4, 2025
52 checks passed
@erlend-aasland erlend-aasland deleted the clinic/empty-comments branch January 4, 2025 10:46
@miss-islington-app

This comment was marked as outdated.

Sign in to view
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 4, 2025
@erlend-aasland @miss-islington
pythongh-128152: Argument Clinic: ignore pre-processor directives ins…
64108fe 
…ide C comments (pythonGH-128464)

(cherry picked from commit a4e773c)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
@miss-islington-app

This comment was marked as outdated.

Sign in to view
@bedevere-app
Copy link

bedevere-app bot commented Jan 4, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jan 4, 2025
@erlend-aasland erlend-aasland removed the needs backport to 3.12 only security fixes label Jan 4, 2025
erlend-aasland added a commit that referenced this pull request Jan 4, 2025
@miss-islington @erlend-aasland
[3.13] gh-128152: Argument Clinic: ignore pre-processor directives in…
883cb23 
…side C comments (GH-128464) (#128478)

(cherry picked from commit a4e773c)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 6, 2025
@erlend-aasland @srinivasreddy
pythongh-128152: Argument Clinic: ignore pre-processor directives ins…
90b344f 
…ide C comments (python#128464)
srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 8, 2025
@erlend-aasland @srinivasreddy
pythongh-128152: Argument Clinic: ignore pre-processor directives ins…
86e1638 
…ide C comments (python#128464)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@picnixz picnixz picnixz approved these changes

Assignees

@erlend-aasland erlend-aasland

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Argument Clinic's [python input] blocks do not support empty lines in comments
2 participants
@erlend-aasland @picnixz