diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:39:03 +0000 |
| commit | 4899ff9470734f0593bbe1f5272bc3d23facf7f7 (patch) | |
| tree | 929b1674e445726b50e3ff2acc1e5706e9b8f5ea /py/runtime.c | |
| parent | 7a9d0c454076b6524f3f6f5af9a6b28bc35da2f9 (diff) | |
| parent | 36c4499d36a36ab3e1a68545e613bce61fb15f3c (diff) | |
Merge branch 'str-repr' of github.com:pfalcon/micropython into pfalcon-str-repr
Conflicts:
tests/basics/tests/exception1.py
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c index 18a3269f4..e1e9e31cc 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -141,6 +141,7 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_repr, (mp_obj_t)&mp_builtin_repr_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); + mp_map_add_qstr(&map_builtins, MP_QSTR_str, (mp_obj_t)&mp_builtin_str_obj); next_unique_code_id = 1; // 0 indicates "no code" unique_codes_alloc = 0; |