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

Merged
merged 2 commits into from
Jan 4, 2025
Merged

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

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
e65fc56
gh-128152: Argument Clinic: don't parse CPP directives inside C comments
erlend-aasland Jan 3, 2025
b7f00da
NEWS
erlend-aasland Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Lib/test/test_clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,16 @@ def test_cloned_forced_text_signature_illegal(self):
err = "Cannot use @text_signature when cloning a function"
self.expect_failure(block, err, lineno=11)

def test_ignore_preprocessor_in_comments(self):
for dsl in "clinic", "python":
raw = dedent(f"""\
/*[{dsl} input]
# CPP directives, valid or not, should be ignored in C comments.
#
[{dsl} start generated code]*/
""")
self.clinic.parse(raw)


class ParseFileUnitTest(TestCase):
def expect_parsing_failure(
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2025-01-03-23-51-07.gh-issue-128152.IhzElS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a bug where Argument Clinic's C pre-processor parser tried to parse
pre-processor directives inside C comments. Patch by Erlend Aasland.
3 changes: 3 additions & 0 deletions Tools/clinic/libclinic/cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ def pop_stack() -> TokenAndCondition:
if line_comment:
line = before.rstrip()

if self.in_comment:
return

if not line.startswith('#'):
return

Expand Down
Loading