Commit883cb23

and

authored

[3.13]gh-128152: Argument Clinic: ignore pre-processor directives inside C comments (GH-128464) (#128478)

(cherry picked from commita4e773c)Co-authored-by: Erlend E. Aasland <erlend@python.org>

1 parent855af3b commit883cb23Copy full SHA for 883cb23

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -731,6 +731,16 @@ def test_cloned_forced_text_signature_illegal(self):`
`731`	`731`	`err="Cannot use @text_signature when cloning a function"`
`732`	`732`	`self.expect_failure(block,err,lineno=11)`
`733`	`733`
	`734`	`+deftest_ignore_preprocessor_in_comments(self):`
	`735`	`+fordslin"clinic","python":`
	`736`	`+raw=dedent(f"""\`
	`737`	`+ /*[{dsl} input]`
	`738`	`+ # CPP directives, valid or not, should be ignored in C comments.`
	`739`	`+ #`
	`740`	`+ [{dsl} start generated code]*/`
	`741`	`+ """)`
	`742`	`+self.clinic.parse(raw)`
	`743`	`+`
`734`	`744`
`735`	`745`	`classParseFileUnitTest(TestCase):`
`736`	`746`	`defexpect_parsing_failure(`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a bug where Argument Clinic's C pre-processor parser tried to parse`
	`2`	`+pre-processor directives inside C comments. Patch by Erlend Aasland.`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ def pop_stack() -> TokenAndCondition:`
`132`	`132`	`ifline_comment:`
`133`	`133`	`line=before.rstrip()`
`134`	`134`
	`135`	`+ifself.in_comment:`
	`136`	`+return`
	`137`	`+`
`135`	`138`	`ifnotline.startswith('#'):`
`136`	`139`	`return`
`137`	`140`

Comments

(0)