[mypyc] librt.strings no longer behind experimental compiler flag (#21315)

It will be included in the default librt build, and the features can be
used in compiled code without feature flags. It's still considered
experimental from the functionality point of view, but not from the
build system point of the view.

We are still missing documentation. I'll prepare it in another PR.

Author: JukkaL

mypyc/lib-rt/byteswriter_extra_ops.c

@@ -3,8 +3,6 @@
 
 #include "byteswriter_extra_ops.h"
 
-#ifdef MYPYC_EXPERIMENTAL
-
 char CPyBytesWriter_Write(PyObject *obj, PyObject *value) {
     BytesWriterObject *self = (BytesWriterObject *)obj;
     const char *data;
@@ -41,5 +39,3 @@ void CPyBytes_ReadError(int64_t index, Py_ssize_t size) {
                      (long long)index, size);
     }
 }
-
-#endif // MYPYC_EXPERIMENTAL

mypyc/lib-rt/byteswriter_extra_ops.h

@@ -1,8 +1,6 @@
 #ifndef BYTESWRITER_EXTRA_OPS_H
 #define BYTESWRITER_EXTRA_OPS_H
 
-#ifdef MYPYC_EXPERIMENTAL
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <Python.h>
@@ -286,6 +284,4 @@ CPyBytes_ReadF64BE(PyObject *bytes_obj, int64_t index) {
     return CPyBytes_ReadF64BEUnsafe(data + index);
 }
 
-#endif // MYPYC_EXPERIMENTAL
-
 #endif

mypyc/lib-rt/strings/librt_strings.c

@@ -18,8 +18,6 @@
        ((BytesWriterObject *)data)->len += sizeof(type); \
     } while (0)
 
-#ifdef MYPYC_EXPERIMENTAL
-
 static PyTypeObject BytesWriterType;
 
 static bool
@@ -1155,10 +1153,7 @@ read_f64_be(PyObject *module, PyObject *const *args, size_t nargs) {
     return PyFloat_FromDouble(CPyBytes_ReadF64BEUnsafe(data + index));
 }
 
-#endif
-
 static PyMethodDef librt_strings_module_methods[] = {
-#ifdef MYPYC_EXPERIMENTAL
     {"write_i16_le", (PyCFunction) write_i16_le, METH_FASTCALL,
      PyDoc_STR("Write a 16-bit signed integer to BytesWriter in little-endian format")
     },
@@ -1219,12 +1214,9 @@ static PyMethodDef librt_strings_module_methods[] = {
     {"read_f64_be", (PyCFunction) read_f64_be, METH_FASTCALL,
      PyDoc_STR("Read a 64-bit float from bytes in big-endian format")
     },
-#endif
     {NULL, NULL, 0, NULL}
 };
 
-#ifdef MYPYC_EXPERIMENTAL
-
 static int
 strings_abi_version(void) {
     return LIBRT_STRINGS_ABI_VERSION;
@@ -1235,12 +1227,9 @@ strings_api_version(void) {
     return LIBRT_STRINGS_API_VERSION;
 }
 
-#endif
-
 static int
 librt_strings_module_exec(PyObject *m)
 {
-#ifdef MYPYC_EXPERIMENTAL
     if (PyType_Ready(&BytesWriterType) < 0) {
         return -1;
     }
@@ -1275,7 +1264,6 @@ librt_strings_module_exec(PyObject *m)
     if (PyModule_Add(m, "_C_API", c_api_object) < 0) {
         return -1;
     }
-#endif
     return 0;
 }
 

mypyc/lib-rt/strings/librt_strings.h

@@ -1,8 +1,6 @@
 #ifndef LIBRT_STRINGS_H
 #define LIBRT_STRINGS_H
 
-#ifdef MYPYC_EXPERIMENTAL
-
 #include <stdbool.h>
 #include <Python.h>
 #include "librt_strings_common.h"
@@ -30,6 +28,4 @@ typedef struct {
     char data[WRITER_EMBEDDED_BUF_LEN];  // Default buffer
 } StringWriterObject;
 
-#endif  // MYPYC_EXPERIMENTAL
-
 #endif  // LIBRT_STRINGS_H

mypyc/lib-rt/strings/librt_strings_api.c

@@ -1,16 +1,5 @@
 #include "librt_strings_api.h"
 
-#ifndef MYPYC_EXPERIMENTAL
-
-int
-import_librt_strings(void)
-{
-    // All librt.strings features are experimental for now, so don't set up the API here
-    return 0;
-}
-
-#else  // MYPYC_EXPERIMENTAL
-
 void *LibRTStrings_API[LIBRT_STRINGS_API_LEN] = {0};
 
 int
@@ -52,5 +41,3 @@ import_librt_strings(void)
     memcpy(LibRTStrings_API, capsule, sizeof(LibRTStrings_API));
     return 0;
 }
-
-#endif // MYPYC_EXPERIMENTAL

mypyc/lib-rt/strings/librt_strings_api.h

@@ -4,8 +4,6 @@
 int
 import_librt_strings(void);
 
-#ifdef MYPYC_EXPERIMENTAL
-
 #include <stdbool.h>
 #include <Python.h>
 #include "librt_strings.h"
@@ -36,6 +34,4 @@ static inline bool CPyStringWriter_Check(PyObject *obj) {
     return Py_TYPE(obj) == LibRTStrings_StringWriter_type_internal();
 }
 
-#endif  // MYPYC_EXPERIMENTAL
-
 #endif  // LIBRT_STRINGS_API_H

mypyc/lib-rt/stringwriter_extra_ops.c

@@ -3,9 +3,5 @@
 
 #include "stringwriter_extra_ops.h"
 
-#ifdef MYPYC_EXPERIMENTAL
-
 // All StringWriter operations are currently implemented as inline functions
 // in stringwriter_extra_ops.h, or use the exported capsule API directly.
-
-#endif // MYPYC_EXPERIMENTAL

mypyc/lib-rt/stringwriter_extra_ops.h

@@ -1,8 +1,6 @@
 #ifndef STRINGWRITER_EXTRA_OPS_H
 #define STRINGWRITER_EXTRA_OPS_H
 
-#ifdef MYPYC_EXPERIMENTAL
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <Python.h>
@@ -74,6 +72,4 @@ static inline int32_t CPyStringWriter_GetItem(PyObject *obj, int64_t index) {
     }
 }
 
-#endif // MYPYC_EXPERIMENTAL
-
 #endif