commit 07ddab529cb0953c473d30795e4dc3c6dfff0d89
author Damien George <damien.p.george@gmail.com> Sat Mar 29 13:15:08 2014 +0000
committer Damien George <damien.p.george@gmail.com> Sat Mar 29 13:15:08 2014 +0000
tree ba3cba6f7b35f7a3098d044b77a9d6cd61c2ec3a
parent da51a399cf628699546f77f320ef0388a268b49f

py: Change mp_const_* objects to macros.

Addresses issue #388.

py/runtime.c

diff --git a/py/runtime.c b/py/runtime.c
index 3f637a1..4dc1c2e 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -51,7 +51,6 @@
 
     // 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 @@
 // 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);