@@ -983,12 +983,12 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
983983 // TODO might need to make a copy of locals_dict; at least that's how CPython does it
984984
985985 // Basic validation of base classes
986- size_t len ;
987- mp_obj_t * items ;
988- mp_obj_tuple_get (bases_tuple , & len , & items );
989- for (size_t i = 0 ; i < len ; i ++ ) {
990- assert (MP_OBJ_IS_TYPE (items [i ], & mp_type_type ));
991- mp_obj_type_t * t = MP_OBJ_TO_PTR (items [i ]);
986+ size_t bases_len ;
987+ mp_obj_t * bases_items ;
988+ mp_obj_tuple_get (bases_tuple , & bases_len , & bases_items );
989+ for (size_t i = 0 ; i < bases_len ; i ++ ) {
990+ assert (MP_OBJ_IS_TYPE (bases_items [i ], & mp_type_type ));
991+ mp_obj_type_t * t = MP_OBJ_TO_PTR (bases_items [i ]);
992992 // TODO: Verify with CPy, tested on function type
993993 if (t -> make_new == NULL ) {
994994 if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE ) {
@@ -1014,17 +1014,17 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
10141014 //o->iternext = ; not implemented
10151015 o -> buffer_p .get_buffer = instance_get_buffer ;
10161016
1017- if (len > 0 ) {
1017+ if (bases_len > 0 ) {
10181018 // Inherit protocol from a base class. This allows to define an
10191019 // abstract base class which would translate C-level protocol to
10201020 // Python method calls, and any subclass inheriting from it will
10211021 // support this feature.
1022- o -> protocol = ((mp_obj_type_t * )MP_OBJ_TO_PTR (items [0 ]))-> protocol ;
1022+ o -> protocol = ((mp_obj_type_t * )MP_OBJ_TO_PTR (bases_items [0 ]))-> protocol ;
10231023
1024- if (len >= 2 ) {
1024+ if (bases_len >= 2 ) {
10251025 o -> parent = MP_OBJ_TO_PTR (bases_tuple );
10261026 } else {
1027- o -> parent = MP_OBJ_TO_PTR (items [0 ]);
1027+ o -> parent = MP_OBJ_TO_PTR (bases_items [0 ]);
10281028 }
10291029 }
10301030
0 commit comments