diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-11 01:41:11 -0800 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-11 01:41:11 -0800 |
| commit | 683466e55f2221cbd6b05106732c885bd324bc21 (patch) | |
| tree | 714b75f2779b79b826d745c13f725835001f787f /py/objlist.c | |
| parent | ad97f2a49ea723cf21f828c99e0075ff1fd0680a (diff) | |
| parent | b8698fca75018b5cacaf9b2fdfd821f86b8acaf4 (diff) | |
Merge pull request #138 from chipaca/unify_bops
Merge RT_COMPARE_OPs with RT_BINARY_OPs.
Diffstat (limited to 'py/objlist.c')
| -rw-r--r-- | py/objlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objlist.c b/py/objlist.c index ce55aa510..7d0402d28 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -143,8 +143,8 @@ static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool r mp_obj_t *t = tail; mp_obj_t v = key_fn == NULL ? tail[0] : rt_call_function_1(key_fn, tail[0]); // get pivot using key_fn for (;;) { - do ++h; while (rt_compare_op(op, key_fn == NULL ? h[0] : rt_call_function_1(key_fn, h[0]), v) == mp_const_true); - do --t; while (h < t && rt_compare_op(op, v, key_fn == NULL ? t[0] : rt_call_function_1(key_fn, t[0])) == mp_const_true); + do ++h; while (rt_binary_op(op, key_fn == NULL ? h[0] : rt_call_function_1(key_fn, h[0]), v) == mp_const_true); + do --t; while (h < t && rt_binary_op(op, v, key_fn == NULL ? t[0] : rt_call_function_1(key_fn, t[0])) == mp_const_true); if (h >= t) break; mp_obj_t x = h[0]; h[0] = t[0]; |