Rename EXTENDED_FIELDS -> MP_TYPE_EXTENDED_FIELDS

This commit is contained in:
Jeff Epler 2021-07-12 06:57:59 -05:00
parent 7302bc09a7
commit 52540a9830
84 changed files with 109 additions and 109 deletions

View File

@ -299,7 +299,7 @@ STATIC const mp_obj_type_t btree_type = {
.name = MP_QSTR_btree,
.print = btree_print,
.locals_dict = (void *)&btree_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = btree_getiter,
.iternext = btree_iternext,
.binary_op = btree_binary_op,

View File

@ -606,7 +606,7 @@ STATIC const mp_obj_type_t mp_type_framebuf = {
.name = MP_QSTR_FrameBuffer,
.make_new = framebuf_make_new,
.locals_dict = (mp_obj_dict_t *)&framebuf_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.buffer_p = { .get_buffer = framebuf_get_buffer },
),
};

View File

@ -288,7 +288,7 @@ STATIC const mp_obj_type_t task_type = {
.name = MP_QSTR_Task,
.make_new = task_make_new,
.attr = task_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = task_getiter,
.iternext = task_iternext,
),

View File

@ -627,7 +627,7 @@ STATIC const mp_obj_type_t uctypes_struct_type = {
.print = uctypes_struct_print,
.make_new = uctypes_struct_make_new,
.attr = uctypes_struct_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = uctypes_struct_subscr,
.unary_op = uctypes_struct_unary_op,
.buffer_p = { .get_buffer = uctypes_get_buffer },

View File

@ -197,7 +197,7 @@ STATIC const mp_obj_type_t utimeq_type = {
.name = MP_QSTR_utimeq,
.make_new = utimeq_make_new,
.locals_dict = (void *)&utimeq_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = utimeq_unary_op,
),
};

View File

@ -126,7 +126,7 @@ STATIC const mp_obj_type_t decompio_type = {
.name = MP_QSTR_DecompIO,
.make_new = decompio_make_new,
.locals_dict = (void *)&decompio_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &decompio_stream_p,
),
};

View File

@ -478,7 +478,7 @@ const mp_obj_type_t mp_fat_vfs_type = {
.name = MP_QSTR_VfsFat,
.make_new = fat_vfs_make_new,
.locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &fat_vfs_proto,
),

View File

@ -249,7 +249,7 @@ const mp_obj_type_t mp_type_vfs_fat_fileio = {
.print = file_obj_print,
.make_new = file_obj_make_new,
.locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &vfs_fat_fileio_stream_p,
@ -272,7 +272,7 @@ const mp_obj_type_t mp_type_vfs_fat_textio = {
.print = file_obj_print,
.make_new = file_obj_make_new,
.locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &vfs_fat_textio_stream_p,

View File

@ -492,7 +492,7 @@ const mp_obj_type_t MP_TYPE_VFS_LFSx = {
#endif
.make_new = MP_VFS_LFSx(make_new),
.locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict),
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &MP_VFS_LFSx(proto),
),
};

View File

@ -230,7 +230,7 @@ const mp_obj_type_t MP_TYPE_VFS_LFSx_(_fileio) = {
.name = MP_QSTR_FileIO,
.print = MP_VFS_LFSx(file_print),
.locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &MP_VFS_LFSx(fileio_stream_p),
@ -252,7 +252,7 @@ const mp_obj_type_t MP_TYPE_VFS_LFSx_(_textio) = {
.name = MP_QSTR_TextIOWrapper,
.print = MP_VFS_LFSx(file_print),
.locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &MP_VFS_LFSx(textio_stream_p),

View File

@ -356,7 +356,7 @@ const mp_obj_type_t mp_type_vfs_posix = {
.name = MP_QSTR_VfsPosix,
.locals_dict = (mp_obj_dict_t *)&vfs_posix_locals_dict,
.make_new = vfs_posix_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &vfs_posix_proto,
),
};

View File

@ -218,7 +218,7 @@ const mp_obj_type_t mp_type_vfs_posix_fileio = {
.print = vfs_posix_file_print,
.make_new = vfs_posix_file_make_new,
.locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &vfs_posix_fileio_stream_p,
@ -241,7 +241,7 @@ const mp_obj_type_t mp_type_vfs_posix_textio = {
.print = vfs_posix_file_print,
.make_new = vfs_posix_file_make_new,
.locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &vfs_posix_textio_stream_p,

View File

@ -134,7 +134,7 @@ STATIC const mp_obj_type_t stdio_obj_type = {
// TODO .make_new?
.print = stdio_obj_print,
.locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &stdio_obj_stream_p,
@ -172,7 +172,7 @@ STATIC const mp_obj_type_t stdio_buffer_obj_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.print = stdio_obj_print,
.locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &stdio_buffer_obj_stream_p,

View File

@ -110,7 +110,7 @@ STATIC const mp_obj_type_t mp_type_stest_fileio = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &fileio_stream_p,
),
};
@ -141,7 +141,7 @@ STATIC const mp_obj_type_t mp_type_stest_textio2 = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict2,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &textio_stream_p2,
),
};

View File

@ -488,7 +488,7 @@ STATIC const mp_obj_type_t ffifunc_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_ffifunc,
.print = ffifunc_print,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = ffifunc_call,
),
};

View File

@ -316,7 +316,7 @@ STATIC const mp_obj_type_t mp_type_poll = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_poll,
.locals_dict = (void *)&poll_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = poll_iternext,
),

View File

@ -106,7 +106,7 @@ STATIC const mp_obj_type_t mp_type_iobase = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_IOBase,
.make_new = iobase_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &iobase_p,
),
};
@ -206,7 +206,7 @@ STATIC const mp_obj_type_t mp_type_bufwriter = {
.name = MP_QSTR_BufferedWriter,
.make_new = bufwriter_make_new,
.locals_dict = (mp_obj_dict_t *)&bufwriter_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &bufwriter_stream_p,
),
};

View File

@ -632,7 +632,7 @@ struct _mp_obj_type_t {
// - 2 or more parents: pointer to a tuple object containing the parent types
const void *parent;
#define EXTENDED_FIELDS(...) .ext = {{ __VA_ARGS__ }}
#define MP_TYPE_EXTENDED_FIELDS(...) .ext = {{ __VA_ARGS__ }}
struct _mp_obj_type_ext ext[];
};

View File

@ -749,7 +749,7 @@ const mp_obj_type_t mp_type_array = {
.print = array_print,
.make_new = array_make_new,
.locals_dict = (mp_obj_dict_t *)&array_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = array_iterator_new,
.unary_op = array_unary_op,
.binary_op = array_binary_op,
@ -767,7 +767,7 @@ const mp_obj_type_t mp_type_bytearray = {
.print = array_print,
.make_new = bytearray_make_new,
.locals_dict = (mp_obj_dict_t *)&bytearray_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = array_iterator_new,
.unary_op = array_unary_op,
.binary_op = array_binary_op,
@ -798,7 +798,7 @@ const mp_obj_type_t mp_type_memoryview = {
#if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
.attr = memoryview_attr,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = array_iterator_new,
.unary_op = array_unary_op,
.binary_op = array_binary_op,
@ -862,7 +862,7 @@ STATIC const mp_obj_type_t mp_type_array_it = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_iterator,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = array_it_iternext,
),

View File

@ -87,7 +87,7 @@ const mp_obj_type_t mp_type_attrtuple = {
.name = MP_QSTR_tuple, // reuse tuple to save on a qstr
.print = mp_obj_attrtuple_print,
.attr = mp_obj_attrtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,

View File

@ -90,7 +90,7 @@ const mp_obj_type_t mp_type_bool = {
.name = MP_QSTR_bool,
.print = bool_print,
.make_new = bool_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = bool_unary_op,
.binary_op = bool_binary_op,
),

View File

@ -102,7 +102,7 @@ STATIC const mp_obj_type_t mp_type_bound_meth = {
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
.print = bound_meth_print,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = bound_meth_call,
),
#if MICROPY_PY_FUNCTION_ATTRS

View File

@ -85,7 +85,7 @@ const mp_obj_type_t mp_type_closure = {
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
.print = closure_print,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = closure_call,
)
};

View File

@ -162,7 +162,7 @@ const mp_obj_type_t mp_type_complex = {
.print = complex_print,
.make_new = complex_make_new,
.attr = complex_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = complex_unary_op,
.binary_op = complex_binary_op,
),

View File

@ -164,7 +164,7 @@ const mp_obj_type_t mp_type_deque = {
.name = MP_QSTR_deque,
.make_new = deque_make_new,
.locals_dict = (mp_obj_dict_t *)&deque_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = deque_unary_op,
),
};

View File

@ -461,7 +461,7 @@ STATIC const mp_obj_type_t mp_type_dict_view_it = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_iterator,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = dict_view_it_iternext,
),
@ -516,7 +516,7 @@ STATIC const mp_obj_type_t mp_type_dict_view = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_dict_view,
.print = dict_view_print,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.binary_op = dict_view_binary_op,
.getiter = dict_view_getiter,
),
@ -595,7 +595,7 @@ const mp_obj_type_t mp_type_dict = {
.print = dict_print,
.make_new = mp_obj_dict_make_new,
.locals_dict = (mp_obj_dict_t *)&dict_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = dict_unary_op,
.binary_op = dict_binary_op,
.subscr = dict_subscr,
@ -612,7 +612,7 @@ const mp_obj_type_t mp_type_ordereddict = {
.make_new = mp_obj_dict_make_new,
.parent = &mp_type_dict,
.locals_dict = (mp_obj_dict_t *)&dict_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = dict_unary_op,
.binary_op = dict_binary_op,
.subscr = dict_subscr,

View File

@ -74,7 +74,7 @@ const mp_obj_type_t mp_type_enumerate = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_enumerate,
.make_new = enumerate_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.iternext = enumerate_iternext,
.getiter = mp_identity_getiter,
)

View File

@ -632,7 +632,7 @@ STATIC const mp_obj_namedtuple_type_t code_type_obj = {
.make_new = namedtuple_make_new,
.parent = &mp_type_tuple,
.attr = namedtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,
@ -691,7 +691,7 @@ STATIC const mp_obj_namedtuple_type_t frame_type_obj = {
.make_new = namedtuple_make_new,
.parent = &mp_type_tuple,
.attr = namedtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,
@ -737,7 +737,7 @@ STATIC const mp_obj_namedtuple_type_t traceback_type_obj = {
.make_new = namedtuple_make_new,
.parent = &mp_type_tuple,
.attr = namedtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,

View File

@ -66,7 +66,7 @@ const mp_obj_type_t mp_type_filter = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_filter,
.make_new = filter_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = filter_iternext,
),

View File

@ -185,7 +185,7 @@ const mp_obj_type_t mp_type_float = {
.name = MP_QSTR_float,
.print = float_print,
.make_new = float_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = float_unary_op,
.binary_op = float_binary_op,
),

View File

@ -62,7 +62,7 @@ const mp_obj_type_t mp_type_fun_builtin_0 = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_builtin_0_call,
.unary_op = mp_generic_unary_op,
),
@ -79,7 +79,7 @@ const mp_obj_type_t mp_type_fun_builtin_1 = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_builtin_1_call,
.unary_op = mp_generic_unary_op,
),
@ -96,7 +96,7 @@ const mp_obj_type_t mp_type_fun_builtin_2 = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_builtin_2_call,
.unary_op = mp_generic_unary_op,
),
@ -113,7 +113,7 @@ const mp_obj_type_t mp_type_fun_builtin_3 = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_builtin_3_call,
.unary_op = mp_generic_unary_op,
),
@ -146,7 +146,7 @@ const mp_obj_type_t mp_type_fun_builtin_var = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_builtin_var_call,
.unary_op = mp_generic_unary_op,
),
@ -380,7 +380,7 @@ const mp_obj_type_t mp_type_fun_bc = {
#if MICROPY_PY_FUNCTION_ATTRS
.attr = mp_obj_fun_bc_attr,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_bc_call,
.unary_op = mp_generic_unary_op,
),
@ -428,7 +428,7 @@ const mp_obj_type_t mp_type_fun_native = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_native_call,
.unary_op = mp_generic_unary_op,
),
@ -538,7 +538,7 @@ STATIC const mp_obj_type_t mp_type_fun_asm = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = fun_asm_call,
.unary_op = mp_generic_unary_op,
),

View File

@ -162,7 +162,7 @@ const mp_obj_type_t mp_type_gen_wrap = {
#if MICROPY_PY_FUNCTION_ATTRS
.attr = gen_attr,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = gen_wrap_call,
.unary_op = mp_generic_unary_op,
),
@ -418,7 +418,7 @@ const mp_obj_type_t mp_type_gen_instance = {
.name = MP_QSTR_generator,
.print = gen_instance_print,
.locals_dict = (mp_obj_dict_t *)&gen_instance_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_generic_unary_op,
.getiter = mp_identity_getiter,
.iternext = gen_instance_iternext,

View File

@ -61,7 +61,7 @@ STATIC const mp_obj_type_t mp_type_it = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_iterator,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = it_iternext,
),

View File

@ -575,7 +575,7 @@ const mp_obj_type_t mp_type_int = {
.print = mp_obj_int_print,
.make_new = mp_obj_int_make_new,
.locals_dict = (mp_obj_dict_t *)&int_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_int_unary_op,
.binary_op = mp_obj_int_binary_op,
),

View File

@ -466,7 +466,7 @@ const mp_obj_type_t mp_type_list = {
.print = list_print,
.make_new = list_make_new,
.locals_dict = (mp_obj_dict_t *)&list_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = list_unary_op,
.binary_op = list_binary_op,
.subscr = list_subscr,

View File

@ -69,7 +69,7 @@ const mp_obj_type_t mp_type_map = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_map,
.make_new = map_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = map_iternext,
),

View File

@ -48,7 +48,7 @@ const mp_obj_type_t mp_type_NoneType = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_NoneType,
.print = none_print,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_generic_unary_op,
),
};

View File

@ -49,7 +49,7 @@ const mp_obj_type_t mp_type_polymorph_iter = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_iterator,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = polymorph_it_iternext,
),

View File

@ -56,7 +56,7 @@ STATIC const mp_obj_type_t mp_type_range_it = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_iterator,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = range_it_iternext,
),
@ -224,7 +224,7 @@ const mp_obj_type_t mp_type_range = {
#if MICROPY_PY_BUILTINS_RANGE_ATTRS
.attr = range_attr,
#endif
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = range_unary_op,
#if MICROPY_PY_BUILTINS_RANGE_BINOP
.binary_op = range_binary_op,

View File

@ -74,7 +74,7 @@ const mp_obj_type_t mp_type_reversed = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_reversed,
.make_new = reversed_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = reversed_iternext,
),

View File

@ -550,7 +550,7 @@ const mp_obj_type_t mp_type_set = {
.print = set_print,
.make_new = set_make_new,
.locals_dict = (mp_obj_dict_t *)&set_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = set_unary_op,
.binary_op = set_binary_op,
.getiter = set_getiter,
@ -578,7 +578,7 @@ const mp_obj_type_t mp_type_frozenset = {
.print = set_print,
.make_new = set_make_new,
.locals_dict = (mp_obj_dict_t *)&frozenset_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = set_unary_op,
.binary_op = set_binary_op,
.getiter = set_getiter,

View File

@ -48,7 +48,7 @@ const mp_obj_type_t mp_type_singleton = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_,
.print = singleton_print,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_generic_unary_op,
),
};

View File

@ -2040,7 +2040,7 @@ const mp_obj_type_t mp_type_bytes = {
.print = str_print,
.make_new = bytes_make_new,
.locals_dict = (mp_obj_dict_t *)&str8_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.binary_op = mp_obj_str_binary_op,
.subscr = bytes_subscr,
.getiter = mp_obj_new_bytes_iterator,

View File

@ -251,7 +251,7 @@ const mp_obj_type_t mp_type_stringio = {
.print = stringio_print,
.make_new = stringio_make_new,
.locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &stringio_stream_p,
@ -273,7 +273,7 @@ const mp_obj_type_t mp_type_bytesio = {
.print = stringio_print,
.make_new = stringio_make_new,
.locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &bytesio_stream_p,

View File

@ -296,7 +296,7 @@ const mp_obj_type_t mp_type_str = {
.print = uni_print,
.make_new = mp_obj_str_make_new,
.locals_dict = (mp_obj_dict_t *)&struni_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = uni_unary_op,
.binary_op = mp_obj_str_binary_op,
.subscr = str_subscr,

View File

@ -234,7 +234,7 @@ const mp_obj_type_t mp_type_tuple = {
.print = mp_obj_tuple_print,
.make_new = mp_obj_tuple_make_new,
.locals_dict = (mp_obj_dict_t *)&tuple_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,

View File

@ -1151,7 +1151,7 @@ const mp_obj_type_t mp_type_type = {
.print = type_print,
.make_new = type_make_new,
.attr = type_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = type_call,
.unary_op = mp_generic_unary_op,
),

View File

@ -72,7 +72,7 @@ const mp_obj_type_t mp_type_zip = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_zip,
.make_new = zip_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = zip_iternext,
),

View File

@ -1005,7 +1005,7 @@ STATIC const mp_obj_type_t mp_type_checked_fun = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_function,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.call = checked_fun_call,
)
};

View File

@ -220,7 +220,7 @@ const mp_obj_type_t bleio_address_type = {
.make_new = bleio_address_make_new,
.print = bleio_address_print,
.locals_dict = (mp_obj_dict_t *)&bleio_address_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = bleio_address_unary_op,
.binary_op = bleio_address_binary_op,
),

View File

@ -242,7 +242,7 @@ const mp_obj_type_t bleio_characteristic_buffer_type = {
.name = MP_QSTR_CharacteristicBuffer,
.make_new = bleio_characteristic_buffer_make_new,
.locals_dict = (mp_obj_dict_t *)&bleio_characteristic_buffer_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &characteristic_buffer_stream_p,

View File

@ -269,7 +269,7 @@ const mp_obj_type_t bleio_connection_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_Connection,
.locals_dict = (mp_obj_dict_t *)&bleio_connection_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_generic_unary_op,
),
};

View File

@ -64,7 +64,7 @@ const mp_obj_type_t bleio_scanresults_type = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_ScanResults,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = scanresults_iternext,
),

View File

@ -305,7 +305,7 @@ const mp_obj_type_t bleio_uuid_type = {
.print = bleio_uuid_print,
.make_new = bleio_uuid_make_new,
.locals_dict = (mp_obj_dict_t *)&bleio_uuid_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = bleio_uuid_unary_op,
.binary_op = bleio_uuid_binary_op,
),

View File

@ -386,7 +386,7 @@ const mp_obj_type_t pixelbuf_pixelbuf_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.locals_dict = (mp_obj_t)&pixelbuf_pixelbuf_locals_dict,
.make_new = pixelbuf_pixelbuf_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = pixelbuf_pixelbuf_subscr,
.unary_op = pixelbuf_pixelbuf_unary_op,
.getiter = mp_obj_new_generic_iterator,

View File

@ -177,7 +177,7 @@ const mp_obj_type_t alarm_sleep_memory_type = {
.name = MP_QSTR_SleepMemory,
.flags = MP_TYPE_FLAG_EXTENDED,
.locals_dict = (mp_obj_t)&alarm_sleep_memory_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = alarm_sleep_memory_subscr,
.unary_op = alarm_sleep_memory_unary_op,
),

View File

@ -187,7 +187,7 @@ const mp_obj_type_t audioio_rawsample_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = audioio_rawsample_make_new,
.locals_dict = (mp_obj_dict_t *)&audioio_rawsample_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &audioio_rawsample_proto,
),
};

View File

@ -216,7 +216,7 @@ const mp_obj_type_t audioio_wavefile_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = audioio_wavefile_make_new,
.locals_dict = (mp_obj_dict_t *)&audioio_wavefile_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &audioio_wavefile_proto,
),
};

View File

@ -300,7 +300,7 @@ const mp_obj_type_t audiomixer_mixer_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = audiomixer_mixer_make_new,
.locals_dict = (mp_obj_dict_t *)&audiomixer_mixer_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &audiomixer_mixer_proto,
),
};

View File

@ -264,7 +264,7 @@ const mp_obj_type_t audiomp3_mp3file_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = audiomp3_mp3file_make_new,
.locals_dict = (mp_obj_dict_t *)&audiomp3_mp3file_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &audiomp3_mp3file_proto,
),
};

View File

@ -426,7 +426,7 @@ const mp_obj_type_t busio_uart_type = {
.name = MP_QSTR_UART,
.make_new = busio_uart_make_new,
.locals_dict = (mp_obj_dict_t *)&busio_uart_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,

View File

@ -174,7 +174,7 @@ const mp_obj_type_t canio_listener_type = {
.name = MP_QSTR_Listener,
.flags = MP_TYPE_FLAG_EXTENDED,
.locals_dict = (mp_obj_dict_t *)&canio_listener_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = canio_iternext,
),

View File

@ -372,7 +372,7 @@ const mp_obj_type_t displayio_bitmap_type = {
.name = MP_QSTR_Bitmap,
.make_new = displayio_bitmap_make_new,
.locals_dict = (mp_obj_dict_t *)&displayio_bitmap_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = bitmap_subscr,
.buffer_p = { .get_buffer = bitmap_get_buffer },
),

View File

@ -361,7 +361,7 @@ const mp_obj_type_t displayio_group_type = {
.name = MP_QSTR_Group,
.make_new = displayio_group_make_new,
.locals_dict = (mp_obj_dict_t *)&displayio_group_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = group_subscr,
.unary_op = group_unary_op,
.getiter = mp_obj_new_generic_iterator,

View File

@ -208,7 +208,7 @@ const mp_obj_type_t displayio_palette_type = {
.name = MP_QSTR_Palette,
.make_new = displayio_palette_make_new,
.locals_dict = (mp_obj_dict_t *)&displayio_palette_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = palette_subscr,
.unary_op = group_unary_op,
.getiter = mp_obj_new_generic_iterator,

View File

@ -398,7 +398,7 @@ const mp_obj_type_t displayio_tilegrid_type = {
.name = MP_QSTR_TileGrid,
.make_new = displayio_tilegrid_make_new,
.locals_dict = (mp_obj_dict_t *)&displayio_tilegrid_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = tilegrid_subscr,
),
};

View File

@ -63,7 +63,7 @@ const mp_obj_namedtuple_type_t fontio_glyph_type = {
.make_new = namedtuple_make_new,
.parent = &mp_type_tuple,
.attr = namedtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,

View File

@ -195,7 +195,7 @@ const mp_obj_type_t ipaddress_ipv4address_type = {
.make_new = ipaddress_ipv4address_make_new,
.locals_dict = (mp_obj_dict_t *)&ipaddress_ipv4address_locals_dict,
.print = ipaddress_ipv4address_print,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = ipaddress_ipv4address_unary_op,
.binary_op = ipaddress_ipv4address_binary_op,
)

View File

@ -176,7 +176,7 @@ const mp_obj_type_t keypad_event_type = {
.make_new = keypad_event_make_new,
.print = keypad_event_print,
.locals_dict = (mp_obj_dict_t *)&keypad_event_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = keypad_event_unary_op,
.binary_op = keypad_event_binary_op,
),

View File

@ -148,7 +148,7 @@ const mp_obj_type_t keypad_eventqueue_type = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_Keys,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = keypad_eventqueue_unary_op,
),
.locals_dict = (mp_obj_t)&keypad_eventqueue_locals_dict,

View File

@ -171,7 +171,7 @@ const mp_obj_type_t nvm_bytearray_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_ByteArray,
.locals_dict = (mp_obj_t)&nvm_bytearray_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = nvm_bytearray_subscr,
.unary_op = nvm_bytearray_unary_op,
),

View File

@ -240,7 +240,7 @@ const mp_obj_type_t ps2io_ps2_type = {
.name = MP_QSTR_Ps2,
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = ps2io_ps2_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = ps2_unary_op,
),
.locals_dict = (mp_obj_dict_t *)&ps2io_ps2_locals_dict,

View File

@ -313,7 +313,7 @@ const mp_obj_type_t pulseio_pulsein_type = {
.name = MP_QSTR_PulseIn,
.make_new = pulseio_pulsein_make_new,
.locals_dict = (mp_obj_dict_t *)&pulseio_pulsein_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.subscr = pulsein_subscr,
.unary_op = pulsein_unary_op,
),

View File

@ -443,7 +443,7 @@ const mp_obj_type_t rgbmatrix_RGBMatrix_type = {
.name = MP_QSTR_RGBMatrix,
.locals_dict = (mp_obj_dict_t *)&rgbmatrix_rgbmatrix_locals_dict,
.make_new = rgbmatrix_rgbmatrix_make_new,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.buffer_p = { .get_buffer = rgbmatrix_rgbmatrix_get_buffer, },
.protocol = &rgbmatrix_rgbmatrix_proto,
),

View File

@ -88,7 +88,7 @@ const mp_obj_type_t sharpdisplay_framebuffer_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = sharpdisplay_framebuffer_make_new,
.locals_dict = (mp_obj_dict_t *)&sharpdisplay_framebuffer_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.buffer_p = { .get_buffer = sharpdisplay_framebuffer_get_buffer, },
.protocol = &sharpdisplay_framebuffer_proto,
),

View File

@ -412,7 +412,7 @@ const mp_obj_type_t socketpool_socket_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_Socket,
.locals_dict = (mp_obj_dict_t *)&socketpool_socket_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = socketpool_socket_unary_op,
)
};

View File

@ -323,7 +323,7 @@ const mp_obj_type_t ssl_sslsocket_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_SSLSocket,
.locals_dict = (mp_obj_dict_t *)&ssl_sslsocket_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = ssl_sslsocket_unary_op,
)
};

View File

@ -166,7 +166,7 @@ const mp_obj_type_t synthio_miditrack_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.make_new = synthio_miditrack_make_new,
.locals_dict = (mp_obj_dict_t *)&synthio_miditrack_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.protocol = &synthio_miditrack_proto,
),
};

View File

@ -122,7 +122,7 @@ const mp_obj_type_t terminalio_terminal_type = {
.name = MP_QSTR_Terminal,
.make_new = terminalio_terminal_make_new,
.locals_dict = (mp_obj_dict_t *)&terminalio_terminal_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &terminalio_terminal_stream_p,

View File

@ -118,7 +118,7 @@ const mp_obj_namedtuple_type_t struct_time_type_obj = {
.parent = &mp_type_tuple,
.make_new = struct_time_make_new,
.attr = namedtuple_attr,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.unary_op = mp_obj_tuple_unary_op,
.binary_op = mp_obj_tuple_binary_op,
.subscr = mp_obj_tuple_subscr,

View File

@ -313,7 +313,7 @@ const mp_obj_type_t usb_cdc_serial_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_Serial,
.locals_dict = (mp_obj_dict_t *)&usb_cdc_serial_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &usb_cdc_serial_stream_p,

View File

@ -116,7 +116,7 @@ const mp_obj_type_t usb_midi_portin_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_PortIn,
.locals_dict = (mp_obj_dict_t *)&usb_midi_portin_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &usb_midi_portin_stream_p,

View File

@ -97,7 +97,7 @@ const mp_obj_type_t usb_midi_portout_type = {
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_PortOut,
.locals_dict = (mp_obj_dict_t *)&usb_midi_portout_locals_dict,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &usb_midi_portout_stream_p,

View File

@ -65,7 +65,7 @@ const mp_obj_type_t wifi_scannednetworks_type = {
{ &mp_type_type },
.flags = MP_TYPE_FLAG_EXTENDED,
.name = MP_QSTR_ScannedNetworks,
EXTENDED_FIELDS(
MP_TYPE_EXTENDED_FIELDS(
.getiter = mp_identity_getiter,
.iternext = scannednetworks_iternext,
)