summaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-09-02 03:31:01 -0700
committerKaz Kylheku <kaz@kylheku.com>2012-09-02 03:31:01 -0700
commitdb7b65f8c76cc6734f984d181945d4965742c4da (patch)
tree2669bcca8fe8ae5ee10c0c32d0484e89f19ba914 /hash.c
parent689203c7c023c39c83f6419aa76d9562b1d148f5 (diff)
downloadtxr-db7b65f8c76cc6734f984d181945d4965742c4da.tar.gz
txr-db7b65f8c76cc6734f984d181945d4965742c4da.tar.bz2
txr-db7b65f8c76cc6734f984d181945d4965742c4da.zip
* 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.
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hash.c b/hash.c
index 03967967..68f5929c 100644
--- a/hash.c
+++ b/hash.c
@@ -364,8 +364,8 @@ val make_hash(val weak_keys, val weak_vals, val equal_based)
h->userdata = nil;
h->hash_fun = equal_based ? equal_hash : eql_hash;
- h->assoc_fun = equal_based ? assoc : assq;
- h->acons_new_l_fun = equal_based ? acons_new_l : aconsq_new_l;
+ h->assoc_fun = equal_based ? assoc : assql;
+ h->acons_new_l_fun = equal_based ? acons_new_l : aconsql_new_l;
return hash;
}