Skip to content

Commit

Permalink
[3.13] gh-128152: Argument Clinic: ignore pre-processor directives in…
Browse files Browse the repository at this point in the history
…side C comments (GH-128464) (#128478)

(cherry picked from commit a4e773c)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
  • Loading branch information
miss-islington and erlend-aasland authored Jan 4, 2025
1 parent 855af3b commit 883cb23
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Lib/test/test_clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,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
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
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

0 comments on commit 883cb23

Please sign in to comment.