diff options
author | Damien George <damien.p.george@gmail.com> | 2014-01-08 17:33:12 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-01-08 17:33:12 +0000 |
commit | 38a2da68c2e02b8fc5ae308ca9e3b667f8a0aedc (patch) | |
tree | 8bf705c9aff2013e1949e5edd803893113d385d3 /py/objlist.c | |
parent | ea9e441a75d7ea6633b0ea95b21667c48a6f7b6a (diff) | |
download | micropython-38a2da68c2e02b8fc5ae308ca9e3b667f8a0aedc.tar.gz micropython-38a2da68c2e02b8fc5ae308ca9e3b667f8a0aedc.zip |
py: Stuff qstr in object pointer; keys for mp_map_t are now always mp_obj_t.
Diffstat (limited to 'py/objlist.c')
-rw-r--r-- | py/objlist.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/py/objlist.c b/py/objlist.c index e3d92b9e92..9d8caee339 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -146,8 +146,6 @@ static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool r static mp_obj_t list_sort(mp_obj_t args, mp_map_t *kwargs) { mp_obj_t *args_items = NULL; uint args_len = 0; - qstr key_idx = qstr_from_str_static("key"); - qstr reverse_idx = qstr_from_str_static("reverse"); assert(MP_OBJ_IS_TYPE(args, &tuple_type)); mp_obj_tuple_get(args, &args_len, &args_items); @@ -158,8 +156,8 @@ static mp_obj_t list_sort(mp_obj_t args, mp_map_t *kwargs) { } mp_obj_list_t *self = args_items[0]; if (self->len > 1) { - mp_map_elem_t *keyfun = mp_qstr_map_lookup(kwargs, key_idx, false); - mp_map_elem_t *reverse = mp_qstr_map_lookup(kwargs, reverse_idx, false); + mp_map_elem_t *keyfun = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(qstr_from_str_static("key")), MP_MAP_LOOKUP); + mp_map_elem_t *reverse = mp_map_lookup(kwargs, MP_OBJ_NEW_QSTR(qstr_from_str_static("reverse")), MP_MAP_LOOKUP); mp_quicksort(self->items, self->items + self->len - 1, keyfun ? keyfun->value : NULL, reverse && reverse->value ? rt_is_true(reverse->value) : false); |