From f03601779e7abe733a8411d62329098d47d9f215 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 30 Jan 2019 22:04:54 +1100
Subject: [PATCH] extmod: Convert legacy uppercase macro names to lowercase.
---
extmod/machine_signal.c | 2 +-
extmod/moductypes.c | 38 +++++++++++++++++++-------------------
extmod/moduheapq.c | 2 +-
extmod/moduselect.c | 8 ++++----
extmod/modutimeq.c | 2 +-
extmod/vfs.c | 4 ++--
extmod/vfs_posix.c | 2 +-
extmod/vfs_posix_file.c | 2 +-
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 3f9f5af94..c494490b6 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -49,7 +49,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
#if defined(MICROPY_PY_MACHINE_PIN_MAKE_NEW)
mp_pin_p_t *pin_p = NULL;
- if (MP_OBJ_IS_OBJ(pin)) {
+ if (mp_obj_is_obj(pin)) {
mp_obj_base_t *pin_base = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
pin_p = (mp_pin_p_t*)pin_base->type->protocol;
}
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 68cd5fca9..9b46371f3 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -137,13 +137,13 @@ STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_p
(void)kind;
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
const char *typen = "unk";
- if (MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)
+ if (mp_obj_is_type(self->desc, &mp_type_dict)
#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- || MP_OBJ_IS_TYPE(self->desc, &mp_type_ordereddict)
+ || mp_obj_is_type(self->desc, &mp_type_ordereddict)
#endif
) {
typen = "STRUCT";
- } else if (MP_OBJ_IS_TYPE(self->desc, &mp_type_tuple)) {
+ } else if (mp_obj_is_type(self->desc, &mp_type_tuple)) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->desc);
mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(t->items[0]);
uint agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
@@ -210,14 +210,14 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
}
STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size) {
- if (!MP_OBJ_IS_TYPE(desc_in, &mp_type_dict)
+ if (!mp_obj_is_type(desc_in, &mp_type_dict)
#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- && !MP_OBJ_IS_TYPE(desc_in, &mp_type_ordereddict)
+ && !mp_obj_is_type(desc_in, &mp_type_ordereddict)
#endif
) {
- if (MP_OBJ_IS_TYPE(desc_in, &mp_type_tuple)) {
+ if (mp_obj_is_type(desc_in, &mp_type_tuple)) {
return uctypes_struct_agg_size((mp_obj_tuple_t*)MP_OBJ_TO_PTR(desc_in), layout_type, max_field_size);
- } else if (MP_OBJ_IS_SMALL_INT(desc_in)) {
+ } else if (mp_obj_is_small_int(desc_in)) {
// We allow sizeof on both type definitions and structures/structure fields,
// but scalar structure field is lowered into native Python int, so all
// type info is lost. So, we cannot say if it's scalar type description,
@@ -231,9 +231,9 @@ STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_
mp_uint_t total_size = 0;
for (mp_uint_t i = 0; i < d->map.alloc; i++) {
- if (MP_MAP_SLOT_IS_FILLED(&d->map, i)) {
+ if (mp_map_slot_is_filled(&d->map, i)) {
mp_obj_t v = d->map.table[i].value;
- if (MP_OBJ_IS_SMALL_INT(v)) {
+ if (mp_obj_is_small_int(v)) {
mp_uint_t offset = MP_OBJ_SMALL_INT_VALUE(v);
mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS);
offset &= VALUE_MASK(VAL_TYPE_BITS);
@@ -248,7 +248,7 @@ STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_
total_size = offset + s;
}
} else {
- if (!MP_OBJ_IS_TYPE(v, &mp_type_tuple)) {
+ if (!mp_obj_is_type(v, &mp_type_tuple)) {
syntax_error();
}
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(v);
@@ -272,13 +272,13 @@ STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_
STATIC mp_obj_t uctypes_struct_sizeof(size_t n_args, const mp_obj_t *args) {
mp_obj_t obj_in = args[0];
mp_uint_t max_field_size = 0;
- if (MP_OBJ_IS_TYPE(obj_in, &mp_type_bytearray)) {
+ if (mp_obj_is_type(obj_in, &mp_type_bytearray)) {
return mp_obj_len(obj_in);
}
int layout_type = LAYOUT_NATIVE;
// We can apply sizeof either to structure definition (a dict)
// or to instantiated structure
- if (MP_OBJ_IS_TYPE(obj_in, &uctypes_struct_type)) {
+ if (mp_obj_is_type(obj_in, &uctypes_struct_type)) {
if (n_args != 1) {
mp_raise_TypeError(NULL);
}
@@ -406,16 +406,16 @@ STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set_val) {
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
- if (!MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)
+ if (!mp_obj_is_type(self->desc, &mp_type_dict)
#if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- && !MP_OBJ_IS_TYPE(self->desc, &mp_type_ordereddict)
+ && !mp_obj_is_type(self->desc, &mp_type_ordereddict)
#endif
) {
mp_raise_TypeError("struct: no fields");
}
mp_obj_t deref = mp_obj_dict_get(self->desc, MP_OBJ_NEW_QSTR(attr));
- if (MP_OBJ_IS_SMALL_INT(deref)) {
+ if (mp_obj_is_small_int(deref)) {
mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(deref);
mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS);
offset &= VALUE_MASK(VAL_TYPE_BITS);
@@ -476,7 +476,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
return MP_OBJ_NULL;
}
- if (!MP_OBJ_IS_TYPE(deref, &mp_type_tuple)) {
+ if (!mp_obj_is_type(deref, &mp_type_tuple)) {
syntax_error();
}
@@ -543,7 +543,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
return MP_OBJ_NULL; // op not supported
} else {
// load / store
- if (!MP_OBJ_IS_TYPE(self->desc, &mp_type_tuple)) {
+ if (!mp_obj_is_type(self->desc, &mp_type_tuple)) {
mp_raise_TypeError("struct: cannot index");
}
@@ -594,7 +594,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
} else if (agg_type == PTR) {
byte *p = *(void**)self->addr;
- if (MP_OBJ_IS_SMALL_INT(t->items[1])) {
+ if (mp_obj_is_small_int(t->items[1])) {
uint val_type = GET_TYPE(MP_OBJ_SMALL_INT_VALUE(t->items[1]), VAL_TYPE_BITS);
return get_aligned(val_type, p, index);
} else {
@@ -618,7 +618,7 @@ STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
switch (op) {
case MP_UNARY_OP_INT:
- if (MP_OBJ_IS_TYPE(self->desc, &mp_type_tuple)) {
+ if (mp_obj_is_type(self->desc, &mp_type_tuple)) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->desc);
mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(t->items[0]);
uint agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 71c15368b..bdaf191e9 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -32,7 +32,7 @@
// the algorithm here is modelled on CPython's heapq.py
STATIC mp_obj_list_t *get_heap(mp_obj_t heap_in) {
- if (!MP_OBJ_IS_TYPE(heap_in, &mp_type_list)) {
+ if (!mp_obj_is_type(heap_in, &mp_type_list)) {
mp_raise_TypeError("heap must be a list");
}
return MP_OBJ_TO_PTR(heap_in);
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 582814b0b..13bf5611e 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -77,7 +77,7 @@ STATIC void poll_map_add(mp_map_t *poll_map, const mp_obj_t *obj, mp_uint_t obj_
STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) {
mp_uint_t n_ready = 0;
for (mp_uint_t i = 0; i < poll_map->alloc; ++i) {
- if (!MP_MAP_SLOT_IS_FILLED(poll_map, i)) {
+ if (!mp_map_slot_is_filled(poll_map, i)) {
continue;
}
@@ -155,7 +155,7 @@ STATIC mp_obj_t select_select(uint n_args, const mp_obj_t *args) {
list_array[2] = mp_obj_new_list(rwx_len[2], NULL);
rwx_len[0] = rwx_len[1] = rwx_len[2] = 0;
for (mp_uint_t i = 0; i < poll_map.alloc; ++i) {
- if (!MP_MAP_SLOT_IS_FILLED(&poll_map, i)) {
+ if (!mp_map_slot_is_filled(&poll_map, i)) {
continue;
}
poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_map.table[i].value);
@@ -266,7 +266,7 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
mp_obj_list_t *ret_list = MP_OBJ_TO_PTR(mp_obj_new_list(n_ready, NULL));
n_ready = 0;
for (mp_uint_t i = 0; i < self->poll_map.alloc; ++i) {
- if (!MP_MAP_SLOT_IS_FILLED(&self->poll_map, i)) {
+ if (!mp_map_slot_is_filled(&self->poll_map, i)) {
continue;
}
poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_map.table[i].value);
@@ -309,7 +309,7 @@ STATIC mp_obj_t poll_iternext(mp_obj_t self_in) {
for (mp_uint_t i = self->iter_idx; i < self->poll_map.alloc; ++i) {
self->iter_idx++;
- if (!MP_MAP_SLOT_IS_FILLED(&self->poll_map, i)) {
+ if (!mp_map_slot_is_filled(&self->poll_map, i)) {
continue;
}
poll_obj_t *poll_obj = MP_OBJ_TO_PTR(self->poll_map.table[i].value);
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 620e7484b..26f5a78fa 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -145,7 +145,7 @@ STATIC mp_obj_t mod_utimeq_heappop(mp_obj_t heap_in, mp_obj_t list_ref) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "empty heap"));
}
mp_obj_list_t *ret = MP_OBJ_TO_PTR(list_ref);
- if (!MP_OBJ_IS_TYPE(list_ref, &mp_type_list) || ret->len < 3) {
+ if (!mp_obj_is_type(list_ref, &mp_type_list) || ret->len < 3) {
mp_raise_TypeError(NULL);
}
diff --git a/extmod/vfs.c b/extmod/vfs.c
index fd7f2a4fe..f99be3098 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -227,7 +227,7 @@ mp_obj_t mp_vfs_umount(mp_obj_t mnt_in) {
mp_vfs_mount_t *vfs = NULL;
size_t mnt_len;
const char *mnt_str = NULL;
- if (MP_OBJ_IS_STR(mnt_in)) {
+ if (mp_obj_is_str(mnt_in)) {
mnt_str = mp_obj_str_get_data(mnt_in, &mnt_len);
}
for (mp_vfs_mount_t **vfsp = &MP_STATE_VM(vfs_mount_table); *vfsp != NULL; vfsp = &(*vfsp)->next) {
@@ -270,7 +270,7 @@ mp_obj_t mp_vfs_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args)
#if MICROPY_VFS_POSIX
// If the file is an integer then delegate straight to the POSIX handler
- if (MP_OBJ_IS_SMALL_INT(args[ARG_file].u_obj)) {
+ if (mp_obj_is_small_int(args[ARG_file].u_obj)) {
return mp_vfs_posix_file_open(&mp_type_textio, args[ARG_file].u_obj, args[ARG_mode].u_obj);
}
#endif
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 4ca7f9b90..4ef761956 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -130,7 +130,7 @@ STATIC mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode
&& (strchr(mode, 'w') != NULL || strchr(mode, 'a') != NULL || strchr(mode, '+') != NULL)) {
mp_raise_OSError(MP_EROFS);
}
- if (!MP_OBJ_IS_SMALL_INT(path_in)) {
+ if (!mp_obj_is_small_int(path_in)) {
path_in = vfs_posix_get_path_obj(self, path_in);
}
return mp_vfs_posix_file_open(&mp_type_textio, path_in, mode_in);
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 435ac65cd..44cb85dcc 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -94,7 +94,7 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
mp_obj_t fid = file_in;
- if (MP_OBJ_IS_SMALL_INT(fid)) {
+ if (mp_obj_is_small_int(fid)) {
o->fd = MP_OBJ_SMALL_INT_VALUE(fid);
return MP_OBJ_FROM_PTR(o);
}
--
GitLab