summaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2021-12-29 18:59:27 -0800
committerKaz Kylheku <kaz@kylheku.com>2021-12-29 23:42:14 -0800
commit5f67b95d218e1ef3473c39bca2f6491503aeeabe (patch)
tree095d53b02f0093911e06ab06221d0529f6f7da42 /hash.c
parent0b6c09e067981c232cef09f0d82fb9b4a9864553 (diff)
downloadtxr-5f67b95d218e1ef3473c39bca2f6491503aeeabe.tar.gz
txr-5f67b95d218e1ef3473c39bca2f6491503aeeabe.tar.bz2
txr-5f67b95d218e1ef3473c39bca2f6491503aeeabe.zip
Eliminate declaration-after-statement everywhere.
The use of -ansi doesn't by itself diagnose instances of some constructs we don't want in the project, like mixed declarations and statements. * configure (diag_flags): Add -Werror=declaration-after-statement. This is C only, so filter it out for C++. Also add -Werror=vla. * HACKING: Update inaccurate statements about what dialect we are using. TXR isn't pure C90: some GCC extensions are used. We even use long long if the configure script detects it as working, and some C99 library features. * buf.c (replace_buf, buf_list): Fix by reordering. * eval.c (op_dohash, op_load_time_lit): Fix by reordering. * ffi.c (ffi_simple_release): Fix by reordering. (align_sw_get): Fix empty macro to expand to dummy declaration so a semicolon after it isn't interpreted as a statement. On platforms with alignment, remove a semicolon from the macro so that it requires one. (ffi_i8_put, ffi_u8_put): Fix by reordering. * gc.c (gc_init): Fix with extra braces. * hash.c (hash_init): Fix by reordering. * lib.c (list_collect_revappend, sub_iter, replace_str, replace_vec, mapcar_listout, mappend, mapdo, window_map_list, subst): Fix by reordering. (gensym, find, rfind, pos, rpos, in, search_common): Fix by renaming optional argument and using declaration instead of assignment. * linenoise/linenoise.c (edit_in_editor): Fix by reordering. * parser.c (is_balanced_line): Fix by reordering. * regex.c (nfa_count_one, print_rec): Fix by reordering. * signal.c (sig_mask): Fix by reordering. * stream.c (get_string): Fix by renaming optional argument and using declaration instead of assignment. * struct.c (lookup_static_slot_desc): Fix by turning mutated variable into block local. (umethod_args_fun): Fix by reordering. (get_special_slot): Fix by new scope via braces. * sysif.c (usleep_wrap): Fix by new scope via braces. (setrlimit_wrap): Fix by new scope via braces. * time.c (time_string_meth, time_parse_meth): Fix by reordering. * tree.c (tr_do_delete_spec): Fix by new scope via braces. * unwind.h (uw_block_beg): New macro which doesn't define RESULTVAR but expects it to refers to an existing one. (uw_block_begin): Replace do while (0) with enum trick so that we have a declaration that requires a semicolon, rather than a statement, allowing declarations to follow. (uw_match_env_begin): Now opens a scope and features the same enum trick as in uw_block_begin. This fixes a declaration-follows-statement issue in the v_output function in match.c. (uw_match_env_end): Closes scope opened by uw_match_env_begin. * unwind.c (revive_cont): Fix by introducing variable, and using new uw_block_beg macro. * vm.c (vm_execute_closure): Fix using combination of local variable and reordering.
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hash.c b/hash.c
index ccc10507..56533556 100644
--- a/hash.c
+++ b/hash.c
@@ -2096,6 +2096,8 @@ void hash_early_init(void)
void hash_init(void)
{
+ val ghu = func_n1(get_hash_userdata);
+
weak_keys_k = intern(lit("weak-keys"), keyword_package);
weak_vals_k = intern(lit("weak-vals"), keyword_package);
weak_and_k = intern(lit("weak-and"), keyword_package);
@@ -2105,7 +2107,6 @@ void hash_init(void)
eq_based_k = intern(lit("eq-based"), keyword_package);
userdata_k = intern(lit("userdata"), keyword_package);
hash_seed_s = intern(lit("*hash-seed*"), user_package);
- val ghu = func_n1(get_hash_userdata);
hash_cls->cls_sym = hash_s;
hash_iter_cls->cls_sym = hash_iter_s;