Skip to content

Commit 4bc3192

Browse files
committed
renamed ATTType and components
1 parent 9e703b5 commit 4bc3192

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

src/_arraykit.c

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,23 +3603,23 @@ array_to_tuple_array(PyObject *Py_UNUSED(m), PyObject *a)
36033603
}
36043604

36053605
//------------------------------------------------------------------------------
3606-
// Array2DTuple Iterator
3606+
// ArrayToTupleIterator
36073607

3608-
static PyTypeObject A2DTupleType;
3608+
static PyTypeObject ATTType;
36093609

3610-
typedef struct A2DTupleObject {
3610+
typedef struct ATTObject {
36113611
PyObject_HEAD
36123612
PyArrayObject* array;
36133613
npy_intp num_rows;
36143614
npy_intp num_cols;
36153615
Py_ssize_t pos; // current index state, mutated in-place
3616-
} A2DTupleObject;
3616+
} ATTObject;
36173617

36183618
static PyObject *
3619-
A2DTuple_new(PyArrayObject* array,
3619+
ATT_new(PyArrayObject* array,
36203620
npy_intp num_rows,
36213621
npy_intp num_cols) {
3622-
A2DTupleObject* a2dt = PyObject_New(A2DTupleObject, &A2DTupleType);
3622+
ATTObject* a2dt = PyObject_New(ATTObject, &ATTType);
36233623
if (!a2dt) {
36243624
return NULL;
36253625
}
@@ -3632,19 +3632,19 @@ A2DTuple_new(PyArrayObject* array,
36323632
}
36333633

36343634
static void
3635-
A2DTuple_dealloc(A2DTupleObject *self) {
3635+
ATT_dealloc(ATTObject *self) {
36363636
Py_DECREF((PyObject*)self->array);
36373637
PyObject_Del((PyObject*)self);
36383638
}
36393639

36403640
static PyObject*
3641-
A2DTuple_iter(A2DTupleObject *self) {
3641+
ATT_iter(ATTObject *self) {
36423642
Py_INCREF(self);
36433643
return (PyObject*)self;
36443644
}
36453645

36463646
static PyObject *
3647-
A2DTuple_iternext(A2DTupleObject *self) {
3647+
ATT_iternext(ATTObject *self) {
36483648
Py_ssize_t i = self->pos;
36493649
if (i < self->num_rows) {
36503650
npy_intp num_cols = self->num_cols;
@@ -3686,30 +3686,30 @@ A2DTuple_iternext(A2DTupleObject *self) {
36863686
}
36873687

36883688
// static PyObject *
3689-
// A2DTuple_reversed(A2DTupleObject *self) {
3690-
// return A2DTuple_new(self->bi, !self->reversed);
3689+
// ATT_reversed(ATTObject *self) {
3690+
// return ATT_new(self->bi, !self->reversed);
36913691
// }
36923692

36933693
static PyObject *
3694-
A2DTuple_length_hint(A2DTupleObject *self) {
3694+
ATT_length_hint(ATTObject *self) {
36953695
Py_ssize_t len = Py_MAX(0, self->num_rows - self->pos);
36963696
return PyLong_FromSsize_t(len);
36973697
}
36983698

3699-
static PyMethodDef A2DTuple_methods[] = {
3700-
{"__length_hint__", (PyCFunction)A2DTuple_length_hint, METH_NOARGS, NULL},
3701-
// {"__reversed__", (PyCFunction)A2DTuple_reversed, METH_NOARGS, NULL},
3699+
static PyMethodDef ATT_methods[] = {
3700+
{"__length_hint__", (PyCFunction)ATT_length_hint, METH_NOARGS, NULL},
3701+
// {"__reversed__", (PyCFunction)ATT_reversed, METH_NOARGS, NULL},
37023702
{NULL},
37033703
};
37043704

3705-
static PyTypeObject A2DTupleType = {
3705+
static PyTypeObject ATTType = {
37063706
PyVarObject_HEAD_INIT(NULL, 0)
3707-
.tp_basicsize = sizeof(A2DTupleObject),
3708-
.tp_dealloc = (destructor) A2DTuple_dealloc,
3709-
.tp_iter = (getiterfunc) A2DTuple_iter,
3710-
.tp_iternext = (iternextfunc) A2DTuple_iternext,
3711-
.tp_methods = A2DTuple_methods,
3712-
.tp_name = "arraykit.A2DTupleIterator",
3707+
.tp_basicsize = sizeof(ATTObject),
3708+
.tp_dealloc = (destructor) ATT_dealloc,
3709+
.tp_iter = (getiterfunc) ATT_iter,
3710+
.tp_iternext = (iternextfunc) ATT_iternext,
3711+
.tp_methods = ATT_methods,
3712+
.tp_name = "arraykit.ATTIterator",
37133713
};
37143714

37153715
// Given a 2D array, return an iterator of row tuples.
@@ -3729,10 +3729,9 @@ array_to_tuple_iter(PyObject *Py_UNUSED(m), PyObject *a)
37293729
if (ndim == 2) {
37303730
num_cols = PyArray_DIM(array, 1);
37313731
}
3732-
return A2DTuple_new(array, num_rows, num_cols);
3732+
return ATT_new(array, num_rows, num_cols);
37333733
}
37343734

3735-
37363735
//------------------------------------------------------------------------------
37373736
// type resolution
37383737

0 commit comments

Comments
 (0)