python
diff --git a/‎Grammar/python.gram
Lines changed: 5 additions & 8 deletions b/‎Grammar/python.gram
Lines changed: 5 additions & 8 deletions
diff --git a/‎Parser/action_helpers.c
Lines changed: 3 additions & 4 deletions b/‎Parser/action_helpers.c
Lines changed: 3 additions & 4 deletions
@@ -880,18 +880,15 @@ lambda_param[arg_ty]: a=NAME { _PyAST_arg(a->v.Name.id, NULL, NULL, EXTRA) }
 fstring_middle[expr_ty]:
     | fstring_replacement_field
     | t=FSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
-# There are some shenanigans with the fstring_format_spec: Don't try to put it in its own rule
-# or otherwise it will try to parse the first token with the regular tokenizer mode (due to the EXTRA).
-# TODO: (Ideally we need a way similar to 'memo' so the parser can set the tokenize mode on fstring/normal)
 fstring_replacement_field[expr_ty]:
-    | '{' a=(yield_expr | star_expressions) debug_expr="="? conversion=[
-        conv_token="!" conv=NAME { _PyPegen_check_fstring_conversion(p, conv_token, conv) ? NULL : conv }
-    ] format=[
-        ':' spec=fstring_format_spec* { spec ? _PyAST_JoinedStr((asdl_expr_seq*)spec, EXTRA) : NULL }
-    ] '}' {
+    | '{' a=(yield_expr | star_expressions) debug_expr="="? conversion=[fstring_conversion] format=[fstring_full_format_spec] '}' {
         _PyPegen_formatted_value(p, a, debug_expr, conversion, format, EXTRA)
     }
     | invalid_replacement_field
+fstring_conversion[expr_ty]:
+    | conv_token="!" conv=NAME { _PyPegen_check_fstring_conversion(p, conv_token, conv) }
+fstring_full_format_spec[expr_ty]:
+    | ':' spec=fstring_format_spec* { spec ? _PyAST_JoinedStr((asdl_expr_seq*)spec, EXTRA) : NULL }
 fstring_format_spec[expr_ty]:
     | t=FSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
     | fstring_replacement_field
 
@@ -965,16 +965,15 @@ _PyPegen_check_legacy_stmt(Parser *p, expr_ty name) {
     return 0;
 }
 
-int
+expr_ty
 _PyPegen_check_fstring_conversion(Parser *p, Token* symbol, expr_ty conv) {
     if (symbol->lineno != conv->lineno || symbol->end_col_offset != conv->col_offset) {
-        RAISE_SYNTAX_ERROR_KNOWN_RANGE(
+        return RAISE_SYNTAX_ERROR_KNOWN_RANGE(
             symbol, conv,
             "f-string: conversion type must come right after the exclamanation mark"
         );
-        return 1;
     }
-    return 0;
+    return conv;
 }
Original file line number	Diff line number	Diff line change
`@@ -965,16 +965,15 @@ _PyPegen_check_legacy_stmt(Parser *p, expr_ty name) {`
`965`	`965`	`return 0;`
`966`	`966`	`}`
`967`	`967`
`968`		`-int`
	`968`	`+expr_ty`
`969`	`969`	`_PyPegen_check_fstring_conversion(Parser p, Token symbol, expr_ty conv) {`
`970`	`970`	`if (symbol->lineno != conv->lineno \|\| symbol->end_col_offset != conv->col_offset) {`
`971`		`- RAISE_SYNTAX_ERROR_KNOWN_RANGE(`
	`971`	`+ return RAISE_SYNTAX_ERROR_KNOWN_RANGE(`
`972`	`972`	`symbol, conv,`
`973`	`973`	`"f-string: conversion type must come right after the exclamanation mark"`
`974`	`974`	`);`
`975`		`- return 1;`
`976`	`975`	`}`
`977`		`- return 0;`
	`976`	`+ return conv;`
`978`	`977`	`}`
`979`	`978`
`980`	`979`