From dd9f7f30e879123e57a32492c7c82d9d2b361678 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 29 Aug 2012 18:34:25 -0700 Subject: * eval.c (mapcarv): Changed to external linkage. * eval.h (mapcarv): Declaration added. (eval_init): New intrinsic multi-sort registered. * lib.c (multi_sort_less): New static function. (multi_sort): New function. * lib.h (multi_sort): Declared. * txr.1: stub section added. --- lib.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'lib.c') diff --git a/lib.c b/lib.c index acaccf72..7c15a864 100644 --- a/lib.c +++ b/lib.c @@ -3994,6 +3994,37 @@ val sort(val seq, val lessfun, val keyfun) return seq; } +static val multi_sort_less(val funcs, val llist, val rlist) +{ + val less = nil; + + while (funcs) { + val func = pop(&funcs); + val left = pop(&llist); + val right = pop(&rlist); + + if (funcall2(func, left, right)) { + less = t; + break; + } + + if (funcall2(func, right, left)) + break; + } + + return less; +} + +val multi_sort(val funcs, val lists) +{ + val lol = mapcarv(func_n0v(identity), lists); + + if (functionp(funcs)) + funcs = cons(funcs, nil); + + return sort_list(lol, func_f2(funcs, multi_sort_less), identity_f); +} + val find(val item, val list, val testfun, val keyfun) { if (!keyfun) -- cgit v1.2.3