From 40f3c026823f8951a2fa04e9c7fc93c75bc27bec Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 3 Jul 2014 13:25:24 +0100 Subject: Rename machine_(u)int_t to mp_(u)int_t. See discussion in issue #50. --- py/objset.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'py/objset.c') diff --git a/py/objset.c b/py/objset.c index ab76b5764..48d037ffc 100644 --- a/py/objset.c +++ b/py/objset.c @@ -47,7 +47,7 @@ typedef struct _mp_obj_set_t { typedef struct _mp_obj_set_it_t { mp_obj_base_t base; mp_obj_set_t *set; - machine_uint_t cur; + mp_uint_t cur; } mp_obj_set_it_t; STATIC mp_obj_t set_it_iternext(mp_obj_t self_in); @@ -160,10 +160,10 @@ const mp_obj_type_t mp_type_set_it = { STATIC mp_obj_t set_it_iternext(mp_obj_t self_in) { assert(MP_OBJ_IS_TYPE(self_in, &mp_type_set_it)); mp_obj_set_it_t *self = self_in; - machine_uint_t max = self->set->set.alloc; + mp_uint_t max = self->set->set.alloc; mp_set_t *set = &self->set->set; - for (machine_uint_t i = self->cur; i < max; i++) { + for (mp_uint_t i = self->cur; i < max; i++) { if (MP_SET_SLOT_IS_FILLED(set, i)) { self->cur = i + 1; return set->table[i]; @@ -476,7 +476,7 @@ STATIC mp_obj_t set_unary_op(int op, mp_obj_t self_in) { mp_obj_set_t *self = self_in; switch (op) { case MP_UNARY_OP_BOOL: return MP_BOOL(self->set.used != 0); - case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((machine_int_t)self->set.used); + case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT((mp_int_t)self->set.used); default: return MP_OBJ_NULL; // op not supported } } -- cgit v1.2.3