hash: rename cl__make_hash_table to ecl_make_hash_table

The latter name follows the codebase convention that functions that do not work
in the environment have a prefix ecl_. The old name is defined in legacy.h.
This commit is contained in:
Daniel Kochmański 2026-03-12 09:49:30 +01:00
parent 57b23ec224
commit 07bcb949fb
11 changed files with 18 additions and 17 deletions

View file

@ -3108,7 +3108,7 @@ cl_object
si_need_to_make_load_form_p(cl_object object)
{
cl_object load_form_cache =
cl__make_hash_table(@'eq',
ecl_make_hash_table(@'eq',
ecl_make_fixnum(16),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
@ -3803,7 +3803,7 @@ init_compiler()
{
cl_object dispatch_table =
cl_core.compiler_dispatch =
cl__make_hash_table(@'eq', ecl_make_fixnum(128), /* size */
ecl_make_hash_table(@'eq', ecl_make_fixnum(128), /* size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
int i;

View file

@ -946,9 +946,9 @@ ecl_extend_hashtable(cl_object hashtable)
(rehash_size ecl_ct_default_rehash_size)
(rehash_threshold ecl_ct_default_rehash_threshold))
@ {
cl_object hash = cl__make_hash_table(test, size, rehash_size, rehash_threshold);
cl_object hash = ecl_make_hash_table(test, size, rehash_size, rehash_threshold);
if (hash->hash.test == ecl_htt_generic) {
/* Normally we would make hash_function an argument to cl__make_hash_table
/* Normally we would make hash_function an argument to ecl_make_hash_table
and put this test in there and void unnecessary object allocation, but
we do not want to compromise the API. -- jd 2019-05-23 */
if (hash_function == ECL_NIL) {
@ -1019,7 +1019,7 @@ do_clrhash(cl_object ht)
ecl_def_ct_single_float(min_threshold, 0.1, static, const);
cl_object
cl__make_hash_table(cl_object test, cl_object size, cl_object rehash_size,
ecl_make_hash_table(cl_object test, cl_object size, cl_object rehash_size,
cl_object rehash_threshold)
{
int htt;
@ -1508,7 +1508,7 @@ si_copy_hash_table(cl_object orig)
{
const cl_env_ptr the_env = ecl_process_env();
cl_object hash;
hash = cl__make_hash_table(cl_hash_table_test(orig),
hash = ecl_make_hash_table(cl_hash_table_test(orig),
cl_hash_table_size(orig),
cl_hash_table_rehash_size(orig),
cl_hash_table_rehash_threshold(orig));

View file

@ -644,7 +644,7 @@ cl_boot(int argc, char **argv)
* need EQUALP because it has to be case insensitive.
*/
cl_core.char_names = aux =
cl__make_hash_table(@'equalp', ecl_make_fixnum(128), /* size */
ecl_make_hash_table(@'equalp', ecl_make_fixnum(128), /* size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
for (i = 0; char_names[i].elt.self; i++) {
@ -671,7 +671,7 @@ cl_boot(int argc, char **argv)
* Initialize constants (strings, numbers and time).
*/
cl_core.system_properties =
cl__make_hash_table(@'equal', ecl_make_fixnum(1024), /* size */
ecl_make_hash_table(@'equal', ecl_make_fixnum(1024), /* size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
@ -738,7 +738,7 @@ cl_boot(int argc, char **argv)
* Set up infrastructure for CLOS.
*/
ECL_SET(@'si::*class-name-hash-table*',
cl__make_hash_table(@'eq', ecl_make_fixnum(1024), /* size */
ecl_make_hash_table(@'eq', ecl_make_fixnum(1024), /* size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold));

View file

@ -112,7 +112,7 @@ symbol_add_package(cl_object s, cl_object p)
static cl_object
make_package_hashtable()
{
return cl__make_hash_table(@'package', /* package hash table */
return ecl_make_hash_table(@'package', /* package hash table */
ecl_make_fixnum(128), /* initial size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);

View file

@ -94,7 +94,7 @@ si_write_object_with_circle(cl_object x, cl_object stream, cl_object print_funct
circle_counter = ecl_cmp_symbol_value(env, @'si::*circle-counter*');
if (circle_counter == ECL_NIL) {
cl_object hash =
cl__make_hash_table(@'eq',
ecl_make_hash_table(@'eq',
ecl_make_fixnum(1024),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);

View file

@ -251,7 +251,7 @@ patch_sharp(const cl_env_ptr the_env, cl_object x)
return x;
} else {
cl_object table =
cl__make_hash_table(@'eq', ecl_make_fixnum(20), /* size */
ecl_make_hash_table(@'eq', ecl_make_fixnum(20), /* size */
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
do {
@ -828,7 +828,7 @@ ecl_copy_readtable(cl_object from, cl_object to)
assert_type_readtable(@[make-dispatch-macro-character], 3, readtable);
c = ecl_char_code(chr);
cat = Null(non_terminating_p)? cat_terminating : cat_non_terminating;
table = cl__make_hash_table(@'eql', ecl_make_fixnum(128),
table = ecl_make_hash_table(@'eql', ecl_make_fixnum(128),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
ecl_readtable_set(readtable, c, cat, cl_core.dispatch_reader, table);

View file

@ -66,7 +66,7 @@ ecl_readtable_set(cl_object readtable, int c, enum ecl_chattrib cat,
if (c >= RTABSIZE) {
cl_object hash = readtable->readtable.hash;
if (Null(hash)) {
hash = cl__make_hash_table(@'eql', ecl_make_fixnum(128),
hash = ecl_make_hash_table(@'eql', ecl_make_fixnum(128),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
readtable->readtable.hash = hash;

View file

@ -349,7 +349,7 @@ init_pool(pool_t pool, cl_object root)
ecl_make_fixnum(2 * sizeof(cl_index)),
ECL_NIL,
ecl_make_fixnum(0));
pool->hash = cl__make_hash_table(@'eql', ecl_make_fixnum(256),
pool->hash = ecl_make_hash_table(@'eql', ecl_make_fixnum(256),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
ecl_sethash(root, pool->hash, ecl_make_fixnum(0));

View file

@ -1473,7 +1473,7 @@ create_signal_code_constants()
{
cl_object hash =
ecl_core.known_signals =
cl__make_hash_table(@'eql', ecl_make_fixnum(128),
ecl_make_hash_table(@'eql', ecl_make_fixnum(128),
ecl_ct_default_rehash_size,
ecl_ct_default_rehash_threshold);
int i;

View file

@ -816,7 +816,7 @@ extern ECL_API cl_object _ecl_standard_dispatch(cl_object frame, cl_object fun);
/* hash.c */
extern ECL_API cl_object cl__make_hash_table(cl_object test, cl_object size, cl_object rehash_size, cl_object rehash_threshold);
extern ECL_API cl_object ecl_make_hash_table(cl_object test, cl_object size, cl_object rehash_size, cl_object rehash_threshold);
extern ECL_API cl_object cl_hash_table_p(cl_object ht);
extern ECL_API cl_object si_hash_set(cl_object key, cl_object ht, cl_object val);
extern ECL_API cl_object cl_remhash(cl_object key, cl_object ht);

View file

@ -59,6 +59,7 @@
#define cl_alloc_simple_extended_string ecl_alloc_simple_extended_string
#define ecl_search_hash _ecl_gethash
#define cl__make_hash_table ecl_make_hash_table
#define read_VV ecl_init_module