Skip to content

Commit 46a0e5a

Browse files
Fidget-SpinnerFidget-Spinner
committed
rename
1 parent dd08a8e commit 46a0e5a

5 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎Include/internal/pycore_dict.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ typedef struct {
353353
Py_ssize_t di_pos;
354354
PyObject* di_result; /* reusable result tuple for iteritems */
355355
Py_ssize_t len;
356-
} _PyDictIterItemObject;
356+
} _PyDictIterObject;
357357

358358
// See `_Py_INCREF_TYPE()` in pycore_object.h
359359
#ifndef Py_GIL_DISABLED

‎Objects/dictobject.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5031,8 +5031,8 @@ static PyObject *
50315031
dictiter_new(PyDictObject *dict, PyTypeObject *itertype)
50325032
{
50335033
Py_ssize_t used;
5034-
_PyDictIterItemObject *di;
5035-
di = PyObject_GC_New(_PyDictIterItemObject, itertype);
5034+
_PyDictIterObject *di;
5035+
di = PyObject_GC_New(_PyDictIterObject, itertype);
50365036
if (di == NULL) {
50375037
return NULL;
50385038
}
@@ -5071,7 +5071,7 @@ dictiter_new(PyDictObject *dict, PyTypeObject *itertype)
50715071
static void
50725072
dictiter_dealloc(PyObject *self)
50735073
{
5074-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5074+
_PyDictIterObject *di = (_PyDictIterObject *)self;
50755075
/* bpo-31095: UnTrack is needed before calling any callbacks */
50765076
_PyObject_GC_UNTRACK(di);
50775077
Py_XDECREF(di->di_dict);
@@ -5082,7 +5082,7 @@ dictiter_dealloc(PyObject *self)
50825082
static int
50835083
dictiter_traverse(PyObject *self, visitproc visit, void *arg)
50845084
{
5085-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5085+
_PyDictIterObject *di = (_PyDictIterObject *)self;
50865086
Py_VISIT(di->di_dict);
50875087
Py_VISIT(di->di_result);
50885088
return 0;
@@ -5091,7 +5091,7 @@ dictiter_traverse(PyObject *self, visitproc visit, void *arg)
50915091
static PyObject *
50925092
dictiter_len(PyObject *self, PyObject *Py_UNUSED(ignored))
50935093
{
5094-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5094+
_PyDictIterObject *di = (_PyDictIterObject *)self;
50955095
Py_ssize_t len = 0;
50965096
if (di->di_dict != NULL && di->di_used == FT_ATOMIC_LOAD_SSIZE_RELAXED(di->di_dict->ma_used))
50975097
len = FT_ATOMIC_LOAD_SSIZE_RELAXED(di->len);
@@ -5125,7 +5125,7 @@ dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self,
51255125
static PyObject*
51265126
dictiter_iternextkey_lock_held(PyDictObject *d, PyObject *self)
51275127
{
5128-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5128+
_PyDictIterObject *di = (_PyDictIterObject *)self;
51295129
PyObject *key;
51305130
Py_ssize_t i;
51315131
PyDictKeysObject *k;
@@ -5194,7 +5194,7 @@ dictiter_iternextkey_lock_held(PyDictObject *d, PyObject *self)
51945194
static PyObject*
51955195
dictiter_iternextkey(PyObject *self)
51965196
{
5197-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5197+
_PyDictIterObject *di = (_PyDictIterObject *)self;
51985198
PyDictObject *d = di->di_dict;
51995199

52005200
if (d == NULL)
@@ -5215,7 +5215,7 @@ dictiter_iternextkey(PyObject *self)
52155215
PyTypeObject PyDictIterKey_Type = {
52165216
PyVarObject_HEAD_INIT(&PyType_Type, 0)
52175217
"dict_keyiterator", /* tp_name */
5218-
sizeof(_PyDictIterItemObject), /* tp_basicsize */
5218+
sizeof(_PyDictIterObject), /* tp_basicsize */
52195219
0, /* tp_itemsize */
52205220
/* methods */
52215221
dictiter_dealloc, /* tp_dealloc */
@@ -5250,7 +5250,7 @@ PyTypeObject PyDictIterKey_Type = {
52505250
static PyObject *
52515251
dictiter_iternextvalue_lock_held(PyDictObject *d, PyObject *self)
52525252
{
5253-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5253+
_PyDictIterObject *di = (_PyDictIterObject *)self;
52545254
PyObject *value;
52555255
Py_ssize_t i;
52565256

@@ -5317,7 +5317,7 @@ dictiter_iternextvalue_lock_held(PyDictObject *d, PyObject *self)
53175317
static PyObject *
53185318
dictiter_iternextvalue(PyObject *self)
53195319
{
5320-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5320+
_PyDictIterObject *di = (_PyDictIterObject *)self;
53215321
PyDictObject *d = di->di_dict;
53225322

53235323
if (d == NULL)
@@ -5338,7 +5338,7 @@ dictiter_iternextvalue(PyObject *self)
53385338
PyTypeObject PyDictIterValue_Type = {
53395339
PyVarObject_HEAD_INIT(&PyType_Type, 0)
53405340
"dict_valueiterator", /* tp_name */
5341-
sizeof(_PyDictIterItemObject), /* tp_basicsize */
5341+
sizeof(_PyDictIterObject), /* tp_basicsize */
53425342
0, /* tp_itemsize */
53435343
/* methods */
53445344
dictiter_dealloc, /* tp_dealloc */
@@ -5372,7 +5372,7 @@ static int
53725372
dictiter_iternextitem_lock_held(PyDictObject *d, PyObject *self,
53735373
PyObject **out_key, PyObject **out_value)
53745374
{
5375-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5375+
_PyDictIterObject *di = (_PyDictIterObject *)self;
53765376
PyObject *key, *value;
53775377
Py_ssize_t i;
53785378

@@ -5478,7 +5478,7 @@ dictiter_iternext_threadsafe(PyDictObject *d, PyObject *self,
54785478
PyObject **out_key, PyObject **out_value)
54795479
{
54805480
int res;
5481-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5481+
_PyDictIterObject *di = (_PyDictIterObject *)self;
54825482
Py_ssize_t i;
54835483
PyDictKeysObject *k;
54845484

@@ -5595,7 +5595,7 @@ acquire_iter_result(PyObject *result)
55955595
PyObject *
55965596
_PyDictIter_IterNextItem(PyObject *self)
55975597
{
5598-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5598+
_PyDictIterObject *di = (_PyDictIterObject *)self;
55995599
PyDictObject *d = di->di_dict;
56005600

56015601
if (d == NULL)
@@ -5638,7 +5638,7 @@ _PyDictIter_IterNextItem(PyObject *self)
56385638
PyTypeObject PyDictIterItem_Type = {
56395639
PyVarObject_HEAD_INIT(&PyType_Type, 0)
56405640
"dict_itemiterator", /* tp_name */
5641-
sizeof(_PyDictIterItemObject), /* tp_basicsize */
5641+
sizeof(_PyDictIterObject), /* tp_basicsize */
56425642
0, /* tp_itemsize */
56435643
/* methods */
56445644
dictiter_dealloc, /* tp_dealloc */
@@ -5674,7 +5674,7 @@ PyTypeObject PyDictIterItem_Type = {
56745674
static PyObject *
56755675
dictreviter_iter_lock_held(PyDictObject *d, PyObject *self)
56765676
{
5677-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5677+
_PyDictIterObject *di = (_PyDictIterObject *)self;
56785678

56795679
assert (PyDict_Check(d));
56805680
ASSERT_DICT_LOCKED(d);
@@ -5769,7 +5769,7 @@ dictreviter_iter_lock_held(PyDictObject *d, PyObject *self)
57695769
static PyObject *
57705770
dictreviter_iternext(PyObject *self)
57715771
{
5772-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5772+
_PyDictIterObject *di = (_PyDictIterObject *)self;
57735773
PyDictObject *d = di->di_dict;
57745774

57755775
if (d == NULL)
@@ -5786,7 +5786,7 @@ dictreviter_iternext(PyObject *self)
57865786
PyTypeObject PyDictRevIterKey_Type = {
57875787
PyVarObject_HEAD_INIT(&PyType_Type, 0)
57885788
"dict_reversekeyiterator",
5789-
sizeof(_PyDictIterItemObject),
5789+
sizeof(_PyDictIterObject),
57905790
.tp_dealloc = dictiter_dealloc,
57915791
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
57925792
.tp_traverse = dictiter_traverse,
@@ -5813,9 +5813,9 @@ dict___reversed___impl(PyDictObject *self)
58135813
static PyObject *
58145814
dictiter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
58155815
{
5816-
_PyDictIterItemObject *di = (_PyDictIterItemObject *)self;
5816+
_PyDictIterObject *di = (_PyDictIterObject *)self;
58175817
/* copy the iterator state */
5818-
_PyDictIterItemObject tmp = *di;
5818+
_PyDictIterObject tmp = *di;
58195819
Py_XINCREF(tmp.di_dict);
58205820
PyObject *list = PySequence_List((PyObject*)&tmp);
58215821
Py_XDECREF(tmp.di_dict);
@@ -5828,7 +5828,7 @@ dictiter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
58285828
PyTypeObject PyDictRevIterItem_Type = {
58295829
PyVarObject_HEAD_INIT(&PyType_Type, 0)
58305830
"dict_reverseitemiterator",
5831-
sizeof(_PyDictIterItemObject),
5831+
sizeof(_PyDictIterObject),
58325832
.tp_dealloc = dictiter_dealloc,
58335833
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
58345834
.tp_traverse = dictiter_traverse,
@@ -5840,7 +5840,7 @@ PyTypeObject PyDictRevIterItem_Type = {
58405840
PyTypeObject PyDictRevIterValue_Type = {
58415841
PyVarObject_HEAD_INIT(&PyType_Type, 0)
58425842
"dict_reversevalueiterator",
5843-
sizeof(_PyDictIterItemObject),
5843+
sizeof(_PyDictIterObject),
58445844
.tp_dealloc = dictiter_dealloc,
58455845
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
58465846
.tp_traverse = dictiter_traverse,

‎Python/bytecodes.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3495,16 +3495,16 @@ dummy_func(
34953495
assert(_PyObject_IsUniquelyReferenced((PyObject *)r));
34963496
#endif
34973497
STAT_INC(FOR_ITER, hit);
3498-
if (((_PyDictIterItemObject *)iter_o)->di_dict == NULL) {
3498+
if (((_PyDictIterObject *)iter_o)->di_dict == NULL) {
34993499
// Jump over END_FOR instruction.
35003500
JUMPBY(oparg + 1);
35013501
DISPATCH();
35023502
}
35033503
}
35043504

35053505
tier2 op(_GUARD_NOT_EXHAUSTED_DICT_ITEMS, (iter, null_or_index -- iter, null_or_index)) {
3506-
_PyDictIterItemObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
3507-
EXIT_IF(((_PyDictIterItemObject *)iter_o)->di_dict == NULL);
3506+
_PyDictIterObject *iter_o = PyStackRef_AsPyObjectBorrow(iter);
3507+
EXIT_IF(((_PyDictIterObject *)iter_o)->di_dict == NULL);
35083508
}
35093509

35103510
op(_ITER_NEXT_DICT_ITEMS, (iter, null_or_index -- iter, null_or_index, next)) {

‎Python/executor_cases.c.h‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/generated_cases.c.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)