From cddd91863740e560ae95ccdd2be5aa0e128713ed Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 22 Jul 2021 07:18:58 -0700 Subject: hash: change make_hash interface. The make_hash function now takes the hash_weak_opt_t enumeration instead of a pair of flags. * hash.c (do_make_hash): Take enum argument instead of pair of flags. Just store the option; nothing to calculate. (weak_opt_from_flags): New static function. (tweak_hash): Function removed. (make_seeded_hash): Adjust to new do_make_hash interface with help from weak_opt_from_flags. (make_hash, make_eq_hash): Take enum argument instead of pair of flags. (hashv): Calculate hash_weak_opt_t enum from the extracted flags, pass down to make_eq_hash or make_hash. * hash.h (tweak_hash): Declration removed. (make_hash, make_eq_hash): Declarations updated. * eval.c (me_case, expand_switch): Update make_hash calls to new style. (eval_init): Update make_hash calls and get rid of tweak_hash calls. This renders the tweak_hash function unused. * ffi.c (make_ffi_type_enum, ffi_init): Update make_hash calls to new style. * filter.c (make_trie, trie_add, filter_init): Likewise. * lib.c (make_package_common, obj_init, obj_print): Likewise. * lisplib.c (lisplib_init): Likewise. * match.c (dir_tables_init): Likewise. * parser.c (parser_circ_def, repl, parse_init): Likewise. * parser.l (parser_l_init): Likewise. * struct.c (struct_init, get_slot_syms): Likewise. * sysif.c (get_env_hash): Likewise. * lex.yy.c.shipped, y.tab.c.shipped: Updated. --- eval.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index bb96d0cf..4ecd220c 100644 --- a/eval.c +++ b/eval.c @@ -4128,15 +4128,15 @@ static val me_case(val form, val menv) if (casesym == caseq_s || casesym == caseq_star_s) { memfuncsym = memq_s; eqfuncsym = eq_s; - hash = make_hash(nil, nil, nil); + hash = make_hash(hash_weak_none, nil); } else if (casesym == caseql_s || casesym == caseql_star_s) { memfuncsym = memql_s; eqfuncsym = eql_s; - hash = make_hash(nil, nil, nil); + hash = make_hash(hash_weak_none, nil); } else { memfuncsym = memqual_s; eqfuncsym = equal_s; - hash = make_hash(nil, nil, t); + hash = make_hash(hash_weak_none, t); } for (; consp(form); form = cdr(form)) { @@ -4723,7 +4723,7 @@ static val expand_switch(val form, val menv) val branches = second(args); val expr_ex = expand(expr, menv); val branches_ex; - val ss_hash = make_hash(nil, nil, nil); + val ss_hash = make_hash(hash_weak_none, nil); if (listp(branches)) { branches_ex = expand_list_of_form_lists(branches, menv, ss_hash); @@ -6488,21 +6488,14 @@ void eval_init(void) &call_f, &iter_begin_f, &iter_from_binding_f, &iter_more_f, &iter_item_f, &iter_step_f, &unbound_s, &origin_hash, &const_foldable_hash, convert(val *, 0)); - top_fb = make_hash(nil, nil, nil); - top_vb = make_hash(nil, nil, nil); - top_mb = make_hash(nil, nil, nil); - top_smb = make_hash(nil, nil, nil); - special = make_hash(nil, nil, nil); - builtin = make_hash(nil, nil, nil); - op_table = make_hash(nil, nil, nil); - pm_table = make_hash(nil, nil, nil); - - tweak_hash(top_fb, hash_weak_and); - tweak_hash(top_vb, hash_weak_and); - tweak_hash(top_mb, hash_weak_and); - tweak_hash(top_smb, hash_weak_and); - tweak_hash(special, hash_weak_and); - tweak_hash(builtin, hash_weak_and); + top_fb = make_hash(hash_weak_and, nil); + top_vb = make_hash(hash_weak_and, nil); + top_mb = make_hash(hash_weak_and, nil); + top_smb = make_hash(hash_weak_and, nil); + special = make_hash(hash_weak_and, nil); + builtin = make_hash(hash_weak_and, nil); + op_table = make_hash(hash_weak_none, nil); + pm_table = make_hash(hash_weak_none, nil); call_f = func_n1v(generic_funcall); iter_begin_f = func_n1(iter_begin); @@ -6511,7 +6504,7 @@ void eval_init(void) iter_item_f = func_n1(iter_item); iter_step_f = func_n1(iter_step); - origin_hash = make_eq_hash(t, nil); + origin_hash = make_eq_hash(hash_weak_keys); dwim_s = intern(lit("dwim"), user_package); progn_s = intern(lit("progn"), user_package); -- cgit v1.2.3