Skip to content

Commit d1b93ce

Browse files
dpgeorgedpgeorge
committed
py/objtype: Use size_t where appropriate, instead of mp_uint_t or uint.
1 parent bfb48c1 commit d1b93ce

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

‎py/objtype.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ STATIC mp_obj_t static_class_method_make_new(const mp_obj_type_t *self_in, size_
4848
/******************************************************************************/
4949
// instance object
5050

51-
STATIC mp_obj_t mp_obj_new_instance(const mp_obj_type_t *class, uint subobjs) {
51+
STATIC mp_obj_t mp_obj_new_instance(const mp_obj_type_t *class, size_t subobjs) {
5252
mp_obj_instance_t *o = m_new_obj_var(mp_obj_instance_t, mp_obj_t, subobjs);
5353
o->base.type = class;
5454
mp_map_init(&o->members, 0);
@@ -57,11 +57,11 @@ STATIC mp_obj_t mp_obj_new_instance(const mp_obj_type_t *class, uint subobjs) {
5757
}
5858

5959
STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_type_t **last_native_base) {
60-
mp_uint_t len = type->bases_tuple->len;
60+
size_t len = type->bases_tuple->len;
6161
mp_obj_t *items = type->bases_tuple->items;
6262

6363
int count = 0;
64-
for (uint i = 0; i < len; i++) {
64+
for (size_t i = 0; i < len; i++) {
6565
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
6666
const mp_obj_type_t *bt = (const mp_obj_type_t *)MP_OBJ_TO_PTR(items[i]);
6767
if (bt == &mp_type_object) {
@@ -96,7 +96,7 @@ STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
9696
struct class_lookup_data {
9797
mp_obj_instance_t *obj;
9898
qstr attr;
99-
mp_uint_t meth_offset;
99+
size_t meth_offset;
100100
mp_obj_t *dest;
101101
bool is_type;
102102
};
@@ -165,12 +165,12 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_
165165
return;
166166
}
167167

168-
mp_uint_t len = type->bases_tuple->len;
168+
size_t len = type->bases_tuple->len;
169169
mp_obj_t *items = type->bases_tuple->items;
170170
if (len == 0) {
171171
return;
172172
}
173-
for (uint i = 0; i < len - 1; i++) {
173+
for (size_t i = 0; i < len - 1; i++) {
174174
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
175175
mp_obj_type_t *bt = (mp_obj_type_t*)MP_OBJ_TO_PTR(items[i]);
176176
if (bt == &mp_type_object) {
@@ -239,7 +239,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
239239
assert(mp_obj_is_instance_type(self));
240240

241241
const mp_obj_type_t *native_base;
242-
uint num_native_bases = instance_count_native_bases(self, &native_base);
242+
size_t num_native_bases = instance_count_native_bases(self, &native_base);
243243
assert(num_native_bases < 2);
244244

245245
mp_obj_instance_t *o = MP_OBJ_TO_PTR(mp_obj_new_instance(self, num_native_bases));
@@ -477,7 +477,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
477477
// it will not result in modifications to the actual instance members.
478478
mp_map_t *map = &self->members;
479479
mp_obj_t attr_dict = mp_obj_new_dict(map->used);
480-
for (mp_uint_t i = 0; i < map->alloc; ++i) {
480+
for (size_t i = 0; i < map->alloc; ++i) {
481481
if (MP_MAP_SLOT_IS_FILLED(map, i)) {
482482
mp_obj_dict_store(attr_dict, map->table[i].key, map->table[i].value);
483483
}
@@ -688,7 +688,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
688688
.dest = member,
689689
.is_type = false,
690690
};
691-
uint meth_args;
691+
size_t meth_args;
692692
if (value == MP_OBJ_NULL) {
693693
// delete item
694694
lookup.attr = MP_QSTR___delitem__;
@@ -919,7 +919,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
919919
mp_uint_t len;
920920
mp_obj_t *items;
921921
mp_obj_tuple_get(bases_tuple, &len, &items);
922-
for (uint i = 0; i < len; i++) {
922+
for (size_t i = 0; i < len; i++) {
923923
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
924924
mp_obj_type_t *t = MP_OBJ_TO_PTR(items[i]);
925925
// TODO: Verify with CPy, tested on function type
@@ -957,7 +957,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
957957
o->locals_dict = MP_OBJ_TO_PTR(locals_dict);
958958

959959
const mp_obj_type_t *native_base;
960-
uint num_native_bases = instance_count_native_bases(o, &native_base);
960+
size_t num_native_bases = instance_count_native_bases(o, &native_base);
961961
if (num_native_bases > 1) {
962962
mp_raise_msg(&mp_type_TypeError, "multiple bases have instance lay-out conflict");
963963
}
@@ -1020,7 +1020,7 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
10201020
return;
10211021
}
10221022

1023-
mp_uint_t len = type->bases_tuple->len;
1023+
size_t len = type->bases_tuple->len;
10241024
mp_obj_t *items = type->bases_tuple->items;
10251025
struct class_lookup_data lookup = {
10261026
.obj = MP_OBJ_TO_PTR(self->obj),
@@ -1029,7 +1029,7 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
10291029
.dest = dest,
10301030
.is_type = false,
10311031
};
1032-
for (uint i = 0; i < len; i++) {
1032+
for (size_t i = 0; i < len; i++) {
10331033
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
10341034
mp_obj_class_lookup(&lookup, (mp_obj_type_t*)MP_OBJ_TO_PTR(items[i]));
10351035
if (dest[0] != MP_OBJ_NULL) {
@@ -1079,14 +1079,14 @@ bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
10791079
}
10801080

10811081
// get the base objects (they should be type objects)
1082-
mp_uint_t len = self->bases_tuple->len;
1082+
size_t len = self->bases_tuple->len;
10831083
mp_obj_t *items = self->bases_tuple->items;
10841084
if (len == 0) {
10851085
return false;
10861086
}
10871087

10881088
// iterate through the base objects
1089-
for (uint i = 0; i < len - 1; i++) {
1089+
for (size_t i = 0; i < len - 1; i++) {
10901090
if (mp_obj_is_subclass_fast(items[i], classinfo)) {
10911091
return true;
10921092
}
@@ -1109,7 +1109,7 @@ STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
11091109
mp_raise_msg(&mp_type_TypeError, "issubclass() arg 2 must be a class or a tuple of classes");
11101110
}
11111111

1112-
for (uint i = 0; i < len; i++) {
1112+
for (size_t i = 0; i < len; i++) {
11131113
// We explicitly check for 'object' here since no-one explicitly derives from it
11141114
if (items[i] == MP_OBJ_FROM_PTR(&mp_type_object) || mp_obj_is_subclass_fast(object, items[i])) {
11151115
return mp_const_true;

0 commit comments

Comments
 (0)