From f380a91e7caecc08b92b754f37d73be8c2d43ad0 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 26 Jun 2021 20:00:31 -0500 Subject: [PATCH] objtuple: Move mp_obj_is_tuple_compatible to obj.h. Signed-off-by: Jeff Epler --- py/obj.h | 2 ++ py/objtuple.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/obj.h b/py/obj.h index 75caf459d4..da2ef08451 100644 --- a/py/obj.h +++ b/py/obj.h @@ -764,6 +764,8 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj; #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->binary_op == mp_obj_str_binary_op)) #define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new) #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function)) +// type check is done on getiter method to allow tuple, namedtuple, attrtuple +#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter) mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict); static inline mp_obj_t mp_obj_new_bool(mp_int_t x) { diff --git a/py/objtuple.c b/py/objtuple.c index bb4f79997c..414cf65c3b 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -34,8 +34,6 @@ #include "supervisor/shared/translate.h" -// type check is done on getiter method to allow tuple, namedtuple, attrtuple -#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter) /******************************************************************************/ /* tuple */