diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-14 15:13:40 -0800 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-14 15:13:40 -0800 |
| commit | 6c2401e935b38ca87fd8f52efbb614a428b6938c (patch) | |
| tree | 9314200eddfd45d99491cb29f47533404ef030f5 /py/runtime.c | |
| parent | 8bc96471f0219b9d3f24ae879f60b509927e1df4 (diff) | |
| parent | 93451002f04e0b89e41e1faa82f86e937bb219f1 (diff) | |
| download | micropython-6c2401e935b38ca87fd8f52efbb614a428b6938c.tar.gz micropython-6c2401e935b38ca87fd8f52efbb614a428b6938c.zip | |
Merge pull request #165 from chipaca/builtins
added zip()
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c index b2d9c7e960..dc3d15657c 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -113,6 +113,7 @@ void rt_init(void) { 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); + mp_map_add_qstr(&map_builtins, MP_QSTR_zip, (mp_obj_t)&zip_type); // built-in user functions mp_map_add_qstr(&map_builtins, MP_QSTR_abs, (mp_obj_t)&mp_builtin_abs_obj); @@ -133,6 +134,7 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_pow, (mp_obj_t)&mp_builtin_pow_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_print, (mp_obj_t)&mp_builtin_print_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_range, (mp_obj_t)&mp_builtin_range_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_sorted, (mp_obj_t)&mp_builtin_sorted_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_sum, (mp_obj_t)&mp_builtin_sum_obj); next_unique_code_id = 1; // 0 indicates "no code" |