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
@@ -83,7 +83,7 @@ mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *item
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_attrtuple,
|
||||
MP_QSTR_tuple,
|
||||
MP_TYPE_FLAG_NONE,
|
||||
MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
MP_TYPE_NULL_MAKE_NEW,
|
||||
// reuse tuple to save on a qstr
|
||||
print, mp_obj_attrtuple_print,
|
||||
@@ -91,7 +91,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
|
||||
binary_op, mp_obj_tuple_binary_op,
|
||||
attr, mp_obj_attrtuple_attr,
|
||||
subscr, mp_obj_tuple_subscr,
|
||||
getiter, mp_obj_tuple_getiter
|
||||
iter, mp_obj_tuple_getiter
|
||||
);
|
||||
|
||||
#endif // MICROPY_PY_ATTRTUPLE
|
||||
|
||||
Reference in New Issue
Block a user