* eval.c (eval_init): Follow function renames.

* hash.c (make_hash): Likewise.

* lib.c (assq): Renamed to assql for consistency.
(aconsq_new): Renamed to aconsql_new.
(aconsq_new_l): Renamed to aconsql_new_l.
(alist_remove_test): Use equal rather than eq. Association lists
use equal equality by default.
(alist_nremove): Use memqual rather than memq.
(alist_nremove1): Use equal rather than eq.
(merge): Bugfix: unnecessary consing caused by using append
instead of nconc on list pieces that are already destructively
chopped up. This has implications for the efficiency of sort
over lists!
(multi_sort_less): Implement key functions.
(multi_sort): Interface change: arguments rearranged, and new
argument to specify key functions.

* lib.h (assoc, assq, assql, aconsq_new, aconsq_new_l): Declarations
renamed.
(multi_sort): Declaration updated.

* txr.1: Documented alist library, list sorting and completed
documenting lazy library.

* txr.vim: multi-sort highlighted.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib.h b/lib.h
index 475dfe7b..eedaa1cb 100644
--- a/lib.h
+++ b/lib.h
@@ -618,12 +618,12 @@ mem_t *cobj_handle(val cobj, val cls_sym);
 val cptr(mem_t *ptr);
 mem_t *cptr_get(val cptr);
 val assoc(val key, val list);
-val assq(val key, val list);
+val assql(val key, val list);
 val acons(val car, val cdr, val list);
 val acons_new(val key, val value, val list);
 val *acons_new_l(val key, val *new_p, val *list);
-val aconsq_new(val key, val value, val list);
-val *aconsq_new_l(val key, val *new_p, val *list);
+val aconsql_new(val key, val value, val list);
+val *aconsql_new_l(val key, val *new_p, val *list);
 val alist_remove(val list, val keys);
 val alist_remove1(val list, val key);
 val alist_nremove(val list, val keys);
@@ -635,7 +635,7 @@ val mapcon(val fun, val list);
 val mappend(val fun, val list);
 val merge(val list1, val list2, val lessfun, val keyfun);
 val sort(val seq, val lessfun, val keyfun);
-val multi_sort(val funcs, val lists);
+val multi_sort(val lists, val funcs, val key_funcs);
 val find(val list, val key, val testfun, val keyfun);
 val find_if(val pred, val list, val key);
 val set_diff(val list1, val list2, val testfun, val keyfun);