Move to a separate file

Author: JukkaL

mypyc/ir/deps.py

@@ -50,3 +50,4 @@ def get_header(self) -> str:
 LIBRT_BASE64: Final = Capsule("librt.base64")
 
 BYTES_EXTRA_OPS: Final = SourceDep("bytes_extra_ops.c")
+BYTES_WRITER_EXTRA_OPS: Final = SourceDep("byteswriter_extra_ops.c")

mypyc/lib-rt/byteswriter_extra_ops.c

@@ -0,0 +1,27 @@
+#include "byteswriter_extra_ops.h"
+
+char CPyBytesWriter_Write(PyObject *obj, PyObject *value) {
+    BytesWriterObject *self = (BytesWriterObject *)obj;
+    const char *data;
+    Py_ssize_t size;
+    if (likely(PyBytes_Check(value))) {
+        data = PyBytes_AS_STRING(value);
+        size = PyBytes_GET_SIZE(value);
+    } else {
+        data = PyByteArray_AS_STRING(value);
+        size = PyByteArray_GET_SIZE(value);
+    }
+    // Write bytes content.
+    if (!CPyBytesWriter_EnsureSize(self, size))
+        return CPY_NONE_ERROR;
+    if (size < 8) {
+        char *p = self->buf + self->len;
+        for (Py_ssize_t i = 0; i < size; i++) {
+            p[i] = data[i];
+        }
+    } else {
+        memcpy(self->buf + self->len, data, size);
+    }
+    self->len += size;
+    return CPY_NONE;
+}

mypyc/lib-rt/byteswriter_extra_ops.h

@@ -0,0 +1,34 @@
+#ifndef BYTESWRITER_EXTRA_OPS_H
+#define BYTESWRITER_EXTRA_OPS_H
+
+#include "librt_strings.h"
+
+static inline CPyTagged
+CPyBytesWriter_Len(PyObject *obj) {
+    return (CPyTagged)((BytesWriterObject *)obj)->len << 1;
+}
+
+static inline bool
+CPyBytesWriter_EnsureSize(BytesWriterObject *data, Py_ssize_t n) {
+    if (likely(data->capacity - data->len >= n)) {
+        return true;
+    } else {
+        return LibRTStrings_ByteWriter_grow_buffer_internal(data, n);
+    }
+}
+
+static inline char
+CPyBytesWriter_Append(PyObject *obj, uint8_t value) {
+    BytesWriterObject *self = (BytesWriterObject *)obj;
+    // Store length in a local variable to enable additional optimizations
+    Py_ssize_t len = self->len;
+    if (!CPyBytesWriter_EnsureSize(self, 1))
+        return CPY_NONE_ERROR;
+    self->buf[len] = value;
+    self->len = len + 1;
+    return CPY_NONE;
+}
+
+char CPyBytesWriter_Write(PyObject *obj, PyObject *value);
+
+#endif

mypyc/lib-rt/librt_strings.h

@@ -85,59 +85,6 @@ static inline bool CPyBytesWriter_Check(PyObject *obj) {
     return Py_TYPE(obj) == LibRTStrings_BytesWriter_type_internal();
 }
 
-static inline bool
-CPyBytesWriter_EnsureSize(BytesWriterObject *data, Py_ssize_t n) {
-    if (likely(data->capacity - data->len >= n)) {
-        return true;
-    } else {
-        return LibRTStrings_ByteWriter_grow_buffer_internal(data, n);
-    }
-}
-
-static inline char
-CPyBytesWriter_Append(PyObject *obj, uint8_t value) {
-    BytesWriterObject *self = (BytesWriterObject *)obj;
-    // Store length in a local variable to enable additional optimizations
-    Py_ssize_t len = self->len;
-    if (!CPyBytesWriter_EnsureSize(self, 1))
-        return CPY_NONE_ERROR;
-    self->buf[len] = value;
-    self->len = len + 1;
-    return CPY_NONE;
-}
-
-static char
-CPyBytesWriter_Write(PyObject *obj, PyObject *value) {
-    BytesWriterObject *self = (BytesWriterObject *)obj;
-    const char *data;
-    Py_ssize_t size;
-    if (likely(PyBytes_Check(value))) {
-        data = PyBytes_AS_STRING(value);
-        size = PyBytes_GET_SIZE(value);
-    } else {
-        data = PyByteArray_AS_STRING(value);
-        size = PyByteArray_GET_SIZE(value);
-    }
-    // Write bytes content.
-    if (!CPyBytesWriter_EnsureSize(self, size))
-        return CPY_NONE_ERROR;
-    if (size < 8) {
-        char *p = self->buf + self->len;
-        for (Py_ssize_t i = 0; i < size; i++) {
-            p[i] = data[i];
-        }
-    } else {
-        memcpy(self->buf + self->len, data, size);
-    }
-    self->len += size;
-    return CPY_NONE;
-}
-
-static inline CPyTagged
-CPyBytesWriter_Len(PyObject *obj) {
-    return (CPyTagged)((BytesWriterObject *)obj)->len << 1;
-}
-
 #endif  // MYPYC_EXPERIMENTAL
 
 #endif  // LIBRT_STRINGS_H

mypyc/primitives/librt_strings_ops.py

@@ -1,6 +1,6 @@
 from typing import Final
 
-from mypyc.ir.deps import LIBRT_STRINGS
+from mypyc.ir.deps import LIBRT_STRINGS, BYTES_WRITER_EXTRA_OPS
 from mypyc.ir.ops import ERR_MAGIC, ERR_NEVER
 from mypyc.ir.rtypes import (
     KNOWN_NATIVE_TYPES,
@@ -41,7 +41,7 @@
     c_function_name="CPyBytesWriter_Write",
     error_kind=ERR_MAGIC,
     experimental=True,
-    dependencies=[LIBRT_STRINGS],
+    dependencies=[LIBRT_STRINGS, BYTES_WRITER_EXTRA_OPS],
 )
 
 method_op(
@@ -51,7 +51,7 @@
     c_function_name="CPyBytesWriter_Append",
     error_kind=ERR_MAGIC,
     experimental=True,
-    dependencies=[LIBRT_STRINGS],
+    dependencies=[LIBRT_STRINGS, BYTES_WRITER_EXTRA_OPS],
 )
 
 method_op(
@@ -60,6 +60,8 @@
     return_type=none_rprimitive,
     c_function_name="LibRTStrings_BytesWriter_truncate_internal",
     error_kind=ERR_MAGIC,
+    experimental=True,
+    dependencies=[LIBRT_STRINGS],
 )
 
 function_op(
@@ -69,5 +71,5 @@
     c_function_name="CPyBytesWriter_Len",
     error_kind=ERR_NEVER,
     experimental=True,
-    dependencies=[LIBRT_STRINGS],
+    dependencies=[LIBRT_STRINGS, BYTES_WRITER_EXTRA_OPS],
 )