[mypyc]: support :s and :d in generate_format_ops

Author: BobTheBuidler

mypyc/irbuild/format_str_tokenizer.py

@@ -53,9 +53,9 @@ def generate_format_ops(specifiers: list[ConversionSpecifier]) -> list[FormatOp]
     format_ops = []
     for spec in specifiers:
         # TODO: Match specifiers instead of using whole_seq
-        if spec.whole_seq == "%s" or spec.whole_seq == "{:{}}":
+        if spec.whole_seq == "%s" or spec.whole_seq in ("{:{}}", ":s"):
             format_op = FormatOp.STR
-        elif spec.whole_seq == "%d":
+        elif spec.whole_seq in ("%d", ":d"):
             format_op = FormatOp.INT
         elif spec.whole_seq == "%b":
             format_op = FormatOp.BYTES

mypyc/test-data/irbuild-constant-fold.test

@@ -192,6 +192,8 @@ L0:
 from typing import Any, Final
 
 FMT: Final = "{} {}"
+FMT_D: Final = "{:d} {:s}"
+FMT_S: Final = "{:s} {:s}"
 
 def f() -> str:
     return FMT.format(400 + 20, "roll" + "up")
@@ -205,6 +207,30 @@ L0:
     r3 = CPyStr_Build(3, r0, r1, r2)
     return r3
 
+def g() -> str:
+    return FMT_D.format(400 + 20, "roll" + "up")
+[out]
+def g():
+    r0, r1, r2, r3 :: str
+L0:
+    r0 = '420'
+    r1 = ' '
+    r2 = 'rollup'
+    r3 = CPyStr_Build(3, r0, r1, r2)
+    return r3
+
+def h() -> str:
+    return FMT_S.format(400 + 20, "roll" + "up")
+[out]
+def h():
+    r0, r1, r2, r3 :: str
+L0:
+    r0 = '420'
+    r1 = ' '
+    r2 = 'rollup'
+    r3 = CPyStr_Build(3, r0, r1, r2)
+    return r3
+
 [case testIntConstantFoldingFinal]
 from typing import Final
 X: Final = 5