Commit966eff9

authored

[3.12]gh-122026: Fix identification of mismatched parentheses inside f-strings (GH-122028) (#122062)

(cherry picked from commit2009e25)Signed-off-by: Pablo Galindo <pablogsal@gmail.com>

1 parent0298da4 commit966eff9Copy full SHA for 966eff9

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -921,6 +921,7 @@ def test_missing_expression(self):`
`921`	`921`	`"f'{:2}'",`
`922`	`922`	`"f'''{\t\f\r\n:a}'''",`
`923`	`923`	`"f'{:'",`
	`924`	`+"F'{[F'{:'}[F'{:'}]]]",`
`924`	`925`	`],`
`925`	`926`	`)`
`926`	`927`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a bug that caused the tokenizer to not correctly identify mismatched`
	`2`	`+parentheses inside f-strings in some situations. Patch by Pablo Galindo`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2607,6 +2607,9 @@ static int tok_get_normal_mode(struct tok_state *tok,`
`2607`	`2607`
`2608`	`2608`	`if (INSIDE_FSTRING(tok)) {`
`2609`	`2609`	`current_tok->curly_bracket_depth--;`
	`2610`	`+if (current_tok->curly_bracket_depth<0) {`
	`2611`	`+returnMAKE_TOKEN(syntaxerror(tok,"f-string: unmatched '%c'",c));`
	`2612`	`+ }`
`2610`	`2613`	`if (c=='}'&&current_tok->curly_bracket_depth==`
`2611`	`2614`	`current_tok->curly_bracket_expr_start_depth) {`
`2612`	`2615`	`current_tok->curly_bracket_expr_start_depth--;`

Comments

(0)