@@ -4373,7 +4373,7 @@ BIIterSeq_iter(BIIterSeqObject *self) {
4373
4373
4374
4374
// Returns -1 on end of sequence; return -1 with exception set on
4375
4375
static inline Py_ssize_t
4376
- BIIterSeq_iternext_core (BIIterSeqObject * self )
4376
+ BIIterSeq_iternext_index (BIIterSeqObject * self )
4377
4377
{
4378
4378
Py_ssize_t i ;
4379
4379
if (self -> reversed ) {
@@ -4444,7 +4444,7 @@ BIIterSeq_iternext_core(BIIterSeqObject *self)
4444
4444
static PyObject *
4445
4445
BIIterSeq_iternext (BIIterSeqObject * self )
4446
4446
{
4447
- Py_ssize_t i = BIIterSeq_iternext_core (self );
4447
+ Py_ssize_t i = BIIterSeq_iternext_index (self );
4448
4448
if (i == -1 ) {
4449
4449
return NULL ; // an error is set
4450
4450
}
@@ -4502,7 +4502,6 @@ BIIterSlice_dealloc(BIIterSliceObject *self) {
4502
4502
Py_DECREF ((PyObject * )self -> bi );
4503
4503
Py_DECREF (self -> selector );
4504
4504
PyObject_Del ((PyObject * )self );
4505
- // Py_TYPE(self)->tp_free((PyObject *)self);
4506
4505
}
4507
4506
4508
4507
static PyObject *
@@ -4513,7 +4512,7 @@ BIIterSlice_iter(BIIterSliceObject *self) {
4513
4512
4514
4513
// NOTE: this does not use `reversed`, as pos, step, and count are set in BIIterSelector_new
4515
4514
static inline Py_ssize_t
4516
- BIIterSlice_iternext_core (BIIterSliceObject * self )
4515
+ BIIterSlice_iternext_index (BIIterSliceObject * self )
4517
4516
{
4518
4517
if (self -> len == 0 || self -> count >= self -> len ) {
4519
4518
return -1 ;
@@ -4527,7 +4526,7 @@ BIIterSlice_iternext_core(BIIterSliceObject *self)
4527
4526
4528
4527
static PyObject *
4529
4528
BIIterSlice_iternext (BIIterSliceObject * self ) {
4530
- Py_ssize_t i = BIIterSlice_iternext_core (self );
4529
+ Py_ssize_t i = BIIterSlice_iternext_index (self );
4531
4530
if (i == -1 ) {
4532
4531
return NULL ;
4533
4532
}
@@ -4591,7 +4590,7 @@ BIIterBoolean_iter(BIIterBooleanObject *self)
4591
4590
}
4592
4591
4593
4592
static inline Py_ssize_t
4594
- BIIterBoolean_iternext_core (BIIterBooleanObject * self )
4593
+ BIIterBoolean_iternext_index (BIIterBooleanObject * self )
4595
4594
{
4596
4595
npy_bool v = 0 ;
4597
4596
Py_ssize_t i = -1 ;
@@ -4627,7 +4626,7 @@ BIIterBoolean_iternext_core(BIIterBooleanObject *self)
4627
4626
4628
4627
static PyObject *
4629
4628
BIIterBoolean_iternext (BIIterBooleanObject * self ) {
4630
- Py_ssize_t i = BIIterBoolean_iternext_core (self );
4629
+ Py_ssize_t i = BIIterBoolean_iternext_index (self );
4631
4630
if (i == -1 ) {
4632
4631
return NULL ;
4633
4632
}
@@ -4775,13 +4774,13 @@ BIIterContiguous_iternext(BIIterContiguousObject *self)
4775
4774
self -> next_block = self -> next_column = -1 ; // clear next state
4776
4775
}
4777
4776
if (type == & BIIterSeqType ) {
4778
- i = BIIterSeq_iternext_core ((BIIterSeqObject * )iter );
4777
+ i = BIIterSeq_iternext_index ((BIIterSeqObject * )iter );
4779
4778
}
4780
4779
else if (type == & BIIterSliceType ) {
4781
- i = BIIterSlice_iternext_core ((BIIterSliceObject * )iter );
4780
+ i = BIIterSlice_iternext_index ((BIIterSliceObject * )iter );
4782
4781
}
4783
4782
else if (type == & BIIterBoolType ) {
4784
- i = BIIterBoolean_iternext_core ((BIIterBooleanObject * )iter );
4783
+ i = BIIterBoolean_iternext_index ((BIIterBooleanObject * )iter );
4785
4784
}
4786
4785
if (i == -1 ) { // end of iteration or error
4787
4786
if (PyErr_Occurred ()) {
@@ -4795,7 +4794,7 @@ BIIterContiguous_iternext(BIIterContiguousObject *self)
4795
4794
self -> last_column ,
4796
4795
self -> reduce ));
4797
4796
}
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
4799
4798
BlockIndexRecord * biri = & self -> bi -> bir [i ];
4800
4799
block = biri -> block ;
4801
4800
column = biri -> column ;
@@ -5063,8 +5062,6 @@ BlockIndex_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) {
5063
5062
// Returns 0 on success, -1 on error.
5064
5063
int
5065
5064
BlockIndex_init (PyObject * self , PyObject * args , PyObject * kwargs ) {
5066
- // PyTypeObject* cls = Py_TYPE(self); // borrowed ref
5067
- // const char *name = cls->tp_name;
5068
5065
BlockIndexObject * bi = (BlockIndexObject * )self ;
5069
5066
5070
5067
Py_ssize_t block_count = 0 ;
0 commit comments