Support = for self documenting values in format strings

marijnh · marijnh · commit b87c3d8d0105 · 2024-01-16T10:49:02.000+01:00
FIX: Support the `=` flag to values in format strings. Closes #21
diff --git a/src/python.grammar b/src/python.grammar
@@ -273,7 +273,13 @@ skw<term> { @extend[@name={term}]<identifier, term> }
   }
 }
 
-FormatReplacement[isolate]<start> { start (YieldExpression | commaSep<"*"? test>) FormatConversion? (formatStringSpec | "}") }
+FormatReplacement[isolate]<start> {
+  start
+  (YieldExpression | commaSep<"*"? test>)
+  FormatSelfDoc {"="}?
+  FormatConversion?
+  (formatStringSpec | "}")
+}
 
 @context trackIndent from "./tokens.js"
 
diff --git a/test/expression.txt b/test/expression.txt
@@ -51,6 +51,7 @@ f"""big long format
   {string :foo}"""
 f'''well {{ \x }} {2 :{bar}}'''
 f"""one"{two}"three"""
+f'{user=!s}  {delta.days=:,d}'
 
 ==>
 
@@ -59,7 +60,10 @@ Script(ExpressionStatement(FormatString(FormatReplacement(Number),
        ExpressionStatement(FormatString(FormatReplacement(VariableName, FormatConversion))),
        ExpressionStatement(FormatString(FormatReplacement(VariableName, FormatSpec))),
        ExpressionStatement(FormatString(FormatReplacement(Number, FormatSpec(FormatReplacement(VariableName))))),
-       ExpressionStatement(FormatString(FormatReplacement(VariableName))))
+       ExpressionStatement(FormatString(FormatReplacement(VariableName))),
+       ExpressionStatement(FormatString(
+         FormatReplacement(VariableName,FormatSelfDoc,FormatConversion),
+         FormatReplacement(MemberExpression(VariableName,PropertyName),FormatSelfDoc,FormatSpec))))
 
 # Lambda
 

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,13 @@ skw<term> { @extend[@name={term}]<identifier, term> }`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`276`		`-FormatReplacement[isolate]<start> { start (YieldExpression \| commaSep<"*"? test>) FormatConversion? (formatStringSpec \| "}") }`
	`276`	`+FormatReplacement[isolate]<start> {`
	`277`	`+ start`
	`278`	`+ (YieldExpression \| commaSep<"*"? test>)`
	`279`	`+ FormatSelfDoc {"="}?`
	`280`	`+ FormatConversion?`
	`281`	`+ (formatStringSpec \| "}")`
	`282`	`+}`
`277`	`283`
`278`	`284`	`@context trackIndent from "./tokens.js"`
`279`	`285`