@@ -4373,7 +4373,7 @@ BIIterSeq_iter(BIIterSeqObject *self) {
43734373
43744374// Returns -1 on end of sequence; return -1 with exception set on
43754375static inline Py_ssize_t
4376- BIIterSeq_iternext_core (BIIterSeqObject * self )
4376+ BIIterSeq_iternext_index (BIIterSeqObject * self )
43774377{
43784378 Py_ssize_t i ;
43794379 if (self -> reversed ) {
@@ -4444,7 +4444,7 @@ BIIterSeq_iternext_core(BIIterSeqObject *self)
44444444static PyObject *
44454445BIIterSeq_iternext (BIIterSeqObject * self )
44464446{
4447- Py_ssize_t i = BIIterSeq_iternext_core (self );
4447+ Py_ssize_t i = BIIterSeq_iternext_index (self );
44484448 if (i == -1 ) {
44494449 return NULL ; // an error is set
44504450 }
@@ -4502,7 +4502,6 @@ BIIterSlice_dealloc(BIIterSliceObject *self) {
45024502 Py_DECREF ((PyObject * )self -> bi );
45034503 Py_DECREF (self -> selector );
45044504 PyObject_Del ((PyObject * )self );
4505- // Py_TYPE(self)->tp_free((PyObject *)self);
45064505}
45074506
45084507static PyObject *
@@ -4513,7 +4512,7 @@ BIIterSlice_iter(BIIterSliceObject *self) {
45134512
45144513// NOTE: this does not use `reversed`, as pos, step, and count are set in BIIterSelector_new
45154514static inline Py_ssize_t
4516- BIIterSlice_iternext_core (BIIterSliceObject * self )
4515+ BIIterSlice_iternext_index (BIIterSliceObject * self )
45174516{
45184517 if (self -> len == 0 || self -> count >= self -> len ) {
45194518 return -1 ;
@@ -4527,7 +4526,7 @@ BIIterSlice_iternext_core(BIIterSliceObject *self)
45274526
45284527static PyObject *
45294528BIIterSlice_iternext (BIIterSliceObject * self ) {
4530- Py_ssize_t i = BIIterSlice_iternext_core (self );
4529+ Py_ssize_t i = BIIterSlice_iternext_index (self );
45314530 if (i == -1 ) {
45324531 return NULL ;
45334532 }
@@ -4591,7 +4590,7 @@ BIIterBoolean_iter(BIIterBooleanObject *self)
45914590}
45924591
45934592static inline Py_ssize_t
4594- BIIterBoolean_iternext_core (BIIterBooleanObject * self )
4593+ BIIterBoolean_iternext_index (BIIterBooleanObject * self )
45954594{
45964595 npy_bool v = 0 ;
45974596 Py_ssize_t i = -1 ;
@@ -4627,7 +4626,7 @@ BIIterBoolean_iternext_core(BIIterBooleanObject *self)
46274626
46284627static PyObject *
46294628BIIterBoolean_iternext (BIIterBooleanObject * self ) {
4630- Py_ssize_t i = BIIterBoolean_iternext_core (self );
4629+ Py_ssize_t i = BIIterBoolean_iternext_index (self );
46314630 if (i == -1 ) {
46324631 return NULL ;
46334632 }
@@ -4775,13 +4774,13 @@ BIIterContiguous_iternext(BIIterContiguousObject *self)
47754774 self -> next_block = self -> next_column = -1 ; // clear next state
47764775 }
47774776 if (type == & BIIterSeqType ) {
4778- i = BIIterSeq_iternext_core ((BIIterSeqObject * )iter );
4777+ i = BIIterSeq_iternext_index ((BIIterSeqObject * )iter );
47794778 }
47804779 else if (type == & BIIterSliceType ) {
4781- i = BIIterSlice_iternext_core ((BIIterSliceObject * )iter );
4780+ i = BIIterSlice_iternext_index ((BIIterSliceObject * )iter );
47824781 }
47834782 else if (type == & BIIterBoolType ) {
4784- i = BIIterBoolean_iternext_core ((BIIterBooleanObject * )iter );
4783+ i = BIIterBoolean_iternext_index ((BIIterBooleanObject * )iter );
47854784 }
47864785 if (i == -1 ) { // end of iteration or error
47874786 if (PyErr_Occurred ()) {
@@ -4795,7 +4794,7 @@ BIIterContiguous_iternext(BIIterContiguousObject *self)
47954794 self -> last_column ,
47964795 self -> reduce ));
47974796 }
4798- // i is gauranteed to be within the range of self->bit_count at this point; the only source of arbitrary indices is in BIIterSeq_iternext_core , and that function validates the range
4797+ // i is gauranteed to be within the range of self->bit_count at this point; the only source of arbitrary indices is in BIIterSeq_iternext_index , and that function validates the range
47994798 BlockIndexRecord * biri = & self -> bi -> bir [i ];
48004799 block = biri -> block ;
48014800 column = biri -> column ;
@@ -5063,8 +5062,6 @@ BlockIndex_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) {
50635062// Returns 0 on success, -1 on error.
50645063int
50655064BlockIndex_init (PyObject * self , PyObject * args , PyObject * kwargs ) {
5066- // PyTypeObject* cls = Py_TYPE(self); // borrowed ref
5067- // const char *name = cls->tp_name;
50685065 BlockIndexObject * bi = (BlockIndexObject * )self ;
50695066
50705067 Py_ssize_t block_count = 0 ;
0 commit comments