diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-01 13:32:54 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-01 13:32:54 +0100 |
| commit | fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9 (patch) | |
| tree | 9160abef8ff03cba6ba2d1d5664f5fb706917355 /py/objlist.c | |
| parent | c60a261ef03f906ae1973f93c63169a5236f0b1f (diff) | |
| download | micropython-fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9.tar.gz micropython-fb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9.zip | |
Rename bultins config variables to MICROPY_PY_BUILTINS_*.
This renames:
MICROPY_PY_FROZENSET -> MICROPY_PY_BUILTINS_FROZENSET
MICROPY_PY_PROPERTY -> MICROPY_PY_BUILTINS_PROPERTY
MICROPY_PY_SLICE -> MICROPY_PY_BUILTINS_SLICE
MICROPY_ENABLE_FLOAT -> MICROPY_PY_BUILTINS_FLOAT
See issue #35 for discussion.
Diffstat (limited to 'py/objlist.c')
| -rw-r--r-- | py/objlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objlist.c b/py/objlist.c index 647096f0dd..6e22169fd9 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -150,7 +150,7 @@ STATIC mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete -#if MICROPY_PY_SLICE +#if MICROPY_PY_BUILTINS_SLICE if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { mp_obj_list_t *self = self_in; mp_bound_slice_t slice; @@ -174,7 +174,7 @@ STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { } else if (value == MP_OBJ_SENTINEL) { // load mp_obj_list_t *self = self_in; -#if MICROPY_PY_SLICE +#if MICROPY_PY_BUILTINS_SLICE if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { mp_bound_slice_t slice; if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { @@ -188,7 +188,7 @@ STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { uint index_val = mp_get_index(self->base.type, self->len, index, false); return self->items[index_val]; } else { -#if MICROPY_PY_SLICE +#if MICROPY_PY_BUILTINS_SLICE if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { mp_obj_list_t *self = self_in; assert(MP_OBJ_IS_TYPE(value, &mp_type_list)); |