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

Rename mp_type_subscr -> mp_type_get_subscr_slot

Browse Source
This commit is contained in:
Jeff Epler 2021-07-12 07:03:55 -05:00
parent 6b8190b408
commit 0efdf4a549
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/obj.c
View File

@ -575,7 +575,7 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
const mp_obj_type_t *type = mp_obj_get_type(base);
mp_subscr_fun_t subscr = mp_type_subscr(type);
mp_subscr_fun_t subscr = mp_type_get_subscr_slot(type);
if (subscr != NULL) {
mp_obj_t ret = subscr(base, index, value);
// May have called port specific C code. Make sure it didn't mess up the heap.
@ -706,7 +706,7 @@ mp_attr_fun_t mp_type_attr(const mp_obj_type_t *type) {
}
mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *type) {
mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *type) {
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
return NULL;
}

2
py/obj.h
View File

@ -665,7 +665,7 @@ struct _mp_obj_full_type_t {
extern mp_call_fun_t mp_type_get_call_slot(const mp_obj_type_t *);
extern mp_unary_op_fun_t mp_type_get_unary_op_slot(const mp_obj_type_t *);
extern mp_binary_op_fun_t mp_type_get_binary_op_slot(const mp_obj_type_t *);
extern mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *);
extern mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *);
extern mp_getiter_fun_t mp_type_getiter(const mp_obj_type_t *);
extern mp_fun_1_t mp_type_iternext(const mp_obj_type_t *);
extern mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *);

2
py/objarray.c
View File

@ -564,7 +564,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
size_t src_len;
void *src_items;
size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
if (mp_obj_is_obj(value) && mp_type_subscr(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type) == array_subscr) {
if (mp_obj_is_obj(value) && mp_type_get_subscr_slot(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type) == array_subscr) {
// value is array, bytearray or memoryview
mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {

2
py/objtuple.c
View File

@ -184,7 +184,7 @@ mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
// load
mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
// when called with a native type (eg namedtuple) using mp_obj_tuple_subscr, get the native self
if (mp_type_subscr(self->base.type) != &mp_obj_tuple_subscr) {
if (mp_type_get_subscr_slot(self->base.type) != &mp_obj_tuple_subscr) {
self = mp_obj_cast_to_native_base(self_in, &mp_type_tuple);
}