* 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, 3 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index 60e0cebf..5ef0f34e 100644
--- a/eval.c
+++ b/eval.c
@@ -2372,10 +2372,10 @@ void eval_init(void)
   reg_fun(intern(lit("cat-vec"), user_package), func_n1(cat_vec));
 
   reg_fun(intern(lit("assoc"), user_package), func_n2(assoc));
-  reg_fun(intern(lit("assq"), user_package), func_n2(assq));
+  reg_fun(intern(lit("assql"), user_package), func_n2(assql));
   reg_fun(intern(lit("acons"), user_package), func_n3(acons));
   reg_fun(intern(lit("acons-new"), user_package), func_n3(acons_new));
-  reg_fun(intern(lit("aconsq-new"), user_package), func_n3(aconsq_new));
+  reg_fun(intern(lit("aconsql-new"), user_package), func_n3(aconsql_new));
   reg_fun(intern(lit("alist-remove"), user_package), func_n1v(alist_remove));
   reg_fun(intern(lit("alist-nremove"), user_package), func_n1v(alist_nremove));
   reg_fun(intern(lit("copy-cons"), user_package), func_n1(copy_cons));
@@ -2383,7 +2383,7 @@ void eval_init(void)
   reg_fun(intern(lit("merge"), user_package), func_n4o(merge, 2));
   reg_fun(intern(lit("sort"), user_package), func_n3o(sort, 2));
   reg_fun(intern(lit("find"), user_package), func_n4o(find, 2));
-  reg_fun(intern(lit("multi-sort"), user_package), func_n2(multi_sort));
+  reg_fun(intern(lit("multi-sort"), user_package), func_n3o(multi_sort, 2));
   reg_fun(intern(lit("find-if"), user_package), func_n3o(find_if, 2));
   reg_fun(intern(lit("set-diff"), user_package), func_n4o(set_diff, 2));