Merge pull request #4903 from jepler/split-type-objects

Split type objects

Author: tannewt

Makefile

@@ -54,6 +54,8 @@ TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
 	-o -path ports/stm/st_driver \
 	-o -path lib/tinyusb \
 	-o -path lib/lwip \
+	-o -path extmod/ulab/circuitpython \
+	-o -path extmod/ulab/micropython \
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
 

extmod/modbtree.c

@@ -295,13 +295,16 @@ STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
 STATIC const mp_obj_type_t btree_type = {
     { &mp_type_type },
     // Save on qstr's, reuse same as for module
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_btree,
     .print = btree_print,
-    .getiter = btree_getiter,
-    .iternext = btree_iternext,
-    .binary_op = btree_binary_op,
-    .subscr = btree_subscr,
     .locals_dict = (void *)&btree_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .getiter = btree_getiter,
+        .iternext = btree_iternext,
+        .binary_op = btree_binary_op,
+        .subscr = btree_subscr,
+        ),
 };
 #endif
 

extmod/modframebuf.c

@@ -602,10 +602,13 @@ STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
 
 STATIC const mp_obj_type_t mp_type_framebuf = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_FrameBuffer,
     .make_new = framebuf_make_new,
-    .buffer_p = { .get_buffer = framebuf_get_buffer },
     .locals_dict = (mp_obj_dict_t *)&framebuf_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .buffer_p = { .get_buffer = framebuf_get_buffer },
+        ),
 };
 #endif
 

extmod/moduasyncio.c

@@ -284,11 +284,14 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
 
 STATIC const mp_obj_type_t task_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_Task,
     .make_new = task_make_new,
     .attr = task_attr,
-    .getiter = task_getiter,
-    .iternext = task_iternext,
+    MP_TYPE_EXTENDED_FIELDS(
+        .getiter = task_getiter,
+        .iternext = task_iternext,
+        ),
 };
 
 /******************************************************************************/

extmod/moductypes.c

@@ -622,13 +622,16 @@ MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytes_at_obj, uctypes_struct_bytes_at);
 
 STATIC const mp_obj_type_t uctypes_struct_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_struct,
     .print = uctypes_struct_print,
     .make_new = uctypes_struct_make_new,
     .attr = uctypes_struct_attr,
-    .subscr = uctypes_struct_subscr,
-    .unary_op = uctypes_struct_unary_op,
-    .buffer_p = { .get_buffer = uctypes_get_buffer },
+    MP_TYPE_EXTENDED_FIELDS(
+        .subscr = uctypes_struct_subscr,
+        .unary_op = uctypes_struct_unary_op,
+        .buffer_p = { .get_buffer = uctypes_get_buffer },
+        ),
 };
 
 STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {

extmod/modutimeq.c

@@ -193,10 +193,13 @@ STATIC MP_DEFINE_CONST_DICT(utimeq_locals_dict, utimeq_locals_dict_table);
 
 STATIC const mp_obj_type_t utimeq_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_utimeq,
     .make_new = utimeq_make_new,
-    .unary_op = utimeq_unary_op,
     .locals_dict = (void *)&utimeq_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .unary_op = utimeq_unary_op,
+        ),
 };
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {

extmod/moduzlib.c

@@ -122,10 +122,13 @@ STATIC const mp_stream_p_t decompio_stream_p = {
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_obj_type_t decompio_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_DecompIO,
     .make_new = decompio_make_new,
-    .protocol = &decompio_stream_p,
     .locals_dict = (void *)&decompio_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .protocol = &decompio_stream_p,
+        ),
 };
 #endif
 

extmod/ulab

@@ -474,10 +474,13 @@ STATIC const mp_vfs_proto_t fat_vfs_proto = {
 
 const mp_obj_type_t mp_fat_vfs_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_VfsFat,
     .make_new = fat_vfs_make_new,
-    .protocol = &fat_vfs_proto,
     .locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .protocol = &fat_vfs_proto,
+        ),
 
 };
 

extmod/vfs_fat.c

@@ -244,13 +244,16 @@ STATIC const mp_stream_p_t vfs_fat_fileio_stream_p = {
 
 const mp_obj_type_t mp_type_vfs_fat_fileio = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_FileIO,
     .print = file_obj_print,
     .make_new = file_obj_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_fat_fileio_stream_p,
     .locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .getiter = mp_identity_getiter,
+        .iternext = mp_stream_unbuffered_iter,
+        .protocol = &vfs_fat_fileio_stream_p,
+        ),
 };
 #endif
 
@@ -264,13 +267,16 @@ STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
 
 const mp_obj_type_t mp_type_vfs_fat_textio = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_TextIOWrapper,
     .print = file_obj_print,
     .make_new = file_obj_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_fat_textio_stream_p,
     .locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .getiter = mp_identity_getiter,
+        .iternext = mp_stream_unbuffered_iter,
+        .protocol = &vfs_fat_textio_stream_p,
+        ),
 };
 
 // Factory function for I/O stream classes