Commitb13a3cd

committed

[3.13]gh-130618: Fix parser error when using lambdas inside f-strings (GH-130638)

(cherry picked from commite06bebb)Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

1 parent676ceca commitb13a3cdCopy full SHA for b13a3cd

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2030,6 +2030,18 @@ async def foo():`
`2030`	`2030`	`withself.assertRaises(Done):`
`2031`	`2031`	`foo().send(None)`
`2032`	`2032`
	`2033`	`+deftest_complex_lambda(self):`
	`2034`	`+deftest1(foo,bar):`
	`2035`	`+return""`
	`2036`	`+`
	`2037`	`+deftest2():`
	`2038`	`+returnf"{test1(`
	`2039`	`+foo=lambda:'、、、、、、、、、、、、、、、、、',`
	`2040`	`+bar=lambda:'abcdefghijklmnopqrstuvwxyz 123456789 123456789',`
	`2041`	`+ )}"`
	`2042`	`+`
	`2043`	`+self.assertEqual(test2(),"")`
	`2044`	`+`
`2033`	`2045`
`2034`	`2046`	`if__name__=='__main__':`
`2035`	`2047`	`unittest.main()`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -211,9 +211,13 @@ _PyLexer_update_fstring_expr(struct tok_state *tok, char cur)`
`211`	`211`	`break;`
`212`	`212`	`case'}':`
`213`	`213`	`case'!':`
`214`		`-case':':`
`215`	`214`	`tok_mode->last_expr_end=strlen(tok->start);`
`216`	`215`	`break;`
	`216`	`+case':':`
	`217`	`+if (tok_mode->last_expr_end==-1) {`
	`218`	`+tok_mode->last_expr_end=strlen(tok->start);`
	`219`	`+ }`
	`220`	`+break;`
`217`	`221`	`default:`
`218`	`222`	`Py_UNREACHABLE();`
`219`	`223`	`}`

Comments

(0)