Make Interpolation.conversion an int and change bytecode def

Author: lysnikolaou

Include/internal/pycore_ast.h

@@ -15,7 +15,8 @@ extern PyTypeObject _PyInterpolation_Type;
 
 #define _PyInterpolation_CheckExact(op) Py_IS_TYPE((op), &_PyInterpolation_Type)
 
-PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefStealOnSuccess(_PyStackRef *values);
+PyAPI_FUNC(PyObject *) _PyInterpolation_Build(PyObject *value, PyObject *str,
+                                              int conversion, PyObject *format_spec);
 
 extern PyStatus _PyInterpolation_InitTypes(PyInterpreterState *interp);
 extern PyObject *_PyInterpolation_GetValueRef(PyObject *interpolation);

Include/internal/pycore_interpolation.h

@@ -158,28 +158,38 @@ _PyInterpolation_InitTypes(PyInterpreterState *interp)
 }
 
 PyObject *
-_PyInterpolation_FromStackRefStealOnSuccess(_PyStackRef *values)
+_PyInterpolation_Build(PyObject *value, PyObject *str, int conversion, PyObject *format_spec)
 {
-    interpolationobject *interpolation = (interpolationobject *) _PyInterpolation_Type.tp_alloc(&_PyInterpolation_Type, 0);
+    interpolationobject *interpolation =
+        (interpolationobject *) _PyInterpolation_Type.tp_alloc(&_PyInterpolation_Type, 0);
     if (!interpolation) {
         return NULL;
     }
 
-    interpolation->value = PyStackRef_AsPyObjectSteal(values[0]);
-    interpolation->expression = PyStackRef_AsPyObjectSteal(values[1]);
+    interpolation->value = Py_NewRef(value);
+    interpolation->expression = Py_NewRef(str);
+    interpolation->format_spec = Py_NewRef(format_spec);
 
-    if (PyStackRef_IsNull(values[2])) {
-        interpolation->conversion = Py_NewRef(Py_None);
+    if (conversion == 0) {
+        interpolation->conversion = Py_None;
     }
     else {
-        interpolation->conversion = PyStackRef_AsPyObjectSteal(values[2]);
-    }
-
-    if (PyStackRef_IsNull(values[3])) {
-        interpolation->format_spec = Py_NewRef(&_Py_STR(empty));
-    }
-    else {
-        interpolation->format_spec = PyStackRef_AsPyObjectSteal(values[3]);
+        switch (conversion) {
+            case FVC_ASCII:
+                interpolation->conversion = _Py_LATIN1_CHR('a');
+                break;
+            case FVC_REPR:
+                interpolation->conversion = _Py_LATIN1_CHR('r');
+                break;
+            case FVC_STR:
+                interpolation->conversion = _Py_LATIN1_CHR('s');
+                break;
+            default:
+                PyErr_SetString(PyExc_SystemError,
+                    "Interpolation() argument 'conversion' must be one of 's', 'a' or 'r'");
+                Py_DECREF(interpolation);
+                return NULL;
+        }
     }
 
     return (PyObject *) interpolation;

Include/internal/pycore_opcode_metadata.h

@@ -78,7 +78,7 @@ module Python
          | Compare(expr left, cmpop* ops, expr* comparators)
          | Call(expr func, expr* args, keyword* keywords)
          | FormattedValue(expr value, int conversion, expr? format_spec)
-         | Interpolation(expr value, constant str, constant? conversion, expr? format_spec)
+         | Interpolation(expr value, constant str, int conversion, expr? format_spec)
          | JoinedStr(expr* values)
          | TemplateStr(expr* values)
          | Constant(constant value, string? kind)

Include/internal/pycore_uop_metadata.h

@@ -1498,17 +1498,7 @@ expr_ty _PyPegen_interpolation(Parser *p, expr_ty expression, Token *debug, Resu
                                  ResultTokenWithMetadata *format, Token *closing_brace, int lineno, int col_offset,
                                  int end_lineno, int end_col_offset, PyArena *arena) {
 
-    constant convstr = NULL;
     int conversion_val = _get_interpolation_conversion(p, debug, conversion, format);
-    if (conversion_val >= 0) {
-        char buf[1];
-        buf[0] = conversion_val;
-        convstr = PyUnicode_FromStringAndSize(buf, 1);
-        if (convstr == NULL || _PyArena_AddPyObject(arena, convstr) < 0) {
-            Py_XDECREF(convstr);
-            return NULL;
-        }
-    }
 
     /* Find the non whitespace token after the "=" */
     int debug_end_line, debug_end_offset;
@@ -1539,7 +1529,7 @@ expr_ty _PyPegen_interpolation(Parser *p, expr_ty expression, Token *debug, Resu
     }
 
     expr_ty interpolation = _PyAST_Interpolation(
-        expression, final_exprstr, convstr, format ? (expr_ty) format->result : NULL,
+        expression, final_exprstr, conversion_val, format ? (expr_ty) format->result : NULL,
         lineno, col_offset, end_lineno,
         end_col_offset, arena
     );