diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-08-27 09:21:41 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-08-27 09:21:41 +0100 |
| commit | a97e091d4e80bbdb05f4bb27f18b905b50daf018 (patch) | |
| tree | a167161db4f7b57d23445314bd0f07bc139ac271 /py/obj.h | |
| parent | f3c3010ffccc6cee0795c0491e2a686994bd0b34 (diff) | |
| parent | a75b02ea9be41c27b87fd80ad37e7c26b4583fad (diff) | |
| download | micropython-a97e091d4e80bbdb05f4bb27f18b905b50daf018.tar.gz micropython-a97e091d4e80bbdb05f4bb27f18b905b50daf018.zip | |
Merge branch 'dhylands-int-bytes'
Diffstat (limited to 'py/obj.h')
| -rw-r--r-- | py/obj.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -74,6 +74,7 @@ typedef struct _mp_obj_base_t mp_obj_base_t; #define MP_OBJ_IS_TYPE(o, t) (MP_OBJ_IS_OBJ(o) && (((mp_obj_base_t*)(o))->type == (t))) // this does not work for checking int, str or fun; use below macros for that #define MP_OBJ_IS_INT(o) (MP_OBJ_IS_SMALL_INT(o) || MP_OBJ_IS_TYPE(o, &mp_type_int)) #define MP_OBJ_IS_STR(o) (MP_OBJ_IS_QSTR(o) || MP_OBJ_IS_TYPE(o, &mp_type_str)) +#define MP_OBJ_IS_STR_OR_BYTES(o) (MP_OBJ_IS_QSTR(o) || (MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)(o))->type->binary_op == mp_obj_str_binary_op)) #define MP_OBJ_IS_FUN(o) (MP_OBJ_IS_OBJ(o) && (((mp_obj_base_t*)(o))->type->binary_op == mp_obj_fun_binary_op)) #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 1) |