Skip to content
This repository was archived by the owner on Jun 27, 2025. It is now read-only.

Commit 5c17aad

Browse files
flexatoneflexatone
committed
reordered macro args
1 parent 4b57b7b commit 5c17aad

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎arraymap.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ get(FAMObject *self, PyObject *key, PyObject *missing) {
17821782

17831783

17841784
// Give an array of the same kind as KAT, lookup and load all keys_pos. Depends on self, key_size, key_array, table_pos, i, k, b
1785-
# define GET_ALL_SCALARS(npy_type_src, npy_type_dst, lookup_func, hash_func, to_obj_func, post_deref, kat) \
1785+
# define GET_ALL_SCALARS(npy_type_src, npy_type_dst, kat, lookup_func, hash_func, to_obj_func, post_deref) \
17861786
{ \
17871787
npy_type_dst v; \
17881788
for (; i < key_size; i++) { \
@@ -1886,37 +1886,37 @@ fam_get_all(FAMObject *self, PyObject *key) {
18861886
Py_ssize_t table_pos;
18871887
switch (key_array_t) {
18881888
case NPY_INT64:
1889-
GET_ALL_SCALARS(npy_int64, npy_int64, lookup_hash_int, int_to_hash, PyLong_FromLongLong, , KAT_INT64);
1889+
GET_ALL_SCALARS(npy_int64, npy_int64, KAT_INT64, lookup_hash_int, int_to_hash, PyLong_FromLongLong,);
18901890
break;
18911891
case NPY_INT32:
1892-
GET_ALL_SCALARS(npy_int32, npy_int64, lookup_hash_int, int_to_hash, PyLong_FromLongLong, , KAT_INT32);
1892+
GET_ALL_SCALARS(npy_int32, npy_int64, KAT_INT32, lookup_hash_int, int_to_hash, PyLong_FromLongLong,);
18931893
break;
18941894
case NPY_INT16:
1895-
GET_ALL_SCALARS(npy_int16, npy_int64, lookup_hash_int, int_to_hash, PyLong_FromLongLong, , KAT_INT16);
1895+
GET_ALL_SCALARS(npy_int16, npy_int64, KAT_INT16, lookup_hash_int, int_to_hash, PyLong_FromLongLong,);
18961896
break;
18971897
case NPY_INT8:
1898-
GET_ALL_SCALARS(npy_int8, npy_int64, lookup_hash_int, int_to_hash, PyLong_FromLongLong, , KAT_INT8);
1898+
GET_ALL_SCALARS(npy_int8, npy_int64, KAT_INT8, lookup_hash_int, int_to_hash, PyLong_FromLongLong,);
18991899
break;
19001900
case NPY_UINT64:
1901-
GET_ALL_SCALARS(npy_uint64, npy_uint64, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong, , KAT_UINT64);
1901+
GET_ALL_SCALARS(npy_uint64, npy_uint64, KAT_UINT64, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong,);
19021902
break;
19031903
case NPY_UINT32:
1904-
GET_ALL_SCALARS(npy_uint32, npy_uint64, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong, , KAT_UINT32);
1904+
GET_ALL_SCALARS(npy_uint32, npy_uint64, KAT_UINT32, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong,);
19051905
break;
19061906
case NPY_UINT16:
1907-
GET_ALL_SCALARS(npy_uint16, npy_uint64, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong, , KAT_UINT16);
1907+
GET_ALL_SCALARS(npy_uint16, npy_uint64, KAT_UINT16, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong,);
19081908
break;
19091909
case NPY_UINT8:
1910-
GET_ALL_SCALARS(npy_uint8, npy_uint64, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong, , KAT_UINT8);
1910+
GET_ALL_SCALARS(npy_uint8, npy_uint64, KAT_UINT8, lookup_hash_uint, uint_to_hash, PyLong_FromUnsignedLongLong,);
19111911
break;
19121912
case NPY_FLOAT64:
1913-
GET_ALL_SCALARS(npy_double, npy_double, lookup_hash_double, double_to_hash, PyFloat_FromDouble, , KAT_FLOAT64);
1913+
GET_ALL_SCALARS(npy_double, npy_double, KAT_FLOAT64, lookup_hash_double, double_to_hash, PyFloat_FromDouble,);
19141914
break;
19151915
case NPY_FLOAT32:
1916-
GET_ALL_SCALARS(npy_float, npy_double, lookup_hash_double, double_to_hash, PyFloat_FromDouble, , KAT_FLOAT32);
1916+
GET_ALL_SCALARS(npy_float, npy_double, KAT_FLOAT32, lookup_hash_double, double_to_hash, PyFloat_FromDouble,);
19171917
break;
19181918
case NPY_FLOAT16:
1919-
GET_ALL_SCALARS(npy_half, npy_double, lookup_hash_double, double_to_hash, PyFloat_FromDouble, npy_half_to_double, KAT_FLOAT16);
1919+
GET_ALL_SCALARS(npy_half, npy_double, KAT_FLOAT16, lookup_hash_double, double_to_hash, PyFloat_FromDouble, npy_half_to_double);
19201920
break;
19211921
case NPY_UNICODE:
19221922
GET_ALL_FLEXIBLE(Py_UCS4, ucs4_get_end_p, lookup_hash_unicode, unicode_to_hash, PyUnicode_FromUCS4AndData);
@@ -1961,7 +1961,7 @@ fam_get_all(FAMObject *self, PyObject *key) {
19611961

19621962

19631963
// Give an array of the same kind as KAT, lookup and load any keys_pos. Depends on self, key_size, key_array, table_pos, i, k, values
1964-
# define GET_ANY_SCALARS(npy_type_src, npy_type_dst, lookup_func, hash_func, post_deref, kat) \
1964+
# define GET_ANY_SCALARS(npy_type_src, npy_type_dst, kat, lookup_func, hash_func, post_deref) \
19651965
{ \
19661966
npy_type_dst v; \
19671967
for (; i < key_size; i++) { \
@@ -2060,37 +2060,37 @@ fam_get_any(FAMObject *self, PyObject *key) {
20602060
Py_ssize_t table_pos;
20612061
switch (key_array_t) {
20622062
case NPY_INT64:
2063-
GET_ANY_SCALARS(npy_int64, npy_int64, lookup_hash_int, int_to_hash, , KAT_INT64);
2063+
GET_ANY_SCALARS(npy_int64, npy_int64, KAT_INT64, lookup_hash_int, int_to_hash,);
20642064
break;
20652065
case NPY_INT32:
2066-
GET_ANY_SCALARS(npy_int32, npy_int64, lookup_hash_int, int_to_hash, , KAT_INT32);
2066+
GET_ANY_SCALARS(npy_int32, npy_int64, KAT_INT32, lookup_hash_int, int_to_hash,);
20672067
break;
20682068
case NPY_INT16:
2069-
GET_ANY_SCALARS(npy_int16, npy_int64, lookup_hash_int, int_to_hash, , KAT_INT16);
2069+
GET_ANY_SCALARS(npy_int16, npy_int64, KAT_INT16, lookup_hash_int, int_to_hash,);
20702070
break;
20712071
case NPY_INT8:
2072-
GET_ANY_SCALARS(npy_int8, npy_int64, lookup_hash_int, int_to_hash, , KAT_INT8);
2072+
GET_ANY_SCALARS(npy_int8, npy_int64, KAT_INT8, lookup_hash_int, int_to_hash,);
20732073
break;
20742074
case NPY_UINT64:
2075-
GET_ANY_SCALARS(npy_uint64, npy_uint64, lookup_hash_uint, uint_to_hash, , KAT_UINT64);
2075+
GET_ANY_SCALARS(npy_uint64, npy_uint64, KAT_UINT64, lookup_hash_uint, uint_to_hash,);
20762076
break;
20772077
case NPY_UINT32:
2078-
GET_ANY_SCALARS(npy_uint32, npy_uint64, lookup_hash_uint, uint_to_hash, , KAT_UINT32);
2078+
GET_ANY_SCALARS(npy_uint32, npy_uint64, KAT_UINT32, lookup_hash_uint, uint_to_hash,);
20792079
break;
20802080
case NPY_UINT16:
2081-
GET_ANY_SCALARS(npy_uint16, npy_uint64, lookup_hash_uint, uint_to_hash, , KAT_UINT16);
2081+
GET_ANY_SCALARS(npy_uint16, npy_uint64, KAT_UINT16, lookup_hash_uint, uint_to_hash,);
20822082
break;
20832083
case NPY_UINT8:
2084-
GET_ANY_SCALARS(npy_uint8, npy_uint64, lookup_hash_uint, uint_to_hash, , KAT_UINT8);
2084+
GET_ANY_SCALARS(npy_uint8, npy_uint64, KAT_UINT8, lookup_hash_uint, uint_to_hash,);
20852085
break;
20862086
case NPY_FLOAT64:
2087-
GET_ANY_SCALARS(npy_double, npy_double, lookup_hash_double, double_to_hash, , KAT_FLOAT64);
2087+
GET_ANY_SCALARS(npy_double, npy_double, KAT_FLOAT64, lookup_hash_double, double_to_hash,);
20882088
break;
20892089
case NPY_FLOAT32:
2090-
GET_ANY_SCALARS(npy_float, npy_double, lookup_hash_double, double_to_hash, , KAT_FLOAT32);
2090+
GET_ANY_SCALARS(npy_float, npy_double, KAT_FLOAT32, lookup_hash_double, double_to_hash,);
20912091
break;
20922092
case NPY_FLOAT16:
2093-
GET_ANY_SCALARS(npy_half, npy_double, lookup_hash_double, double_to_hash, npy_half_to_double, KAT_FLOAT16);
2093+
GET_ANY_SCALARS(npy_half, npy_double, KAT_FLOAT16, lookup_hash_double, double_to_hash, npy_half_to_double);
20942094
break;
20952095
case NPY_UNICODE:
20962096
GET_ANY_FLEXIBLE(Py_UCS4, ucs4_get_end_p, lookup_hash_unicode, unicode_to_hash);

0 commit comments

Comments
 (0)