[mypyc] Add primitives for bytes and str multiply

Author: JukkaL

mypyc/lib-rt/CPy.h

@@ -770,6 +770,7 @@ PyObject *CPy_Encode(PyObject *obj, PyObject *encoding, PyObject *errors);
 Py_ssize_t CPyStr_Count(PyObject *unicode, PyObject *substring, CPyTagged start);
 Py_ssize_t CPyStr_CountFull(PyObject *unicode, PyObject *substring, CPyTagged start, CPyTagged end);
 CPyTagged CPyStr_Ord(PyObject *obj);
+PyObject *CPyStr_Multiply(PyObject *str, CPyTagged count);
 
 
 // Bytes operations
@@ -781,6 +782,7 @@ CPyTagged CPyBytes_GetItem(PyObject *o, CPyTagged index);
 PyObject *CPyBytes_Concat(PyObject *a, PyObject *b);
 PyObject *CPyBytes_Join(PyObject *sep, PyObject *iter);
 CPyTagged CPyBytes_Ord(PyObject *obj);
+PyObject *CPyBytes_Multiply(PyObject *bytes, CPyTagged count);
 
 
 int CPyBytes_Compare(PyObject *left, PyObject *right);

mypyc/lib-rt/bytes_ops.c

@@ -162,3 +162,12 @@ CPyTagged CPyBytes_Ord(PyObject *obj) {
     PyErr_SetString(PyExc_TypeError, "ord() expects a character");
     return CPY_INT_TAG;
 }
+
+PyObject *CPyBytes_Multiply(PyObject *bytes, CPyTagged count) {
+    Py_ssize_t temp_count = CPyTagged_AsSsize_t(count);
+    if (temp_count == -1 && PyErr_Occurred()) {
+        PyErr_SetString(PyExc_OverflowError, CPYTHON_LARGE_INT_ERRMSG);
+        return NULL;
+    }
+    return PySequence_Repeat(bytes, temp_count);
+}

mypyc/lib-rt/str_ops.c

@@ -621,3 +621,12 @@ CPyTagged CPyStr_Ord(PyObject *obj) {
         PyExc_TypeError, "ord() expected a character, but a string of length %zd found", s);
     return CPY_INT_TAG;
 }
+
+PyObject *CPyStr_Multiply(PyObject *str, CPyTagged count) {
+    Py_ssize_t temp_count = CPyTagged_AsSsize_t(count);
+    if (temp_count == -1 && PyErr_Occurred()) {
+        PyErr_SetString(PyExc_OverflowError, CPYTHON_LARGE_INT_ERRMSG);
+        return NULL;
+    }
+    return PySequence_Repeat(str, temp_count);
+}

mypyc/primitives/bytes_ops.py

@@ -82,6 +82,25 @@
     steals=[True, False],
 )
 
+# bytes * int
+binary_op(
+    name="*",
+    arg_types=[bytes_rprimitive, int_rprimitive],
+    return_type=bytes_rprimitive,
+    c_function_name="CPyBytes_Multiply",
+    error_kind=ERR_MAGIC,
+)
+
+# int * bytes
+binary_op(
+    name="*",
+    arg_types=[int_rprimitive, bytes_rprimitive],
+    return_type=bytes_rprimitive,
+    c_function_name="CPyBytes_Multiply",
+    error_kind=ERR_MAGIC,
+    ordering=[1, 0],
+)
+
 # bytes[begin:end]
 bytes_slice_op = custom_op(
     arg_types=[bytes_rprimitive, int_rprimitive, int_rprimitive],

mypyc/primitives/str_ops.py

@@ -79,6 +79,25 @@
     steals=[True, False],
 )
 
+# str * int
+binary_op(
+    name="*",
+    arg_types=[str_rprimitive, int_rprimitive],
+    return_type=str_rprimitive,
+    c_function_name="CPyStr_Multiply",
+    error_kind=ERR_MAGIC,
+)
+
+# int * str
+binary_op(
+    name="*",
+    arg_types=[int_rprimitive, str_rprimitive],
+    return_type=str_rprimitive,
+    c_function_name="CPyStr_Multiply",
+    error_kind=ERR_MAGIC,
+    ordering=[1, 0],
+)
+
 # str1 == str2 (very common operation, so we provide our own)
 str_eq = custom_primitive_op(
     name="str_eq",

mypyc/test-data/irbuild-bytes.test

@@ -217,3 +217,24 @@ L2:
 L3:
     keep_alive y
     return r2
+
+[case testBytesMultiply]
+def b_times_i(s: bytes, n: int) -> bytes:
+    return s * n
+def i_times_b(s: bytes, n: int) -> bytes:
+    return n * s
+[out]
+def b_times_i(s, n):
+    s :: bytes
+    n :: int
+    r0 :: bytes
+L0:
+    r0 = CPyBytes_Multiply(s, n)
+    return r0
+def i_times_b(s, n):
+    s :: bytes
+    n :: int
+    r0 :: bytes
+L0:
+    r0 = CPyBytes_Multiply(s, n)
+    return r0

mypyc/test-data/irbuild-str.test

@@ -771,3 +771,24 @@ L0:
     r0 = 'literal'
     r1 = 'literal'
     return 1
+
+[case testStrMultiply]
+def s_times_i(s: str, n: int) -> str:
+    return s * n
+def i_times_s(s: str, n: int) -> str:
+    return n * s
+[out]
+def s_times_i(s, n):
+    s :: str
+    n :: int
+    r0 :: str
+L0:
+    r0 = CPyStr_Multiply(s, n)
+    return r0
+def i_times_s(s, n):
+    s :: str
+    n :: int
+    r0 :: str
+L0:
+    r0 = CPyStr_Multiply(s, n)
+    return r0