runtime(python): Add f-string support

Fixes #14033.

Signed-off-by: Doug Kearns <dougkearns@gmail.com>

Author: dkearns

runtime/syntax/python.vim

@@ -128,18 +128,18 @@ syn match   pythonDecoratorName	"@\s*\h\%(\w\|\.\)*" display contains=pythonDeco
 " Single line multiplication.
 syn match   pythonMatrixMultiply
       \ "\%(\w\|[])]\)\s*@"
-      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue,@pythonFStringContained
       \ transparent
 " Multiplication continued on the next line after backslash.
 syn match   pythonMatrixMultiply
       \ "[^\\]\\\s*\n\%(\s*\.\.\.\s\)\=\s\+@"
-      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue,@pythonFStringContained
       \ transparent
 " Multiplication in a parenthesized expression over multiple lines with @ at
 " the start of each continued line; very similar to decorators and complex.
 syn match   pythonMatrixMultiply
       \ "^\s*\%(\%(>>>\|\.\.\.\)\s\+\)\=\zs\%(\h\|\%(\h\|[[(]\).\{-}\%(\w\|[])]\)\)\s*\n\%(\s*\.\.\.\s\)\=\s\+@\%(.\{-}\n\%(\s*\.\.\.\s\)\=\s\+@\)*"
-      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonClass,pythonFunction,pythonDoctestValue,@pythonFStringContained
       \ transparent
 
 syn match   pythonClass		"\h\w*" display contained
@@ -161,33 +161,22 @@ syn region  pythonRawString matchgroup=pythonQuotes
 syn region  pythonRawString matchgroup=pythonTripleQuotes
       \ start=+[rR]\z('''\|"""\)+ end="\z1" keepend
       \ contains=pythonSpaceError,pythonDoctest,@Spell
-
-" Formatted string literals (f-strings)
-" https://docs.python.org/3/reference/lexical_analysis.html#f-strings
-syn region  pythonFString
-      \ matchgroup=pythonQuotes
-      \ start=+\cF\z(['"]\)+
-      \ end="\z1"
-      \ skip="\\\\\|\\\z1"
-      \ contains=pythonFStringField,pythonFStringSkip,pythonEscape,pythonUnicodeEscape,@Spell
-syn region  pythonFString
-      \ matchgroup=pythonTripleQuotes
-      \ start=+\cF\z('''\|"""\)+
-      \ end="\z1"
-      \ keepend
-      \ contains=pythonFStringField,pythonFStringSkip,pythonEscape,pythonUnicodeEscape,pythonSpaceError,pythonDoctest,@Spell
-syn region  pythonRawFString
-      \ matchgroup=pythonQuotes
-      \ start=+\c\%(FR\|RF\)\z(['"]\)+
-      \ end="\z1"
-      \ skip="\\\\\|\\\z1"
-      \ contains=pythonFStringField,pythonFStringSkip,@Spell
-syn region  pythonRawFString
-      \ matchgroup=pythonTripleQuotes
-      \ start=+\c\%(FR\|RF\)\z('''\|"""\)+
-      \ end="\z1"
-      \ keepend
-      \ contains=pythonFStringField,pythonFStringSkip,pythonSpaceError,pythonDoctest,@Spell
+syn region  pythonFString matchgroup=pythonQuotes
+      \ start=+[fF]\z(['"]\)+
+      \ end="$\|\z1" skip="\\\\\|\\\z1"
+      \ contains=pythonEscape,pythonUnicodeEscape,pythonFStringEscapedBrace,pythonFStringReplacement,@Spell
+syn region  pythonFString matchgroup=pythonTripleQuotes
+      \ start=+[fF]\z('''\|"""\)+
+      \ end="\z1" keepend
+      \ contains=pythonEscape,pythonUnicodeEscape,pythonSpaceError,pythonFStringEscapedBrace,pythonFStringReplacement,pythonDoctest,@Spell
+syn region  pythonRawFString matchgroup=pythonQuotes
+      \ start=+\%([fF][rR]\|[rR][fF]\)\z(['"]\)+
+      \ end="$\|\z1" skip="\\\\\|\\\r\=$\|\\\z1"
+      \ contains=pythonFStringEscapedBrace,pythonFStringReplacement,@Spell
+syn region  pythonRawFString matchgroup=pythonTripleQuotes
+      \ start=+\%([fF][rR]\|[rR][fF]\)\z('''\|"""\)+
+      \ end="\z1" keepend
+      \ contains=pythonSpaceError,pythonFStringEscapedBrace,pythonFStringReplacement,pythonDoctest,@Spell
 
 " Bytes
 syn region  pythonBytes
@@ -213,24 +202,6 @@ syn region  pythonRawBytes
       \ end="\z1"
       \ keepend
 
-" F-string replacement fields
-"
-" - Matched parentheses, brackets and braces are ignored
-" - A bare # is ignored to end of line
-" - A bare = (surrounded by optional whitespace) enables debugging
-" - A bare ! prefixes a conversion field
-" - A bare : begins a format specification
-"     - Matched braces inside a format specification are ignored
-"
-syn region  pythonFStringField
-    \ matchgroup=pythonFStringDelimiter
-    \ start=/{/
-    \ skip=/([^)]*)\|\[[^]]*]\|{[^}]*}\|#.*$/
-    \ end=/\%(\s*=\s*\)\=\%(!\a\)\=\%(:\%({[^}]*}\|[^}]*\)\+\)\=}/
-    \ contained
-" Doubled braces and Unicode escapes are not replacement fields
-syn match   pythonFStringSkip	/{{\|\\N{/ transparent contained contains=NONE
-
 syn match   pythonEscape	+\\[abfnrtv'"\\]+ contained
 syn match   pythonEscape	"\\\o\{1,3}" contained
 syn match   pythonEscape	"\\x\x\{2}" contained
@@ -239,6 +210,62 @@ syn match   pythonUnicodeEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
 " The specification: https://www.unicode.org/versions/Unicode16.0.0/core-spec/chapter-4/#G135165
 syn match   pythonUnicodeEscape	"\\N{\a\+\%(\%(\s\a\+[[:alnum:]]*\)\|\%(-[[:alnum:]]\+\)\)*}" contained
 syn match   pythonEscape	"\\$"
+syn match   pythonEscape	"\\\r\=$"
+
+" f-strings
+" See https://docs.python.org/3/reference/lexical_analysis.html#formatted-string-literals
+syn region  pythonFStringReplacement matchgroup=pythonFStringBrace start=+{+ end=+}+ contained contains=pythonFStringExpression
+
+" Skip contained '[:!]'
+" TODO: this should contain @pythonExpression rather than TOP
+syn region  pythonFStringBrackets
+      \ start="{"  end="}"
+      \ contained contains=TOP
+      \ transparent
+syn region  pythonFStringBrackets
+      \ start="("  end=")"
+      \ contained contains=TOP
+      \ transparent
+syn region  pythonFStringBrackets
+      \ start="\[" end="]"
+      \ contained contains=TOP
+      \ transparent
+
+syn region  pythonFStringReplacementWhitespace start="\s" end="\ze\S" contained nextgroup=pythonFStringConversion,pythonFStringFormatSpec
+
+" TODO: contains (yield_expr | star_expressions)
+" True False None yield from if else for lambda await
+syn cluster pythonExpression
+      \ contains=pythonNumber,python.*String,pythonOperator,pythonBuiltin,pythonAttribute,pythonComment,pythonFStringBrackets
+
+syn region  pythonFStringExpression
+      \ start="." end="\ze[=!:}]"
+      \ contained contains=@pythonExpression
+      \ nextgroup=pythonFStringEquals,pythonFStringConversion,pythonFStringFormatSpec
+
+" TODO: it would be better to match pythonOperator with priority but symbolic
+"   operators are not currently matched
+" skip operators
+syn match   pythonFStringEquals "[!<>=]\@1<!==\@!"
+      \ contained
+      \ nextgroup=pythonFStringConversion,pythonFStringFormatSpec,pythonFStringReplacementWhitespace,pythonComment
+      \ skipwhite skipempty
+hi def link pythonFStringEquals Special
+
+syn match   pythonFStringConversion "![ars]"
+      \ contained
+      \ nextgroup=pythonFStringFormatSpec,pythonFStringReplacementWhitespace,pythonComment
+      \ skipwhite skipempty
+hi def link pythonFStringConversion Special
+
+syn region  pythonFStringFormatSpec
+      \ matchgroup=Delimiter start=":" matchgroup=NONE end="\ze}"
+      \ contained contains=pythonFStringReplacement
+hi def link pythonFStringFormatSpec Special
+
+syn match   pythonFStringEscapedBrace	"{{\|}}" contained
+
+syn cluster pythonFStringContained	contains=pythonFString.\+
 
 " It is very important to understand all details before changing the
 " regular expressions below or their order.
@@ -303,7 +330,7 @@ if !exists("python_no_builtin_highlight")
   syn keyword pythonBuiltin	tuple type vars zip __import__
   " avoid highlighting attributes as builtins
   syn match   pythonAttribute	/\.\h\w*/hs=s+1
-	\ contains=ALLBUT,pythonBuiltin,pythonClass,pythonFunction,pythonAsync
+	\ contains=ALLBUT,pythonBuiltin,pythonClass,pythonFunction,pythonAsync,pythonFStringExpression
 	\ transparent
 endif
 
@@ -360,7 +387,7 @@ if !exists("python_no_doctest_highlight")
   if !exists("python_no_doctest_code_highlight")
     syn region pythonDoctest
 	  \ start="^\s*>>>\s" end="^\s*$"
-	  \ contained contains=ALLBUT,pythonDoctest,pythonClass,pythonFunction,@Spell
+	  \ contained contains=ALLBUT,pythonDoctest,pythonClass,pythonFunction,@pythonFStringContained,@Spell
     syn region pythonDoctestValue
 	  \ start=+^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\++ end="$"
 	  \ contained
@@ -399,7 +426,9 @@ hi def link pythonQuotes		String
 hi def link pythonTripleQuotes		pythonQuotes
 hi def link pythonEscape		Special
 hi def link pythonUnicodeEscape		pythonEscape
-hi def link pythonFStringDelimiter	Special
+" hi def link pythonFStringDelimiter	Special
+hi def link pythonFStringEscapedBrace	Special
+hi def link pythonFStringBrace		Include
 if !exists("python_no_number_highlight")
   hi def link pythonNumber		Number
 endif

runtime/syntax/testdir/dumps/python_fstring_00.dump

@@ -0,0 +1,20 @@
+>#+0#0000e05#ffffff0| |P|y|t|h|o|n| |f|-|s|t|r|i|n|g| |t|e|s|t|s| +0#0000000&@51
+@75
+|#+0#0000e05&| |T|h|i|s| |f|i|l|e| |c|o|n|t|a|i|n|s| |c|o|d|e| |d|e|r|i|v|e|d| |f|r|o|m| |t|h|e| |C|P|y|t|h|o|n| |p|r|o|j|e|c|t|,| +0#0000000&@15
+|#+0#0000e05&| |s|p|e|c|i|f|i|c|a|l@1|y| |f|r|o|m| |t|h|e| |f|i|l|e| |'|L|i|b|/|t|e|s|t|/|t|e|s|t|_|f|s|t|r|i|n|g|.|p|y|'|.| +0#0000000&@18
+|#+0#0000e05&| +0#0000000&@73
+|#+0#0000e05&| |T|h|e| |o|r|i|g|i|n|a|l| |c|o|d|e| |i|s| |C|o|p|y|r|i|g|h|t| |(|c|)| |2|0@1|1|-|2|0|2|5| |P|y|t|h|o|n| |S|o|f|t|w|a|r|e| |F|o|u|n|d|a|t|i|o|n|;| +0#0000000&
+|#+0#0000e05&| |A|l@1| |R|i|g|h|t|s| |R|e|s|e|r|v|e|d| +0#0000000&@53
+|#+0#0000e05&| +0#0000000&@73
+|#+0#0000e05&| |I|t| |i|s| |l|i|c|e|n|s|e|d| |u|n|d|e|r| |t|h|e| |P|S|F| |L|i|c|e|n|s|e| |A|g|r|e@1|m|e|n|t|:| +0#0000000&@25
+|#+0#0000e05&| |h|t@1|p|s|:|/@1|d|o|c|s|.|p|y|t|h|o|n|.|o|r|g|/|3|/|l|i|c|e|n|s|e|.|h|t|m|l| +0#0000000&@34
+|#+0#0000e05&| +0#0000000&@73
+|#+0#0000e05&| |M|o|d|i|f|i|c|a|t|i|o|n|s| |f|r|o|m| |t|h|e| |o|r|i|g|i|n|a|l|:| +0#0000000&@40
+|#+0#0000e05&| |-| |T|e|s|t| |i|n|p|u|t| |e|x|p|r|e|s@1|i|o|n|s| |h|a|v|e| |b|e@1|n| |e|x|t|r|a|c|t|e|d| |f|r|o|m| |t|h|e| |t|e|s|t| |f|u|n|c|t|i|o|n|s| |a|n|d| 
+|t|h|e| +0#0000000&@71
+|#+0#0000e05&| @2|f|u|n|c|t|i|o|n|s| |d|e|l|e|t|e|d| +0#0000000&@53
+|#+0#0000e05&| +0#0000000&@73
+|#+0#0000e05&| |T|h|i|s| |i|n|c|l|u|s|i|o|n| |i|s| |f|o|r| |t|e|s|t|i|n|g| |p|u|r|p|o|s|e|s| |o|f| |V|i|m|'|s| |P|y|t|h|o|n| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n
+|g|.| +0#0000000&@72
+@75
+@57|1|,|1| @10|T|o|p| 

runtime/syntax/testdir/dumps/python_fstring_01.dump

@@ -0,0 +1,20 @@
+|#+0#0000e05#ffffff0| |-| |T|e|s|t| |i|n|p|u|t| |e|x|p|r|e|s@1|i|o|n|s| |h|a|v|e| |b|e@1|n| |e|x|t|r|a|c|t|e|d| |f|r|o|m| |t|h|e| |t|e|s|t| |f|u|n|c|t|i|o|n|s| |a|n|d| 
+|t|h|e| +0#0000000&@71
+|#+0#0000e05&| @2|f|u|n|c|t|i|o|n|s| |d|e|l|e|t|e|d| +0#0000000&@53
+|#+0#0000e05&| +0#0000000&@73
+|#+0#0000e05&| |T|h|i|s| |i|n|c|l|u|s|i|o|n| |i|s| |f|o|r| |t|e|s|t|i|n|g| |p|u|r|p|o|s|e|s| |o|f| |V|i|m|'|s| |P|y|t|h|o|n| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n
+|g|.| +0#0000000&@72
+> @74
+|#+0#0000e05&| |P|y|t|h|o|n|-|3|.|1|2|.|2|/|L|i|b|/|t|e|s|t|/|t|e|s|t|_|f|s|t|r|i|n|g|.|p|y| |(|r|e|f|o|r|m|a|t@1|e|d| |f|o|r| |s|y|n|t|a|x| |t|e|s|t|i|n|g|)| +0#0000000&@1
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t| +0#0000000&@63
+|f+0#e000002&|'|{+0#e000e06&|a+0#0000000&| |*| |x|(|)|}+0#e000e06&|'+0#e000002&| +0#0000000&@62
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|l|i|n|e|_|n|u|m|b|e|r|s|_|m|u|l|t|i|p|l|e|_|f|o|r|m|a|t@1|e|d|v|a|l|u|e|s| +0#0000000&@25
+|f+0#e000002&|'|n|o| |f|o|r|m|a|t@1|e|d| |v|a|l|u|e|s|'| +0#0000000&@52
+|f+0#e000002&|'|e|g@1|s| |{+0#e000e06&|a+0#0000000&| |*| |x|(|)|}+0#e000e06&| +0#e000002&|s|p|a|m| |{+0#e000e06&|b+0#0000000&| |+| |y|(|)|}+0#e000e06&|'+0#e000002&| +0#0000000&@42
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|l|i|n|e|_|n|u|m|b|e|r|s|_|n|e|s|t|e|d| +0#0000000&@43
+|f+0#e000002&|'|{+0#e000e06&|a+0#0000000&| |*| |f+0#e000002&|"|-|{+0#e000e06&|x+0#0000000&|(|)|}+0#e000e06&|-+0#e000002&|"|}+0#e000e06&|'+0#e000002&| +0#0000000&@55
+@75
+@57|1|7|,|0|-|1| @8|1|%| 

runtime/syntax/testdir/dumps/python_fstring_02.dump

@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|l|i|n|e|_|n|u|m|b|e|r|s|_|d|u|p|l|i|c|a|t|e|_|e|x|p|r|e|s@1|i|o|n| +0#0000000&@29
+|f+0#e000002&|'|{+0#e000e06&|a+0#0000000&| |*| |x|(|)|}+0#e000e06&| +0#e000002&|{+0#e000e06&|a+0#0000000&| |*| |x|(|)|}+0#e000e06&| +0#e000002&|{+0#e000e06&|a+0#0000000&| |*| |x|(|)|}+0#e000e06&|'+0#e000002&| +0#0000000&@42
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|n|u|m|b|e|r|s|_|f|s|t|r|i|n|g|_|w|i|t|h|_|f|o|r|m|a|t@1|i|n|g| +0#0000000&@31
+>'+0#e000002&|f|"|H|e|r|e| |i|s| |t|h|a|t| |p|e|s|k|y| |{|x@2|:|.|3|f|}| |a|g|a|i|n|"|'| +0#0000000&@35
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|l|i|n|e|_|n|u|m|b|e|r|s|_|m|u|l|t|i|l|i|n|e|_|f|s|t|r|i|n|g| +0#0000000&@32
+|f+0#e000002&|'@2| +0#0000000&@70
+| +0#e000002&@1|{+0#e000e06&|a+0#0000000&| @70
+@5|*| @68
+@7|x|(|)|}+0#e000e06&| +0#0000000&@63
+|n+0#e000002&|o|n|-|i|m|p|o|r|t|a|n|t| |c|o|n|t|e|n|t| +0#0000000&@53
+|'+0#e000002&@2| +0#0000000&@71
+@75
+|f+0#e000002&|'@2| +0#0000000&@70
+| +0#e000002&@9|{+0#e000e06&|b+0#0000000&|l|e|c|h|}+0#e000e06&| +0#0000000&@57
+|'+0#e000002&@2| +0#0000000&@71
+@75
+@57|3|4|,|1| @10|4|%| 

runtime/syntax/testdir/dumps/python_fstring_03.dump

@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|l|i|n|e|_|n|u|m|b|e|r|s|_|w|i|t|h|_|p|a|r|e|n|t|h|e|s|e|s| +0#0000000&@33
+|x| |=| |(| @69
+@4|f+0#e000002&|"| |{+0#e000e06&|t+0#0000000&|e|s|t|(|t|)|}+0#e000e06&|"+0#e000002&| +0#0000000&@57
+|)| @73
+> @74
+|x| |=| |(| @69
+@4|u+0#e000002&|'|w|a|t|'|,+0#0000000&| @63
+@4|u+0#e000002&|"|w|a|t|"|,+0#0000000&| @63
+@4|b+0#e000002&|'|w|a|t|'|,+0#0000000&| @63
+@4|b+0#e000002&|"|w|a|t|"|,+0#0000000&| @63
+@4|f+0#e000002&|'|w|a|t|'|,+0#0000000&| @63
+@4|f+0#e000002&|"|w|a|t|"|,+0#0000000&| @63
+|)| @73
+@75
+|y| |=| |(| @69
+@4|u+0#e000002&|'@2|w|a|t|'@2|,+0#0000000&| @59
+@4|u+0#e000002&|"@2|w|a|t|"@2|,+0#0000000&| @59
+@4|b+0#e000002&|'@2|w|a|t|'@2|,+0#0000000&| @59
+@57|5|2|,|0|-|1| @8|7|%| 

runtime/syntax/testdir/dumps/python_fstring_04.dump

@@ -0,0 +1,20 @@
+| +0&#ffffff0@3|b+0#e000002&|'@2|w|a|t|'@2|,+0#0000000&| @59
+@4|b+0#e000002&|"@2|w|a|t|"@2|,+0#0000000&| @59
+@4|f+0#e000002&|'@2|w|a|t|'@2|,+0#0000000&| @59
+@4|f+0#e000002&|"@2|w|a|t|"@2|,+0#0000000&| @59
+|)| @73
+> @74
+|x| |=| |(| @69
+@8|'+0#e000002&|P|E|R|L|_|M@1|_|O|P|T|'|,+0#0000000&| |(| @50
+@12|f+0#e000002&|'|w|a|t|'| +0#0000000&@56
+@12|f+0#e000002&|'|s|o|m|e|_|s|t|r|i|n|g|=|{+0#e000e06&|f+0#0000000&|(|x|)|}+0#e000e06&| +0#e000002&|'| +0#0000000&@40
+@12|f+0#e000002&|'|w|a|t|'| +0#0000000&@56
+@8|)|,| @64
+|)| @73
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|f|s|t|r|i|n|g|_|e|m|p|t|y|_|f|o|r|m|a|t|_|s|p|e|c| +0#0000000&@37
+|f+0#e000002&|'|{+0#e000e06&|e+0#0000000&|x|p|r|:+0#e000e06&|}|'+0#e000002&| +0#0000000&@64
+@75
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|d|o|c|s|t|r|i|n|g| +0#0000000&@57
+@57|7|0|,|0|-|1| @7|1|0|%| 

runtime/syntax/testdir/dumps/python_fstring_05.dump

@@ -0,0 +1,20 @@
+|#+0#0000e05#ffffff0@1| |t|e|s|t|_|d|o|c|s|t|r|i|n|g| +0#0000000&@57
+|d+0#af5f00255&|e|f| +0#0000000&|f+0#00e0e07&|(+0#0000000&|)|:| @66
+@4|f+0#e000002&|'@2|N|o|t| |a| |d|o|c|s|t|r|i|n|g|'@2| +0#0000000&@48
+@75
+|d+0#af5f00255&|e|f| +0#0000000&|g+0#00e0e07&|(+0#0000000&|)|:| @66
+@4>'+0#e000002&@2|N|o|t| |a| |d|o|c|s|t|r|i|n|g|'@2| +0#0000000&|\+0#e000e06&| +0#0000000&@47
+@4|f+0#e000002&|'@1| +0#0000000&@67
+@75
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|a|s|t|_|c|o|m|p|i|l|e|_|t|i|m|e|_|c|o|n|c|a|t| +0#0000000&@43
+|(|'+0#e000002&|f|o@1|'| +0#0000000&|f+0#e000002&|'|{+0#e000e06&|3+0#e000002&|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|f|o@1|3|'|)+0#0000000&| @52
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|l|i|t|e|r|a|l| +0#0000000&@59
+|(|f+0#e000002&|'@1|,+0#0000000&| |'+0#e000002&@1|)+0#0000000&| @65
+|(|f+0#e000002&|'|a|'|,+0#0000000&| |'+0#e000002&|a|'|)+0#0000000&| @63
+|(|f+0#e000002&|'| |'|,+0#0000000&| |'+0#e000002&| |'|)+0#0000000&| @63
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|d|o|u|b|l|e|_|b|r|a|c|e|s| +0#0000000&@53
+|(|f+0#e000002&|'|{+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|'|)+0#0000000&| @62
+@57|8@1|,|5| @9|1|3|%| 

runtime/syntax/testdir/dumps/python_fstring_06.dump

@@ -0,0 +1,20 @@
+|(+0&#ffffff0|f+0#e000002&|'|{+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|'|)+0#0000000&| @62
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|a|{|'|)+0#0000000&| @60
+|(|f+0#e000002&|'|{+0#e000e06&@1|b+0#e000002&|'|,+0#0000000&| |'+0#e000002&|{|b|'|)+0#0000000&| @60
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|b+0#e000002&|'|,+0#0000000&| |'+0#e000002&|a|{|b|'|)+0#0000000&| @58
+|(|f+0#e000002&|'|}+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|}|'|)+0#0000000&| @62
+>(|f+0#e000002&|'|a|}+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|a|}|'|)+0#0000000&| @60
+|(|f+0#e000002&|'|}+0#e000e06&@1|b+0#e000002&|'|,+0#0000000&| |'+0#e000002&|}|b|'|)+0#0000000&| @60
+|(|f+0#e000002&|'|a|}+0#e000e06&@1|b+0#e000002&|'|,+0#0000000&| |'+0#e000002&|a|}|b|'|)+0#0000000&| @58
+|(|f+0#e000002&|'|{+0#e000e06&@1|}@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|}|'|)+0#0000000&| @59
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|}@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|a|{|}|'|)+0#0000000&| @57
+|(|f+0#e000002&|'|{+0#e000e06&@1|b+0#e000002&|}+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|b|}|'|)+0#0000000&| @57
+|(|f+0#e000002&|'|{+0#e000e06&@1|}@1|c+0#e000002&|'|,+0#0000000&| |'+0#e000002&|{|}|c|'|)+0#0000000&| @57
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|b+0#e000002&|}+0#e000e06&@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|a|{|b|}|'|)+0#0000000&| @55
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|}@1|c+0#e000002&|'|,+0#0000000&| |'+0#e000002&|a|{|}|c|'|)+0#0000000&| @55
+|(|f+0#e000002&|'|{+0#e000e06&@1|b+0#e000002&|}+0#e000e06&@1|c+0#e000002&|'|,+0#0000000&| |'+0#e000002&|{|b|}|c|'|)+0#0000000&| @55
+|(|f+0#e000002&|'|a|{+0#e000e06&@1|b+0#e000002&|}+0#e000e06&@1|c+0#e000002&|'|,+0#0000000&| |'+0#e000002&|a|{|b|}|c|'|)+0#0000000&| @53
+@75
+|(|f+0#e000002&|'|{+0#e000e06&@2|1+0#e000002&|0|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|1|0|'|)+0#0000000&| @56
+|(|f+0#e000002&|'|}+0#e000e06&@1|{|1+0#e000002&|0|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|}|1|0|'|)+0#0000000&| @56
+@57|1|0|6|,|1| @8|1|6|%| 

runtime/syntax/testdir/dumps/python_fstring_07.dump

@@ -0,0 +1,20 @@
+|(+0&#ffffff0|f+0#e000002&|'|}+0#e000e06&@1|{|1+0#e000002&|0|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|}|1|0|'|)+0#0000000&| @56
+|(|f+0#e000002&|'|}+0#e000e06&@1|{@2|1+0#e000002&|0|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|}|{|1|0|'|)+0#0000000&| @53
+|(|f+0#e000002&|'|}+0#e000e06&@1|a+0#e000002&|{+0#e000e06&@2|1+0#e000002&|0|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|}|a|{|1|0|'|)+0#0000000&| @51
+@75
+|(|f+0#e000002&|'|{+0#e000e06&|1+0#e000002&|0|}+0#e000e06&|{@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|1|0|{|'|)+0#0000000&| @56
+>(|f+0#e000002&|'|{+0#e000e06&|1+0#e000002&|0|}+0#e000e06&@2|'+0#e000002&|,+0#0000000&| |'+0#e000002&|1|0|}|'|)+0#0000000&| @56
+|(|f+0#e000002&|'|{+0#e000e06&|1+0#e000002&|0|}+0#e000e06&@2|{@1|'+0#e000002&|,+0#0000000&| |'+0#e000002&|1|0|}|{|'|)+0#0000000&| @53
+|(|f+0#e000002&|'|{+0#e000e06&|1+0#e000002&|0|}+0#e000e06&@2|a+0#e000002&|{+0#e000e06&@1|'+0#e000002&| +0#0000000&|'+0#e000002&|}|'|,+0#0000000&| |'+0#e000002&|1|0|}|a|{|}|'|)+0#0000000&| @46
+@75
+|#+0#0000e05&| |I|n|s|i|d|e| |o|f| |s|t|r|i|n|g|s|,| |d|o|n|'|t| |i|n|t|e|r|p|r|e|t| |d|o|u|b|l|e|d| |b|r|a|c|k|e|t|s|.| +0#0000000&@20
+|(|f+0#e000002&|'|{+0#e000e06&|"+0#e000002&|{@1|}@1|"|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{@1|}@1|'|)+0#0000000&| @53
+@75
+|#+0#0000e05&@1| |t|e|s|t|_|c|o|m|p|i|l|e|_|t|i|m|e|_|c|o|n|c|a|t| +0#0000000&@47
+|x| |=| |'+0#e000002&|d|e|f|'| +0#0000000&@65
+|(|'+0#e000002&|a|b|c|'| +0#0000000&|f+0#e000002&|'|#@1| |{+0#e000e06&|x+0#0000000&|}+0#e000e06&|g+0#e000002&|h|i|'|,+0#0000000&| |'+0#e000002&|a|b|c|#@1| |d|e|f|g|h|i|'|)+0#0000000&| @38
+|(|'+0#e000002&|a|b|c|'| +0#0000000&|f+0#e000002&|'|{+0#e000e06&|x+0#0000000&|}+0#e000e06&|'+0#e000002&| +0#0000000&|'+0#e000002&|g|h|i|'|,+0#0000000&| |'+0#e000002&|a|b|c|d|e|f|g|h|i|'|)+0#0000000&| @41
+|(|'+0#e000002&|a|b|c|'| +0#0000000&|f+0#e000002&|'|{+0#e000e06&|x+0#0000000&|}+0#e000e06&|'+0#e000002&| +0#0000000&|'+0#e000002&|g|h|'| +0#0000000&|f+0#e000002&|'|i|{+0#e000e06&|x+0#0000000&|:+0#e000e06&|4|}|'+0#e000002&|,+0#0000000&| |'+0#e000002&|a|b|c|d|e|f|g|h|i|d|e|f| |'|)+0#0000000&| @28
+|(|'+0#e000002&|{|x|}|'| +0#0000000&|f+0#e000002&|'|{+0#e000e06&|x+0#0000000&|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|x|}|d|e|f|'|)+0#0000000&| @50
+|(|'+0#e000002&|{|x|'| +0#0000000&|f+0#e000002&|'|{+0#e000e06&|x+0#0000000&|}+0#e000e06&|'+0#e000002&|,+0#0000000&| |'+0#e000002&|{|x|d|e|f|'|)+0#0000000&| @52
+@57|1|2|4|,|1| @8|1|9|%|