From 07ddab529cb0953c473d30795e4dc3c6dfff0d89 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 29 Mar 2014 13:15:08 +0000 Subject: py: Change mp_const_* objects to macros. Addresses issue #388. --- py/builtintables.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'py/builtintables.c') diff --git a/py/builtintables.c b/py/builtintables.c index 839d5ba813..ac9eed8d46 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -25,7 +25,7 @@ STATIC const mp_builtin_elem_t builtin_object_table[] = { { MP_QSTR___repl_print__, (mp_obj_t)&mp_builtin___repl_print___obj }, // built-in types - { MP_QSTR_bool, (mp_obj_t)&bool_type }, + { MP_QSTR_bool, (mp_obj_t)&mp_type_bool }, { MP_QSTR_bytes, (mp_obj_t)&bytes_type }, #if MICROPY_ENABLE_FLOAT { MP_QSTR_complex, (mp_obj_t)&mp_type_complex }, @@ -43,13 +43,16 @@ STATIC const mp_builtin_elem_t builtin_object_table[] = { { MP_QSTR_set, (mp_obj_t)&set_type }, { MP_QSTR_str, (mp_obj_t)&str_type }, { MP_QSTR_super, (mp_obj_t)&super_type }, - { MP_QSTR_tuple, (mp_obj_t)&tuple_type }, + { MP_QSTR_tuple, (mp_obj_t)&mp_type_tuple }, { MP_QSTR_type, (mp_obj_t)&mp_type_type }, { MP_QSTR_zip, (mp_obj_t)&zip_type }, { MP_QSTR_classmethod, (mp_obj_t)&mp_type_classmethod }, { MP_QSTR_staticmethod, (mp_obj_t)&mp_type_staticmethod }, + // built-in objects + { MP_QSTR_Ellipsis, (mp_obj_t)&mp_const_ellipsis_obj }, + // built-in user functions { MP_QSTR_abs, (mp_obj_t)&mp_builtin_abs_obj }, { MP_QSTR_all, (mp_obj_t)&mp_builtin_all_obj }, -- cgit v1.2.3