Implement next version of PEP 750

Still buggy

Author: lysnikolaou

Doc/library/token-list.inc

@@ -60,6 +60,7 @@ TYPE_IGNORE
 TYPE_COMMENT
 SOFT_KEYWORD
 FSTRING_START
+TSTRING_START
 FSTRING_MIDDLE
 FSTRING_END
 COMMENT

Grammar/Tokens

@@ -500,7 +500,7 @@ literal_pattern[pattern_ty]:
 literal_expr[expr_ty]:
     | signed_number !('+' | '-')
     | complex_number
-    | strings
+    | &(STRING|FSTRING_START) strings
     | 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
     | 'True' { _PyAST_Constant(Py_True, NULL, EXTRA) }
     | 'False' { _PyAST_Constant(Py_False, NULL, EXTRA) }
@@ -841,6 +841,7 @@ atom[expr_ty]:
     | 'False' { _PyAST_Constant(Py_False, NULL, EXTRA) }
     | 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
     | &(STRING|FSTRING_START) strings
+    | &TSTRING_START tstring
     | NUMBER
     | &'(' (tuple | group | genexp)
     | &'[' (list | listcomp)
@@ -927,6 +928,16 @@ fstring_format_spec[expr_ty]:
 fstring[expr_ty]:
     | a=FSTRING_START b=fstring_middle* c=FSTRING_END { _PyPegen_joined_str(p, a, (asdl_expr_seq*)b, c) }
 
+tstring_middle[expr_ty]:
+    | tstring_replacement_field
+    | t=FSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
+tstring_replacement_field[expr_ty]:
+    | '{' a=annotated_rhs debug_expr='='? conversion=[fstring_conversion] format=[fstring_full_format_spec] rbrace='}' {
+        _PyPegen_interpolation(p, a, debug_expr, conversion, format, rbrace, EXTRA) }
+    | invalid_replacement_field
+tstring[expr_ty]:
+    | a=TSTRING_START b=tstring_middle* c=FSTRING_END { _PyPegen_template_str(p, a, (asdl_expr_seq*)b, c) }
+
 string[expr_ty]: s[Token*]=STRING { _PyPegen_constant_from_string(p, s) }
 strings[expr_ty] (memo): a[asdl_expr_seq*]=(fstring|string)+ { _PyPegen_concatenate_strings(p, a, EXTRA) }
 

Grammar/python.gram

@@ -0,0 +1,31 @@
+#ifndef Py_INTERNAL_INTERPOLATION_H
+#define Py_INTERNAL_INTERPOLATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *value;
+    PyObject *expr;
+    PyObject *conv;
+    PyObject *format_spec;
+} PyInterpolationObject;
+
+extern PyTypeObject PyInterpolation_Type;
+
+PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefSteal(_PyStackRef *values, Py_ssize_t n);
+
+extern PyStatus _PyInterpolation_InitTypes(PyInterpreterState *);
+extern void _PyInterpolation_FiniTypes(PyInterpreterState *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Include/internal/pycore_ast.h

@@ -260,6 +260,7 @@ Known values:
     Python 3.14a1 3606 (Specialize CALL_KW)
     Python 3.14a1 3607 (Add pseudo instructions JUMP_IF_TRUE/FALSE)
     Python 3.14a1 3608 (Add support for slices)
+    Python 3.14a1 3609 (Add BUILD_INTERPOLATION & BUILD_TEMPLATE opcodes)
 
     Python 3.15 will start with 3650
 
@@ -272,7 +273,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3608
+#define PYC_MAGIC_NUMBER 3609
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

Include/internal/pycore_ast_state.h

@@ -0,0 +1,28 @@
+#ifndef Py_INTERNAL_TEMPLATE_H
+#define Py_INTERNAL_TEMPLATE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *args;
+} PyTemplateObject;
+
+extern PyTypeObject PyTemplate_Type;
+
+PyAPI_FUNC(PyObject *) _PyTemplate_Create(PyObject **values, Py_ssize_t n);
+
+extern PyStatus _PyTemplate_InitTypes(PyInterpreterState *);
+extern void _PyTemplate_FiniTypes(PyInterpreterState *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Include/internal/pycore_interpolation.h

@@ -73,12 +73,13 @@ extern "C" {
 #define TYPE_COMMENT    57
 #define SOFT_KEYWORD    58
 #define FSTRING_START   59
-#define FSTRING_MIDDLE  60
-#define FSTRING_END     61
-#define COMMENT         62
-#define NL              63
-#define ERRORTOKEN      64
-#define N_TOKENS        66
+#define TSTRING_START   60
+#define FSTRING_MIDDLE  61
+#define FSTRING_END     62
+#define COMMENT         63
+#define NL              64
+#define ERRORTOKEN      65
+#define N_TOKENS        67
 #define NT_OFFSET       256
 
 /* Special definitions for cooperation with parser */