3636
3737typedef struct _mp_obj_namedtuple_type_t {
3838 mp_obj_type_t base ;
39- mp_uint_t n_fields ;
39+ size_t n_fields ;
4040 qstr fields [];
4141} mp_obj_namedtuple_type_t ;
4242
4343typedef struct _mp_obj_namedtuple_t {
4444 mp_obj_tuple_t tuple ;
4545} mp_obj_namedtuple_t ;
4646
47- STATIC mp_uint_t namedtuple_find_field (const mp_obj_namedtuple_type_t * type , qstr name ) {
48- for (mp_uint_t i = 0 ; i < type -> n_fields ; i ++ ) {
47+ STATIC size_t namedtuple_find_field (const mp_obj_namedtuple_type_t * type , qstr name ) {
48+ for (size_t i = 0 ; i < type -> n_fields ; i ++ ) {
4949 if (type -> fields [i ] == name ) {
5050 return i ;
5151 }
5252 }
53- return -1 ;
53+ return ( size_t ) -1 ;
5454}
5555
5656STATIC void namedtuple_print (const mp_print_t * print , mp_obj_t o_in , mp_print_kind_t kind ) {
@@ -65,8 +65,8 @@ STATIC void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
6565 if (dest [0 ] == MP_OBJ_NULL ) {
6666 // load attribute
6767 mp_obj_namedtuple_t * self = MP_OBJ_TO_PTR (self_in );
68- int id = namedtuple_find_field ((mp_obj_namedtuple_type_t * )self -> tuple .base .type , attr );
69- if (id == -1 ) {
68+ size_t id = namedtuple_find_field ((mp_obj_namedtuple_type_t * )self -> tuple .base .type , attr );
69+ if (id == ( size_t ) -1 ) {
7070 return ;
7171 }
7272 dest [0 ] = self -> tuple .items [id ];
@@ -102,14 +102,14 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
102102 arg_objects = alloca (alloc_size );
103103 memset (arg_objects , 0 , alloc_size );
104104
105- for (mp_uint_t i = 0 ; i < n_args ; i ++ ) {
105+ for (size_t i = 0 ; i < n_args ; i ++ ) {
106106 arg_objects [i ] = args [i ];
107107 }
108108
109- for (mp_uint_t i = n_args ; i < n_args + 2 * n_kw ; i += 2 ) {
109+ for (size_t i = n_args ; i < n_args + 2 * n_kw ; i += 2 ) {
110110 qstr kw = mp_obj_str_get_qstr (args [i ]);
111- int id = namedtuple_find_field (type , kw );
112- if (id == -1 ) {
111+ size_t id = namedtuple_find_field (type , kw );
112+ if (id == ( size_t ) -1 ) {
113113 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE ) {
114114 mp_arg_error_terse_mismatch ();
115115 } else {
@@ -136,7 +136,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
136136
137137STATIC const mp_rom_obj_tuple_t namedtuple_base_tuple = {{& mp_type_tuple }, 1 , {MP_ROM_PTR (& mp_type_tuple )}};
138138
139- STATIC mp_obj_t mp_obj_new_namedtuple_type (qstr name , mp_uint_t n_fields , mp_obj_t * fields ) {
139+ STATIC mp_obj_t mp_obj_new_namedtuple_type (qstr name , size_t n_fields , mp_obj_t * fields ) {
140140 mp_obj_namedtuple_type_t * o = m_new_obj_var (mp_obj_namedtuple_type_t , qstr , n_fields );
141141 memset (& o -> base , 0 , sizeof (o -> base ));
142142 o -> base .base .type = & mp_type_type ;
@@ -150,7 +150,7 @@ STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, mp_uint_t n_fields, mp_obj
150150 o -> base .getiter = mp_obj_tuple_getiter ;
151151 o -> base .bases_tuple = (mp_obj_tuple_t * )(mp_rom_obj_tuple_t * )& namedtuple_base_tuple ;
152152 o -> n_fields = n_fields ;
153- for (mp_uint_t i = 0 ; i < n_fields ; i ++ ) {
153+ for (size_t i = 0 ; i < n_fields ; i ++ ) {
154154 o -> fields [i ] = mp_obj_str_get_qstr (fields [i ]);
155155 }
156156 return MP_OBJ_FROM_PTR (o );
0 commit comments