diff options
author | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
commit | b3a50f0f3e287d63fce274e29641a3bc57405d5d (patch) | |
tree | 1db867d2e5c40d9cd530424c022768f6f282251f /py/builtintables.c | |
parent | ed07d035d52764b3b02bfa8488f2e0445c28ea2f (diff) | |
parent | 8993fb6cf0677ce980ab56cbad326e4e6bc47811 (diff) | |
download | micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.tar.gz micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.zip |
Merge branch 'master' into unicode
Conflicts:
py/mpconfig.h
Diffstat (limited to 'py/builtintables.c')
-rw-r--r-- | py/builtintables.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/builtintables.c b/py/builtintables.c index 8b4df93177..c42cdf89bb 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -43,7 +43,9 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = { // built-in types { MP_OBJ_NEW_QSTR(MP_QSTR_bool), (mp_obj_t)&mp_type_bool }, { MP_OBJ_NEW_QSTR(MP_QSTR_bytes), (mp_obj_t)&mp_type_bytes }, +#if MICROPY_PY_BUILTINS_BYTEARRAY { MP_OBJ_NEW_QSTR(MP_QSTR_bytearray), (mp_obj_t)&mp_type_bytearray }, +#endif #if MICROPY_PY_BUILTINS_COMPLEX { MP_OBJ_NEW_QSTR(MP_QSTR_complex), (mp_obj_t)&mp_type_complex }, #endif @@ -160,7 +162,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___main__), (mp_obj_t)&mp_module___main__ }, { MP_OBJ_NEW_QSTR(MP_QSTR_micropython), (mp_obj_t)&mp_module_micropython }, +#if MICROPY_PY_ARRAY { MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&mp_module_array }, +#endif #if MICROPY_PY_IO { MP_OBJ_NEW_QSTR(MP_QSTR__io), (mp_obj_t)&mp_module_io }, #endif |