djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/objtype: mp_obj_new_type: Name base types related vars more clearly. 

As vars contains array of base types and its length, name them as such,
avoid generic "items" and "len" names.
This commit is contained in:
Paul Sokolovsky 2017-11-11 00:11:24 +02:00
parent 579b86451d
commit cada971113
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
py/objtype.c
View File

@ -983,12 +983,12 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
// TODO might need to make a copy of locals_dict; at least that's how CPython does it // TODO might need to make a copy of locals_dict; at least that's how CPython does it
// Basic validation of base classes // Basic validation of base classes
size_t len; size_t bases_len;
mp_obj_t *items; mp_obj_t *bases_items;
mp_obj_tuple_get(bases_tuple, &len, &items); mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < bases_len; i++) {
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type)); assert(MP_OBJ_IS_TYPE(bases_items[i], &mp_type_type));
mp_obj_type_t *t = MP_OBJ_TO_PTR(items[i]); mp_obj_type_t *t = MP_OBJ_TO_PTR(bases_items[i]);
// TODO: Verify with CPy, tested on function type // TODO: Verify with CPy, tested on function type
if (t->make_new == NULL) { if (t->make_new == NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { 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)
//o->iternext = ; not implemented //o->iternext = ; not implemented
o->buffer_p.get_buffer = instance_get_buffer; o->buffer_p.get_buffer = instance_get_buffer;
if (len > 0) { if (bases_len > 0) {
// Inherit protocol from a base class. This allows to define an // Inherit protocol from a base class. This allows to define an
// abstract base class which would translate C-level protocol to // abstract base class which would translate C-level protocol to
// Python method calls, and any subclass inheriting from it will // Python method calls, and any subclass inheriting from it will
// support this feature. // support this feature.
o->protocol = ((mp_obj_type_t*)MP_OBJ_TO_PTR(items[0]))->protocol; o->protocol = ((mp_obj_type_t*)MP_OBJ_TO_PTR(bases_items[0]))->protocol;
if (len >= 2) { if (bases_len >= 2) {
o->parent = MP_OBJ_TO_PTR(bases_tuple); o->parent = MP_OBJ_TO_PTR(bases_tuple);
} else { } else {
o->parent = MP_OBJ_TO_PTR(items[0]); o->parent = MP_OBJ_TO_PTR(bases_items[0]);
} }
} }