diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:27:16 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:27:16 +0000 |
| commit | 7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9 (patch) | |
| tree | 3e81f1de60290376389d396f61782f93940f1d59 /py/runtime.c | |
| parent | 11507f4074c4cece88e3f8a404c07653b40a167a (diff) | |
| parent | fca456bc3c0e3c43b2ef598ba1b352e0c27a2778 (diff) | |
| download | micropython-7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9.tar.gz micropython-7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9.zip | |
Merge branch 'builtins' of github.com:chipaca/micropython into chipaca-builtins
Added some checks for number of arguments.
Conflicts:
py/mpqstrraw.h
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c index 594f79d847..18a3269f49 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -105,11 +105,14 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_complex, (mp_obj_t)&complex_type); #endif mp_map_add_qstr(&map_builtins, MP_QSTR_dict, (mp_obj_t)&dict_type); + mp_map_add_qstr(&map_builtins, MP_QSTR_enumerate, (mp_obj_t)&enumerate_type); + mp_map_add_qstr(&map_builtins, MP_QSTR_filter, (mp_obj_t)&filter_type); #if MICROPY_ENABLE_FLOAT mp_map_add_qstr(&map_builtins, MP_QSTR_float, (mp_obj_t)&float_type); #endif mp_map_add_qstr(&map_builtins, MP_QSTR_int, (mp_obj_t)&int_type); mp_map_add_qstr(&map_builtins, MP_QSTR_list, (mp_obj_t)&list_type); + mp_map_add_qstr(&map_builtins, MP_QSTR_map, (mp_obj_t)&map_type); mp_map_add_qstr(&map_builtins, MP_QSTR_set, (mp_obj_t)&set_type); mp_map_add_qstr(&map_builtins, MP_QSTR_tuple, (mp_obj_t)&tuple_type); mp_map_add_qstr(&map_builtins, MP_QSTR_type, (mp_obj_t)&mp_const_type); |