Make struct private

Author: markshannon

Include/object.h

@@ -309,8 +309,8 @@ typedef PyObject *(*iternextfunc) (PyObject *);
 typedef struct _py_object_index_pair {
     PyObject *object;
     Py_ssize_t index;
-} PyObjectIndexPair;
-typedef PyObjectIndexPair (*iteritemfunc) (PyObject *, Py_ssize_t index);
+} _PyObjectIndexPair;
+typedef _PyObjectIndexPair (*iteritemfunc) (PyObject *, Py_ssize_t index);
 typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
 typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
 typedef int (*initproc)(PyObject *, PyObject *, PyObject *);

Modules/_testinternalcapi/test_cases.c.h

@@ -3206,15 +3206,15 @@ Construct an immutable array of bytes from:\n\
 static PyObject *bytes_iter(PyObject *seq);
 
 
-static PyObjectIndexPair
+static _PyObjectIndexPair
 bytes_iteritem(PyObject *obj, Py_ssize_t index)
 {
     PyBytesObject *a = _PyBytes_CAST(obj);
     if (index >= Py_SIZE(a)) {
-        return (PyObjectIndexPair) { .object = NULL, .index = index };
+        return (_PyObjectIndexPair) { .object = NULL, .index = index };
     }
     PyObject *l = _PyLong_FromUnsignedChar((unsigned char)a->ob_sval[index]);
-    return (PyObjectIndexPair) { .object = l, .index = index + 1 };
+    return (_PyObjectIndexPair) { .object = l, .index = index + 1 };
 }
 
 PyTypeObject PyBytes_Type = {

Objects/bytesobject.c

@@ -3913,11 +3913,11 @@ list_ass_subscript(PyObject *self, PyObject *item, PyObject *value)
     return res;
 }
 
-static PyObjectIndexPair
+static _PyObjectIndexPair
 list_iteritem(PyObject *obj, Py_ssize_t index)
 {
     PyObject *result = list_get_item_ref((PyListObject *)obj, index);
-    return (PyObjectIndexPair) { .object = result, .index = index + 1 };
+    return (_PyObjectIndexPair) { .object = result, .index = index + 1 };
 }
 
 static PyMappingMethods list_as_mapping = {

Objects/listobject.c

@@ -873,15 +873,15 @@ static PySequenceMethods tuple_as_sequence = {
     tuple_contains,                             /* sq_contains */
 };
 
-static PyObjectIndexPair
+static _PyObjectIndexPair
 tuple_iteritem(PyObject *obj, Py_ssize_t index)
 {
     if (index >= PyTuple_GET_SIZE(obj)) {
-        return (PyObjectIndexPair) { .object = NULL, .index = index };
+        return (_PyObjectIndexPair) { .object = NULL, .index = index };
     }
     PyObject *result = PyTuple_GET_ITEM(obj, index);
     Py_INCREF(result);
-    return (PyObjectIndexPair) { .object = result, .index = index + 1 };
+    return (_PyObjectIndexPair) { .object = result, .index = index + 1 };
 }
 
 static PyObject*

Objects/tupleobject.c

@@ -13982,18 +13982,18 @@ unicode_subtype_new(PyTypeObject *type, PyObject *unicode)
     return NULL;
 }
 
-static PyObjectIndexPair
+static _PyObjectIndexPair
 unicode_iteritem(PyObject *obj, Py_ssize_t index)
 {
     if (index >= PyUnicode_GET_LENGTH(obj)) {
-        return (PyObjectIndexPair) { .object = NULL, .index = index };
+        return (_PyObjectIndexPair) { .object = NULL, .index = index };
     }
     const void *data = PyUnicode_DATA(obj);
     int kind = PyUnicode_KIND(obj);
     Py_UCS4 ch = PyUnicode_READ(kind, data, index);
     PyObject *result = unicode_char(ch);
     index = (result == NULL) ? -1 : index + 1;
-    return (PyObjectIndexPair) { .object = result, .index = index };
+    return (_PyObjectIndexPair) { .object = result, .index = index };
 }
 
 void

Objects/unicodeobject.c

@@ -3718,7 +3718,7 @@ dummy_func(
         replaced op(_FOR_ITER_VIRTUAL, (iter, null_or_index -- iter, null_or_index, next)) {
             PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
             Py_ssize_t index = PyStackRef_UntagInt(null_or_index);
-            PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, index);
+            _PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, index);
             PyObject *next_o = next_index.object;
             index = next_index.index;
             if (next_o == NULL) {
@@ -3741,7 +3741,7 @@ dummy_func(
         op(_FOR_ITER_VIRTUAL_TIER_TWO, (iter, null_or_index -- iter, null_or_index, next)) {
             PyObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
             Py_ssize_t index = PyStackRef_UntagInt(null_or_index);
-            PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, index);
+            _PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, index);
             PyObject *next_o = next_index.object;
             index = next_index.index;
             if (next_o == NULL) {

Python/bytecodes.c

@@ -3704,7 +3704,7 @@ _PyStackRef _PyForIter_VirtualIteratorNext(PyThreadState* tstate, _PyInterpreter
     if (PyStackRef_IsTaggedInt(index)) {
         intptr_t i = PyStackRef_UntagInt(index);
         assert(i >= 0);
-        PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, i);
+        _PyObjectIndexPair next_index = Py_TYPE(iter_o)->tp_iteritem(iter_o, i);
         i = next_index.index;
         PyObject *next = next_index.object;
         if (next == NULL) {