rename the type flag to EXTENDED for consistency
This commit is contained in:
parent
a19a48f4b6
commit
7302bc09a7
@ -295,7 +295,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_btree,
|
||||
.print = btree_print,
|
||||
.locals_dict = (void *)&btree_locals_dict,
|
||||
|
@ -602,7 +602,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_FrameBuffer,
|
||||
.make_new = framebuf_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&framebuf_locals_dict,
|
||||
|
@ -284,7 +284,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Task,
|
||||
.make_new = task_make_new,
|
||||
.attr = task_attr,
|
||||
|
@ -622,7 +622,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_struct,
|
||||
.print = uctypes_struct_print,
|
||||
.make_new = uctypes_struct_make_new,
|
||||
|
@ -193,7 +193,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_utimeq,
|
||||
.make_new = utimeq_make_new,
|
||||
.locals_dict = (void *)&utimeq_locals_dict,
|
||||
|
@ -122,7 +122,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_DecompIO,
|
||||
.make_new = decompio_make_new,
|
||||
.locals_dict = (void *)&decompio_locals_dict,
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit deda9d74d8724b7855244c22dd2629056b1a10a6
|
||||
Subproject commit 75c7e05eacb22a9f6fef9c4381fe23c138565172
|
@ -474,7 +474,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_VfsFat,
|
||||
.make_new = fat_vfs_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
|
||||
|
@ -244,7 +244,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_FileIO,
|
||||
.print = file_obj_print,
|
||||
.make_new = file_obj_make_new,
|
||||
@ -267,7 +267,7 @@ 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_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_TextIOWrapper,
|
||||
.print = file_obj_print,
|
||||
.make_new = file_obj_make_new,
|
||||
|
@ -484,7 +484,7 @@ STATIC const mp_vfs_proto_t MP_VFS_LFSx(proto) = {
|
||||
|
||||
const mp_obj_type_t MP_TYPE_VFS_LFSx = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
#if LFS_BUILD_VERSION == 1
|
||||
.name = MP_QSTR_VfsLfs1,
|
||||
#else
|
||||
|
@ -226,7 +226,7 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
|
||||
|
||||
const mp_obj_type_t MP_TYPE_VFS_LFSx_(_fileio) = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_FileIO,
|
||||
.print = MP_VFS_LFSx(file_print),
|
||||
.locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
|
||||
@ -248,7 +248,7 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
|
||||
|
||||
const mp_obj_type_t MP_TYPE_VFS_LFSx_(_textio) = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_TextIOWrapper,
|
||||
.print = MP_VFS_LFSx(file_print),
|
||||
.locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
|
||||
|
@ -352,7 +352,7 @@ STATIC const mp_vfs_proto_t vfs_posix_proto = {
|
||||
|
||||
const mp_obj_type_t mp_type_vfs_posix = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_VfsPosix,
|
||||
.locals_dict = (mp_obj_dict_t *)&vfs_posix_locals_dict,
|
||||
.make_new = vfs_posix_make_new,
|
||||
|
@ -213,7 +213,7 @@ STATIC const mp_stream_p_t vfs_posix_fileio_stream_p = {
|
||||
|
||||
const mp_obj_type_t mp_type_vfs_posix_fileio = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_FileIO,
|
||||
.print = vfs_posix_file_print,
|
||||
.make_new = vfs_posix_file_make_new,
|
||||
@ -236,7 +236,7 @@ STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
|
||||
|
||||
const mp_obj_type_t mp_type_vfs_posix_textio = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_TextIOWrapper,
|
||||
.print = vfs_posix_file_print,
|
||||
.make_new = vfs_posix_file_make_new,
|
||||
|
@ -129,7 +129,7 @@ STATIC const mp_stream_p_t stdio_obj_stream_p = {
|
||||
|
||||
STATIC const mp_obj_type_t stdio_obj_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_FileIO,
|
||||
// TODO .make_new?
|
||||
.print = stdio_obj_print,
|
||||
@ -169,7 +169,7 @@ STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
|
||||
STATIC const mp_obj_type_t stdio_buffer_obj_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_FileIO,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.print = stdio_obj_print,
|
||||
.locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -108,7 +108,7 @@ STATIC const mp_stream_p_t fileio_stream_p = {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_stest_fileio = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
.protocol = &fileio_stream_p,
|
||||
@ -139,7 +139,7 @@ STATIC const mp_stream_p_t textio_stream_p2 = {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_stest_textio2 = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict2,
|
||||
EXTENDED_FIELDS(
|
||||
.protocol = &textio_stream_p2,
|
||||
|
@ -485,7 +485,7 @@ error:
|
||||
|
||||
STATIC const mp_obj_type_t ffifunc_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_ffifunc,
|
||||
.print = ffifunc_print,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -313,7 +313,7 @@ STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_poll = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_poll,
|
||||
.locals_dict = (void *)&poll_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -103,7 +103,7 @@ STATIC const mp_stream_p_t iobase_p = {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_iobase = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_IOBase,
|
||||
.make_new = iobase_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
@ -202,7 +202,7 @@ STATIC const mp_stream_p_t bufwriter_stream_p = {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_bufwriter = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_BufferedWriter,
|
||||
.make_new = bufwriter_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&bufwriter_locals_dict,
|
||||
|
20
py/obj.c
20
py/obj.c
@ -103,7 +103,7 @@ const mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {
|
||||
|
||||
const mp_obj_full_type_t *mp_obj_get_full_type(mp_const_obj_t o_in) {
|
||||
const mp_obj_type_t *type = mp_obj_get_type(o_in);
|
||||
assert(type->flags & MP_TYPE_FLAG_FULL);
|
||||
assert(type->flags & MP_TYPE_FLAG_EXTENDED);
|
||||
return (mp_obj_full_type_t *)type;
|
||||
}
|
||||
|
||||
@ -679,14 +679,14 @@ mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
|
||||
}
|
||||
|
||||
mp_call_fun_t mp_type_call(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->ext[0].call;
|
||||
}
|
||||
|
||||
mp_unary_op_fun_t mp_type_unary_op(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->ext[0].unary_op;
|
||||
@ -694,7 +694,7 @@ mp_unary_op_fun_t mp_type_unary_op(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
mp_binary_op_fun_t mp_type_binary_op(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->ext[0].binary_op;
|
||||
@ -707,7 +707,7 @@ mp_attr_fun_t mp_type_attr(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->MP_TYPE_SUBSCR;
|
||||
@ -715,7 +715,7 @@ mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
mp_getiter_fun_t mp_type_getiter(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->MP_TYPE_GETITER;
|
||||
@ -723,7 +723,7 @@ mp_getiter_fun_t mp_type_getiter(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
mp_fun_1_t mp_type_iternext(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->MP_TYPE_ITERNEXT;
|
||||
@ -731,7 +731,7 @@ mp_fun_1_t mp_type_iternext(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->MP_TYPE_GET_BUFFER;
|
||||
@ -739,7 +739,7 @@ mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *type) {
|
||||
|
||||
|
||||
const void *mp_type_protocol(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return NULL;
|
||||
}
|
||||
return type->MP_TYPE_PROTOCOL;
|
||||
@ -751,7 +751,7 @@ const void *mp_type_parent(const mp_obj_type_t *type) {
|
||||
}
|
||||
|
||||
size_t mp_type_size(const mp_obj_type_t *type) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_FULL)) {
|
||||
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
|
||||
return sizeof(mp_obj_type_t);
|
||||
}
|
||||
return sizeof(mp_obj_full_type_t);
|
||||
|
2
py/obj.h
2
py/obj.h
@ -516,7 +516,7 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
|
||||
#define MP_TYPE_FLAG_EQ_HAS_NEQ_TEST (0x0010)
|
||||
#define MP_TYPE_FLAG_BINDS_SELF (0x0020)
|
||||
#define MP_TYPE_FLAG_BUILTIN_FUN (0x0040)
|
||||
#define MP_TYPE_FLAG_FULL (0x0080) // contains the 'ext' fields
|
||||
#define MP_TYPE_FLAG_EXTENDED (0x0080) // contains the 'ext' fields
|
||||
|
||||
typedef enum {
|
||||
PRINT_STR = 0,
|
||||
|
@ -744,7 +744,7 @@ STATIC MP_DEFINE_CONST_DICT(bytearray_locals_dict, bytearray_locals_dict_table);
|
||||
#if MICROPY_PY_ARRAY
|
||||
const mp_obj_type_t mp_type_array = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_array,
|
||||
.print = array_print,
|
||||
.make_new = array_make_new,
|
||||
@ -762,7 +762,7 @@ const mp_obj_type_t mp_type_array = {
|
||||
#if MICROPY_PY_BUILTINS_BYTEARRAY
|
||||
const mp_obj_type_t mp_type_bytearray = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_bytearray,
|
||||
.print = array_print,
|
||||
.make_new = bytearray_make_new,
|
||||
@ -789,7 +789,7 @@ STATIC MP_DEFINE_CONST_DICT(memoryview_locals_dict, memoryview_locals_dict_table
|
||||
|
||||
const mp_obj_type_t mp_type_memoryview = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_memoryview,
|
||||
.make_new = memoryview_make_new,
|
||||
#if MICROPY_CPYTHON_COMPAT
|
||||
@ -860,7 +860,7 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_array_it = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_iterator,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
@ -83,7 +83,7 @@ mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *item
|
||||
|
||||
const mp_obj_type_t mp_type_attrtuple = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_tuple, // reuse tuple to save on a qstr
|
||||
.print = mp_obj_attrtuple_print,
|
||||
.attr = mp_obj_attrtuple_attr,
|
||||
|
@ -86,7 +86,7 @@ STATIC mp_obj_t bool_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_
|
||||
|
||||
const mp_obj_type_t mp_type_bool = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL, // can match all numeric types
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED, // can match all numeric types
|
||||
.name = MP_QSTR_bool,
|
||||
.print = bool_print,
|
||||
.make_new = bool_make_new,
|
||||
|
@ -97,7 +97,7 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_bound_meth = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_bound_method,
|
||||
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
|
||||
.print = bound_meth_print,
|
||||
|
@ -80,7 +80,7 @@ STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
|
||||
|
||||
const mp_obj_type_t mp_type_closure = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_closure,
|
||||
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
|
||||
.print = closure_print,
|
||||
|
@ -157,7 +157,7 @@ STATIC void complex_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
const mp_obj_type_t mp_type_complex = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_complex,
|
||||
.print = complex_print,
|
||||
.make_new = complex_make_new,
|
||||
|
@ -160,7 +160,7 @@ STATIC MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_deque = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_deque,
|
||||
.make_new = deque_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&deque_locals_dict,
|
||||
|
@ -459,7 +459,7 @@ STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_dict_view_it = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_iterator,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
@ -513,7 +513,7 @@ STATIC mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_dict_view = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_dict_view,
|
||||
.print = dict_view_print,
|
||||
EXTENDED_FIELDS(
|
||||
@ -590,7 +590,7 @@ STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_dict = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_dict,
|
||||
.print = dict_print,
|
||||
.make_new = mp_obj_dict_make_new,
|
||||
@ -606,7 +606,7 @@ const mp_obj_type_t mp_type_dict = {
|
||||
#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
|
||||
const mp_obj_type_t mp_type_ordereddict = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_OrderedDict,
|
||||
.print = dict_print,
|
||||
.make_new = mp_obj_dict_make_new,
|
||||
|
@ -71,7 +71,7 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, con
|
||||
|
||||
const mp_obj_type_t mp_type_enumerate = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_enumerate,
|
||||
.make_new = enumerate_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -626,7 +626,7 @@ STATIC const mp_obj_namedtuple_type_t code_type_obj = {
|
||||
.base = {
|
||||
.type = &mp_type_type
|
||||
},
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_code,
|
||||
.print = namedtuple_print,
|
||||
.make_new = namedtuple_make_new,
|
||||
@ -731,7 +731,7 @@ STATIC const mp_obj_namedtuple_type_t traceback_type_obj = {
|
||||
.base = {
|
||||
.type = &mp_type_type
|
||||
},
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_traceback,
|
||||
.print = namedtuple_print,
|
||||
.make_new = namedtuple_make_new,
|
||||
|
@ -63,7 +63,7 @@ STATIC mp_obj_t filter_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t mp_type_filter = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_filter,
|
||||
.make_new = filter_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -181,7 +181,7 @@ STATIC mp_obj_t float_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
|
||||
|
||||
const mp_obj_type_t mp_type_float = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_float,
|
||||
.print = float_print,
|
||||
.make_new = float_make_new,
|
||||
|
16
py/objfun.c
16
py/objfun.c
@ -60,7 +60,7 @@ STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
|
||||
|
||||
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_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_builtin_0_call,
|
||||
@ -77,7 +77,7 @@ STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
|
||||
|
||||
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_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_builtin_1_call,
|
||||
@ -94,7 +94,7 @@ STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
|
||||
|
||||
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_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_builtin_2_call,
|
||||
@ -111,7 +111,7 @@ STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
|
||||
|
||||
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_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_builtin_3_call,
|
||||
@ -144,7 +144,7 @@ STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
|
||||
|
||||
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_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_builtin_var_call,
|
||||
@ -372,7 +372,7 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
const mp_obj_type_t mp_type_fun_bc = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
#if MICROPY_CPYTHON_COMPAT
|
||||
.print = fun_bc_print,
|
||||
@ -426,7 +426,7 @@ STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
|
||||
|
||||
const mp_obj_type_t mp_type_fun_native = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_native_call,
|
||||
@ -536,7 +536,7 @@ STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_fun_asm = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = fun_asm_call,
|
||||
|
@ -157,7 +157,7 @@ static void gen_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
const mp_obj_type_t mp_type_gen_wrap = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_generator,
|
||||
#if MICROPY_PY_FUNCTION_ATTRS
|
||||
.attr = gen_attr,
|
||||
@ -414,7 +414,7 @@ STATIC MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_t
|
||||
|
||||
const mp_obj_type_t mp_type_gen_instance = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_generator,
|
||||
.print = gen_instance_print,
|
||||
.locals_dict = (mp_obj_dict_t *)&gen_instance_locals_dict,
|
||||
|
@ -59,7 +59,7 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_it = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_iterator,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
@ -571,7 +571,7 @@ STATIC MP_DEFINE_CONST_DICT(int_locals_dict, int_locals_dict_table);
|
||||
const mp_obj_type_t mp_type_int = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_int,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.print = mp_obj_int_print,
|
||||
.make_new = mp_obj_int_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&int_locals_dict,
|
||||
|
@ -461,7 +461,7 @@ STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_list = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_list,
|
||||
.print = list_print,
|
||||
.make_new = list_make_new,
|
||||
|
@ -66,7 +66,7 @@ STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t mp_type_map = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_map,
|
||||
.make_new = map_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -168,7 +168,7 @@ mp_obj_namedtuple_type_t *mp_obj_new_namedtuple_base(size_t n_fields, mp_obj_t *
|
||||
STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t *fields) {
|
||||
mp_obj_namedtuple_type_t *o = mp_obj_new_namedtuple_base(n_fields, fields);
|
||||
o->base.base.type = &mp_type_type;
|
||||
o->base.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL; // can match tuple
|
||||
o->base.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED; // can match tuple
|
||||
o->base.name = name;
|
||||
o->base.print = namedtuple_print;
|
||||
o->base.make_new = namedtuple_make_new;
|
||||
|
@ -45,7 +45,7 @@ STATIC void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
|
||||
|
||||
const mp_obj_type_t mp_type_NoneType = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_NoneType,
|
||||
.print = none_print,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -47,7 +47,7 @@ STATIC mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t mp_type_polymorph_iter = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_iterator,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
@ -54,7 +54,7 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_range_it = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_iterator,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
@ -217,7 +217,7 @@ STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
const mp_obj_type_t mp_type_range = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_range,
|
||||
.print = range_print,
|
||||
.make_new = range_make_new,
|
||||
|
@ -71,7 +71,7 @@ STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t mp_type_reversed = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_reversed,
|
||||
.make_new = reversed_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -545,7 +545,7 @@ STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_set = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_set,
|
||||
.print = set_print,
|
||||
.make_new = set_make_new,
|
||||
@ -573,7 +573,7 @@ STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_frozenset = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_frozenset,
|
||||
.print = set_print,
|
||||
.make_new = set_make_new,
|
||||
|
@ -45,7 +45,7 @@ STATIC void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
|
||||
|
||||
const mp_obj_type_t mp_type_singleton = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_,
|
||||
.print = singleton_print,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -2035,7 +2035,7 @@ const mp_obj_type_t mp_type_str = {
|
||||
// Reuses most of methods from str
|
||||
const mp_obj_type_t mp_type_bytes = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_bytes,
|
||||
.print = str_print,
|
||||
.make_new = bytes_make_new,
|
||||
|
@ -246,7 +246,7 @@ STATIC const mp_stream_p_t stringio_stream_p = {
|
||||
|
||||
const mp_obj_type_t mp_type_stringio = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_StringIO,
|
||||
.print = stringio_print,
|
||||
.make_new = stringio_make_new,
|
||||
@ -268,7 +268,7 @@ STATIC const mp_stream_p_t bytesio_stream_p = {
|
||||
|
||||
const mp_obj_type_t mp_type_bytesio = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_BytesIO,
|
||||
.print = stringio_print,
|
||||
.make_new = stringio_make_new,
|
||||
|
@ -291,7 +291,7 @@ STATIC MP_DEFINE_CONST_DICT(struni_locals_dict, struni_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_str = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_str,
|
||||
.print = uni_print,
|
||||
.make_new = mp_obj_str_make_new,
|
||||
|
@ -229,7 +229,7 @@ STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t mp_type_tuple = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_tuple,
|
||||
.print = mp_obj_tuple_print,
|
||||
.make_new = mp_obj_tuple_make_new,
|
||||
|
@ -1146,7 +1146,7 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
||||
|
||||
const mp_obj_type_t mp_type_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_type,
|
||||
.print = type_print,
|
||||
.make_new = type_make_new,
|
||||
@ -1170,7 +1170,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
|
||||
|
||||
// Basic validation of base classes
|
||||
uint16_t base_flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE
|
||||
| MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST | MP_TYPE_FLAG_FULL;
|
||||
| MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST | MP_TYPE_FLAG_EXTENDED;
|
||||
size_t bases_len;
|
||||
mp_obj_t *bases_items;
|
||||
mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
|
||||
|
@ -69,7 +69,7 @@ STATIC mp_obj_t zip_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t mp_type_zip = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_zip,
|
||||
.make_new = zip_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -1003,7 +1003,7 @@ STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
|
||||
|
||||
STATIC const mp_obj_type_t mp_type_checked_fun = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_function,
|
||||
EXTENDED_FIELDS(
|
||||
.call = checked_fun_call,
|
||||
|
@ -215,7 +215,7 @@ STATIC MP_DEFINE_CONST_DICT(bleio_address_locals_dict, bleio_address_locals_dict
|
||||
|
||||
const mp_obj_type_t bleio_address_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Address,
|
||||
.make_new = bleio_address_make_new,
|
||||
.print = bleio_address_print,
|
||||
|
@ -238,7 +238,7 @@ STATIC const mp_stream_p_t characteristic_buffer_stream_p = {
|
||||
|
||||
const mp_obj_type_t bleio_characteristic_buffer_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_CharacteristicBuffer,
|
||||
.make_new = bleio_characteristic_buffer_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&bleio_characteristic_buffer_locals_dict,
|
||||
|
@ -266,7 +266,7 @@ STATIC MP_DEFINE_CONST_DICT(bleio_connection_locals_dict, bleio_connection_local
|
||||
|
||||
const mp_obj_type_t bleio_connection_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Connection,
|
||||
.locals_dict = (mp_obj_dict_t *)&bleio_connection_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -62,7 +62,7 @@ STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t bleio_scanresults_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_ScanResults,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
@ -300,7 +300,7 @@ void bleio_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
|
||||
|
||||
const mp_obj_type_t bleio_uuid_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_UUID,
|
||||
.print = bleio_uuid_print,
|
||||
.make_new = bleio_uuid_make_new,
|
||||
|
@ -383,7 +383,7 @@ STATIC MP_DEFINE_CONST_DICT(pixelbuf_pixelbuf_locals_dict, pixelbuf_pixelbuf_loc
|
||||
const mp_obj_type_t pixelbuf_pixelbuf_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_PixelBuf,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.locals_dict = (mp_obj_t)&pixelbuf_pixelbuf_locals_dict,
|
||||
.make_new = pixelbuf_pixelbuf_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -175,7 +175,7 @@ STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, m
|
||||
const mp_obj_type_t alarm_sleep_memory_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_SleepMemory,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.locals_dict = (mp_obj_t)&alarm_sleep_memory_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
.subscr = alarm_sleep_memory_subscr,
|
||||
|
@ -184,7 +184,7 @@ STATIC const audiosample_p_t audioio_rawsample_proto = {
|
||||
const mp_obj_type_t audioio_rawsample_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_RawSample,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = audioio_rawsample_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&audioio_rawsample_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -213,7 +213,7 @@ STATIC const audiosample_p_t audioio_wavefile_proto = {
|
||||
const mp_obj_type_t audioio_wavefile_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_WaveFile,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = audioio_wavefile_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&audioio_wavefile_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -297,7 +297,7 @@ STATIC const audiosample_p_t audiomixer_mixer_proto = {
|
||||
const mp_obj_type_t audiomixer_mixer_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_Mixer,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = audiomixer_mixer_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&audiomixer_mixer_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -261,7 +261,7 @@ STATIC const audiosample_p_t audiomp3_mp3file_proto = {
|
||||
const mp_obj_type_t audiomp3_mp3file_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_MP3Decoder,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = audiomp3_mp3file_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&audiomp3_mp3file_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -422,7 +422,7 @@ STATIC const mp_stream_p_t uart_stream_p = {
|
||||
|
||||
const mp_obj_type_t busio_uart_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_UART,
|
||||
.make_new = busio_uart_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&busio_uart_locals_dict,
|
||||
|
@ -172,7 +172,7 @@ STATIC MP_DEFINE_CONST_DICT(canio_listener_locals_dict, canio_listener_locals_di
|
||||
const mp_obj_type_t canio_listener_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_Listener,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.locals_dict = (mp_obj_dict_t *)&canio_listener_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
@ -368,7 +368,7 @@ STATIC mp_int_t bitmap_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, m
|
||||
|
||||
const mp_obj_type_t displayio_bitmap_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Bitmap,
|
||||
.make_new = displayio_bitmap_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&displayio_bitmap_locals_dict,
|
||||
|
@ -357,7 +357,7 @@ STATIC MP_DEFINE_CONST_DICT(displayio_group_locals_dict, displayio_group_locals_
|
||||
|
||||
const mp_obj_type_t displayio_group_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Group,
|
||||
.make_new = displayio_group_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&displayio_group_locals_dict,
|
||||
|
@ -204,7 +204,7 @@ STATIC MP_DEFINE_CONST_DICT(displayio_palette_locals_dict, displayio_palette_loc
|
||||
|
||||
const mp_obj_type_t displayio_palette_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Palette,
|
||||
.make_new = displayio_palette_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&displayio_palette_locals_dict,
|
||||
|
@ -394,7 +394,7 @@ STATIC MP_DEFINE_CONST_DICT(displayio_tilegrid_locals_dict, displayio_tilegrid_l
|
||||
|
||||
const mp_obj_type_t displayio_tilegrid_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_TileGrid,
|
||||
.make_new = displayio_tilegrid_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&displayio_tilegrid_locals_dict,
|
||||
|
@ -58,7 +58,7 @@ const mp_obj_namedtuple_type_t fontio_glyph_type = {
|
||||
.type = &mp_type_type
|
||||
},
|
||||
.name = MP_QSTR_Glyph,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.print = namedtuple_print,
|
||||
.make_new = namedtuple_make_new,
|
||||
.parent = &mp_type_tuple,
|
||||
|
@ -190,7 +190,7 @@ STATIC MP_DEFINE_CONST_DICT(ipaddress_ipv4address_locals_dict, ipaddress_ipv4add
|
||||
|
||||
const mp_obj_type_t ipaddress_ipv4address_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Address,
|
||||
.make_new = ipaddress_ipv4address_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&ipaddress_ipv4address_locals_dict,
|
||||
|
@ -171,7 +171,7 @@ STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_t
|
||||
|
||||
const mp_obj_type_t keypad_event_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Event,
|
||||
.make_new = keypad_event_make_new,
|
||||
.print = keypad_event_print,
|
||||
|
@ -146,7 +146,7 @@ STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_loc
|
||||
|
||||
const mp_obj_type_t keypad_eventqueue_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Keys,
|
||||
EXTENDED_FIELDS(
|
||||
.unary_op = keypad_eventqueue_unary_op,
|
||||
|
@ -168,7 +168,7 @@ STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj
|
||||
|
||||
const mp_obj_type_t nvm_bytearray_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_ByteArray,
|
||||
.locals_dict = (mp_obj_t)&nvm_bytearray_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -238,7 +238,7 @@ STATIC MP_DEFINE_CONST_DICT(ps2io_ps2_locals_dict, ps2io_ps2_locals_dict_table);
|
||||
const mp_obj_type_t ps2io_ps2_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_Ps2,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = ps2io_ps2_make_new,
|
||||
EXTENDED_FIELDS(
|
||||
.unary_op = ps2_unary_op,
|
||||
|
@ -309,7 +309,7 @@ STATIC MP_DEFINE_CONST_DICT(pulseio_pulsein_locals_dict, pulseio_pulsein_locals_
|
||||
|
||||
const mp_obj_type_t pulseio_pulsein_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_PulseIn,
|
||||
.make_new = pulseio_pulsein_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&pulseio_pulsein_locals_dict,
|
||||
|
@ -439,7 +439,7 @@ STATIC mp_int_t rgbmatrix_rgbmatrix_get_buffer(mp_obj_t self_in, mp_buffer_info_
|
||||
|
||||
const mp_obj_type_t rgbmatrix_RGBMatrix_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_RGBMatrix,
|
||||
.locals_dict = (mp_obj_dict_t *)&rgbmatrix_rgbmatrix_locals_dict,
|
||||
.make_new = rgbmatrix_rgbmatrix_make_new,
|
||||
|
@ -85,7 +85,7 @@ STATIC MP_DEFINE_CONST_DICT(sharpdisplay_framebuffer_locals_dict, sharpdisplay_f
|
||||
const mp_obj_type_t sharpdisplay_framebuffer_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_SharpMemoryFramebuffer,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = sharpdisplay_framebuffer_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&sharpdisplay_framebuffer_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -409,7 +409,7 @@ STATIC MP_DEFINE_CONST_DICT(socketpool_socket_locals_dict, socketpool_socket_loc
|
||||
|
||||
const mp_obj_type_t socketpool_socket_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Socket,
|
||||
.locals_dict = (mp_obj_dict_t *)&socketpool_socket_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -320,7 +320,7 @@ STATIC MP_DEFINE_CONST_DICT(ssl_sslsocket_locals_dict, ssl_sslsocket_locals_dict
|
||||
|
||||
const mp_obj_type_t ssl_sslsocket_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_SSLSocket,
|
||||
.locals_dict = (mp_obj_dict_t *)&ssl_sslsocket_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -163,7 +163,7 @@ STATIC const audiosample_p_t synthio_miditrack_proto = {
|
||||
const mp_obj_type_t synthio_miditrack_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_MidiTrack,
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.make_new = synthio_miditrack_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&synthio_miditrack_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -118,7 +118,7 @@ STATIC const mp_stream_p_t terminalio_terminal_stream_p = {
|
||||
|
||||
const mp_obj_type_t terminalio_terminal_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Terminal,
|
||||
.make_new = terminalio_terminal_make_new,
|
||||
.locals_dict = (mp_obj_dict_t *)&terminalio_terminal_locals_dict,
|
||||
|
@ -112,7 +112,7 @@ const mp_obj_namedtuple_type_t struct_time_type_obj = {
|
||||
.base = {
|
||||
.type = &mp_type_type
|
||||
},
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_struct_time,
|
||||
.print = namedtuple_print,
|
||||
.parent = &mp_type_tuple,
|
||||
|
@ -310,7 +310,7 @@ STATIC const mp_stream_p_t usb_cdc_serial_stream_p = {
|
||||
|
||||
const mp_obj_type_t usb_cdc_serial_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_Serial,
|
||||
.locals_dict = (mp_obj_dict_t *)&usb_cdc_serial_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -113,7 +113,7 @@ STATIC const mp_stream_p_t usb_midi_portin_stream_p = {
|
||||
|
||||
const mp_obj_type_t usb_midi_portin_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_PortIn,
|
||||
.locals_dict = (mp_obj_dict_t *)&usb_midi_portin_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -94,7 +94,7 @@ STATIC const mp_stream_p_t usb_midi_portout_stream_p = {
|
||||
|
||||
const mp_obj_type_t usb_midi_portout_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_PortOut,
|
||||
.locals_dict = (mp_obj_dict_t *)&usb_midi_portout_locals_dict,
|
||||
EXTENDED_FIELDS(
|
||||
|
@ -63,7 +63,7 @@ STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) {
|
||||
|
||||
const mp_obj_type_t wifi_scannednetworks_type = {
|
||||
{ &mp_type_type },
|
||||
.flags = MP_TYPE_FLAG_FULL,
|
||||
.flags = MP_TYPE_FLAG_EXTENDED,
|
||||
.name = MP_QSTR_ScannedNetworks,
|
||||
EXTENDED_FIELDS(
|
||||
.getiter = mp_identity_getiter,
|
||||
|
Loading…
Reference in New Issue
Block a user