diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-29 13:15:08 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-29 13:15:08 +0000 |
| commit | 07ddab529cb0953c473d30795e4dc3c6dfff0d89 (patch) | |
| tree | ba3cba6f7b35f7a3098d044b77a9d6cd61c2ec3a /py/runtime.c | |
| parent | da51a399cf628699546f77f320ef0388a268b49f (diff) | |
| download | micropython-07ddab529cb0953c473d30795e4dc3c6dfff0d89.tar.gz micropython-07ddab529cb0953c473d30795e4dc3c6dfff0d89.zip | |
py: Change mp_const_* objects to macros.
Addresses issue #388.
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/py/runtime.c b/py/runtime.c index 3f637a16f9..4dc1c2ef53 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -51,7 +51,6 @@ void rt_init(void) { // add some builtins that can't be done in ROM mp_map_add_qstr(map_globals, MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR___main__)); - mp_map_add_qstr(&map_builtins, MP_QSTR_Ellipsis, mp_const_ellipsis); #if MICROPY_CPYTHON_COMPAT // Precreate sys module, so "import sys" didn't throw exceptions. @@ -559,9 +558,9 @@ mp_obj_t rt_store_set(mp_obj_t set, mp_obj_t item) { // unpacked items are stored in reverse order into the array pointed to by items void rt_unpack_sequence(mp_obj_t seq_in, uint num, mp_obj_t *items) { uint seq_len; - if (MP_OBJ_IS_TYPE(seq_in, &tuple_type) || MP_OBJ_IS_TYPE(seq_in, &list_type)) { + if (MP_OBJ_IS_TYPE(seq_in, &mp_type_tuple) || MP_OBJ_IS_TYPE(seq_in, &list_type)) { mp_obj_t *seq_items; - if (MP_OBJ_IS_TYPE(seq_in, &tuple_type)) { + if (MP_OBJ_IS_TYPE(seq_in, &mp_type_tuple)) { mp_obj_tuple_get(seq_in, &seq_len, &seq_items); } else { mp_obj_list_get(seq_in, &seq_len, &seq_items); |