py/obj: Merge getiter and iternext mp_obj_type_t slots.
The goal here is to remove a slot (making way to turn make_new into a slot) as well as reduce code size by the ~40 references to mp_identity_getiter and mp_stream_unbuffered_iter. This introduces two new type flags: - MP_TYPE_FLAG_ITER_IS_ITERNEXT: This means that the "iter" slot in the type is "iternext", and should use the identity getiter. - MP_TYPE_FLAG_ITER_IS_CUSTOM: This means that the "iter" slot is a pointer to a mp_getiter_iternext_custom_t instance, which then defines both getiter and iternext. And a third flag that is the OR of both, MP_TYPE_FLAG_ITER_IS_STREAM: This means that the type should use the identity getiter, and mp_stream_unbuffered_iter as iternext. Finally, MP_TYPE_FLAG_ITER_IS_GETITER is defined as a no-op flag to give the default case where "iter" is "getiter". Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
committed by
Damien George
parent
3c6127dfcf
commit
6da41b5900
@@ -574,10 +574,10 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_array,
|
||||
MP_QSTR_array,
|
||||
MP_TYPE_FLAG_NONE,
|
||||
MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
array_make_new,
|
||||
print, array_print,
|
||||
getiter, array_iterator_new,
|
||||
iter, array_iterator_new,
|
||||
unary_op, array_unary_op,
|
||||
binary_op, array_binary_op,
|
||||
subscr, array_subscr,
|
||||
@@ -590,10 +590,10 @@ MP_DEFINE_CONST_OBJ_TYPE(
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_bytearray,
|
||||
MP_QSTR_bytearray,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
bytearray_make_new,
|
||||
print, array_print,
|
||||
getiter, array_iterator_new,
|
||||
iter, array_iterator_new,
|
||||
unary_op, array_unary_op,
|
||||
binary_op, array_binary_op,
|
||||
subscr, array_subscr,
|
||||
@@ -618,9 +618,9 @@ MP_DEFINE_CONST_OBJ_TYPE(
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_memoryview,
|
||||
MP_QSTR_memoryview,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
memoryview_make_new,
|
||||
getiter, array_iterator_new,
|
||||
iter, array_iterator_new,
|
||||
unary_op, array_unary_op,
|
||||
binary_op, array_binary_op,
|
||||
MEMORYVIEW_TYPE_LOCALS_DICT
|
||||
@@ -676,10 +676,9 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
|
||||
STATIC MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_array_it,
|
||||
MP_QSTR_iterator,
|
||||
MP_TYPE_FLAG_NONE,
|
||||
MP_TYPE_FLAG_ITER_IS_ITERNEXT,
|
||||
MP_TYPE_NULL_MAKE_NEW,
|
||||
getiter, mp_identity_getiter,
|
||||
iternext, array_it_iternext
|
||||
iter, array_it_iternext
|
||||
);
|
||||
|
||||
STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf) {
|
||||
|
||||
Reference in New Issue
Block a user