summaryrefslogtreecommitdiffstatshomepage
path: root/py/objstringio.c
diff options
context:
space:
mode:
authorJim Mussared <jim.mussared@gmail.com>2021-07-14 14:38:38 +1000
committerDamien George <damien@micropython.org>2022-09-19 19:06:01 +1000
commit662b9761b37b054f08fe2f7c00d0fce3a418d0b0 (patch)
tree3ab168faeb26685d511bf47caa21d2eabdd86c69 /py/objstringio.c
parentcdb880789f61ee037cc7905ad75a7a9201d12ba5 (diff)
downloadmicropython-662b9761b37b054f08fe2f7c00d0fce3a418d0b0.tar.gz
micropython-662b9761b37b054f08fe2f7c00d0fce3a418d0b0.zip
all: Make all mp_obj_type_t defs use MP_DEFINE_CONST_OBJ_TYPE.
In preparation for upcoming rework of mp_obj_type_t layout. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py/objstringio.c')
-rw-r--r--py/objstringio.c42
1 files changed, 22 insertions, 20 deletions
diff --git a/py/objstringio.c b/py/objstringio.c
index 8b6c7531d7..d781ccc789 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -244,16 +244,17 @@ STATIC const mp_stream_p_t stringio_stream_p = {
.is_text = true,
};
-const mp_obj_type_t mp_type_stringio = {
- { &mp_type_type },
- .name = MP_QSTR_StringIO,
- .print = stringio_print,
- .make_new = stringio_make_new,
- .getiter = mp_identity_getiter,
- .iternext = mp_stream_unbuffered_iter,
- .protocol = &stringio_stream_p,
- .locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_stringio,
+ MP_QSTR_StringIO,
+ MP_TYPE_FLAG_NONE,
+ stringio_make_new,
+ print, stringio_print,
+ getiter, mp_identity_getiter,
+ iternext, mp_stream_unbuffered_iter,
+ protocol, &stringio_stream_p,
+ locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+ );
#if MICROPY_PY_IO_BYTESIO
STATIC const mp_stream_p_t bytesio_stream_p = {
@@ -262,16 +263,17 @@ STATIC const mp_stream_p_t bytesio_stream_p = {
.ioctl = stringio_ioctl,
};
-const mp_obj_type_t mp_type_bytesio = {
- { &mp_type_type },
- .name = MP_QSTR_BytesIO,
- .print = stringio_print,
- .make_new = stringio_make_new,
- .getiter = mp_identity_getiter,
- .iternext = mp_stream_unbuffered_iter,
- .protocol = &bytesio_stream_p,
- .locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+ mp_type_bytesio,
+ MP_QSTR_BytesIO,
+ MP_TYPE_FLAG_NONE,
+ stringio_make_new,
+ print, stringio_print,
+ getiter, mp_identity_getiter,
+ iternext, mp_stream_unbuffered_iter,
+ protocol, &bytesio_stream_p,
+ locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+ );
#endif
#endif