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>

1 files changed, 2 insertions, 6 deletions

diff --git a/py/objstringio.c b/py/objstringio.c
index 77547f88c..4e19b8399 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -247,11 +247,9 @@ STATIC const mp_stream_p_t stringio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stringio,
     MP_QSTR_StringIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     stringio_make_new,
     print, stringio_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &stringio_stream_p,
     locals_dict, &stringio_locals_dict
     );
@@ -266,11 +264,9 @@ STATIC const mp_stream_p_t bytesio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytesio,
     MP_QSTR_BytesIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     stringio_make_new,
     print, stringio_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &bytesio_stream_p,
     locals_dict, &stringio_locals_dict
     );