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
@@ -542,12 +542,12 @@ STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_set,
|
||||
MP_QSTR_set,
|
||||
MP_TYPE_FLAG_NONE,
|
||||
MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
set_make_new,
|
||||
print, set_print,
|
||||
unary_op, set_unary_op,
|
||||
binary_op, set_binary_op,
|
||||
getiter, set_getiter,
|
||||
iter, set_getiter,
|
||||
locals_dict, &set_locals_dict
|
||||
);
|
||||
|
||||
@@ -568,12 +568,12 @@ STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
|
||||
MP_DEFINE_CONST_OBJ_TYPE(
|
||||
mp_type_frozenset,
|
||||
MP_QSTR_frozenset,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
|
||||
MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
|
||||
set_make_new,
|
||||
print, set_print,
|
||||
unary_op, set_unary_op,
|
||||
binary_op, set_binary_op,
|
||||
getiter, set_getiter,
|
||||
iter, set_getiter,
|
||||
locals_dict, &frozenset_locals_dict
|
||||
);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user