Rename PyUnstable_LongExport to PyUnstable_Long_DigitArray

Author: vstinner

Doc/c-api/long.rst

@@ -552,7 +552,7 @@ Import/Export API
    A single unsigned digit.
 
    It is usually used in an *array of digits*, such as the
-   :c:member:`PyUnstable_LongExport.digits` array.
+   :c:member:`PyUnstable_Long_DigitArray.digits` array.
 
    Its size depend on the :c:macro:`!PYLONG_BITS_IN_DIGIT` macro:
    see the ``configure`` :option:`--enable-big-digits` option.
@@ -607,11 +607,12 @@ Import/Export API
    See :c:struct:`PyUnstable_Long_LAYOUT` for the internal layout of an integer.
 
 
-.. c:struct:: PyUnstable_LongExport
+.. c:struct:: PyUnstable_Long_DigitArray
 
    A Python :class:`int` object exported as an array of digits.
 
-   See :c:struct:`PyUnstable_Long_LAYOUT` for the internal layout of an integer.
+   See :c:struct:`PyUnstable_Long_LAYOUT` for the internal layout of an
+   integer.
 
    .. c:member:: PyLongObject *obj
 
@@ -630,11 +631,11 @@ Import/Export API
       Array of unsigned digits.
 
 
-.. c:function:: int PyUnstable_Long_Export(PyObject *obj, PyUnstable_LongExport *export)
+.. c:function:: int PyUnstable_Long_Export(PyObject *obj, PyUnstable_Long_DigitArray *array)
 
    Export a Python :class:`int` object as an array of digits.
 
-   * Set *\*export* and return 0 on success.
+   * Set *\*array* and return 0 on success.
    * Set an exception and return -1 on error.
 
    This function always succeeds if *obj* is a Python :class:`int` object or a
@@ -644,6 +645,6 @@ Import/Export API
    *export*.
 
 
-.. c:function:: void PyUnstable_Long_ReleaseExport(PyUnstable_LongExport *export)
+.. c:function:: void PyUnstable_Long_ReleaseExport(PyUnstable_Long_DigitArray *array)
 
-   Release an export created by :c:func:`PyUnstable_Long_Export`.
+   Release the export *array* created by :c:func:`PyUnstable_Long_Export`.

Include/cpython/longintrepr.h

@@ -168,18 +168,18 @@ PyAPI_FUNC(PyObject*) PyUnstable_Long_Import(
     size_t ndigits,
     Py_digit *digits);
 
-typedef struct PyUnstable_LongExport {
+typedef struct PyUnstable_Long_DigitArray {
     PyLongObject *obj;
     int negative;
     size_t ndigits;
     Py_digit *digits;
-} PyUnstable_LongExport;
+} PyUnstable_Long_DigitArray;
 
 PyAPI_FUNC(int) PyUnstable_Long_Export(
     PyObject *obj,
-    PyUnstable_LongExport *long_export);
+    PyUnstable_Long_DigitArray *array);
 PyAPI_FUNC(void) PyUnstable_Long_ReleaseExport(
-    PyUnstable_LongExport *long_export);
+    PyUnstable_Long_DigitArray *array);
 
 #ifdef __cplusplus
 }

Modules/_testcapi/long.c

@@ -163,14 +163,14 @@ pylong_import(PyObject *module, PyObject *args)
 static PyObject *
 pylong_export(PyObject *module, PyObject *obj)
 {
-    PyUnstable_LongExport long_export;
-    if (PyUnstable_Long_Export(obj, &long_export) < 0) {
+    PyUnstable_Long_DigitArray array;
+    if (PyUnstable_Long_Export(obj, &array) < 0) {
         return NULL;
     }
 
     PyObject *digits = PyList_New(0);
-    for (size_t i=0; i < long_export.ndigits; i++) {
-        PyObject *digit = PyLong_FromUnsignedLong(long_export.digits[i]);
+    for (size_t i=0; i < array.ndigits; i++) {
+        PyObject *digit = PyLong_FromUnsignedLong(array.digits[i]);
         if (digit == NULL) {
             Py_DECREF(digits);
             goto error;
@@ -184,12 +184,12 @@ pylong_export(PyObject *module, PyObject *obj)
         Py_DECREF(digit);
     }
 
-    PyObject *res = Py_BuildValue("(iN)", long_export.negative, digits);
-    PyUnstable_Long_ReleaseExport(&long_export);
+    PyObject *res = Py_BuildValue("(iN)", array.negative, digits);
+    PyUnstable_Long_ReleaseExport(&array);
     return res;
 
 error:
-    PyUnstable_Long_ReleaseExport(&long_export);
+    PyUnstable_Long_ReleaseExport(&array);
     return NULL;
 }
 

Objects/longobject.c

@@ -6702,30 +6702,30 @@ PyUnstable_Long_Import(int negative, size_t ndigits, Py_digit *digits)
 
 
 int
-PyUnstable_Long_Export(PyObject *obj, PyUnstable_LongExport *long_export)
+PyUnstable_Long_Export(PyObject *obj, PyUnstable_Long_DigitArray *array)
 {
     if (!PyLong_Check(obj)) {
         PyErr_Format(PyExc_TypeError, "expect int, got %T", obj);
         return -1;
     }
     PyLongObject *self = (PyLongObject*)obj;
 
-    long_export->obj = (PyLongObject*)Py_NewRef(obj);
-    long_export->negative = _PyLong_IsNegative(self);
-    long_export->ndigits = _PyLong_DigitCount(self);
-    if (long_export->ndigits == 0) {
-        long_export->ndigits = 1;
+    array->obj = (PyLongObject*)Py_NewRef(obj);
+    array->negative = _PyLong_IsNegative(self);
+    array->ndigits = _PyLong_DigitCount(self);
+    if (array->ndigits == 0) {
+        array->ndigits = 1;
     }
-    long_export->digits = self->long_value.ob_digit;
+    array->digits = self->long_value.ob_digit;
     return 0;
 }
 
 
 void
-PyUnstable_Long_ReleaseExport(PyUnstable_LongExport *long_export)
+PyUnstable_Long_ReleaseExport(PyUnstable_Long_DigitArray *array)
 {
-    Py_CLEAR(long_export->obj);
-    long_export->negative = 0;
-    long_export->ndigits = 0;
-    long_export->digits = NULL;
+    Py_CLEAR(array->obj);
+    array->negative = 0;
+    array->ndigits = 0;
+    array->digits = NULL;
 }