Version 176.txr-176

* RELNOTES: Updated.

* configure, txr.1: Bumped version and date.

* share/txr/stdlib/ver.tl: Likewise.

* txr.vim, tl.vim, protsym.c: Regenerated.

1 files changed, 238 insertions, 180 deletions

diff --git a/protsym.c b/protsym.c
index 408fe88c..67321db6 100644
--- a/protsym.c
+++ b/protsym.c
@@ -31,195 +31,253 @@
 #include "config.h"
 #include "lib.h"
 
-extern val accept_s, addr_k, addr_s, addrinfo_s, all_s;
-extern val and_s, ap_s, apf_s, append_each_s, append_each_star_s;
-extern val append_k, append_s, apply_s, aret_s, args_k;
-extern val array_s, assert_s, atime_k, atime_s, atom_s;
-extern val auto_k, bchar_s, bignum_s, bind_s, blksize_k;
-extern val blksize_s, block_s, block_star_s, blocks_k, blocks_s;
-extern val bstr_d_s, bstr_s, buf_d_s, buf_s, byte_oriented_k;
-extern val call_s, canonname_s, car_s, caseq_s, caseq_star_s;
-extern val caseql_s, caseql_star_s, casequal_s, casequal_star_s, cases_s;
-extern val cat_s, catch_s, cc_s, cdigit_k, cdr_s;
-extern val cflag_s, chain_s, chand_s, char_s, chars_k;
-extern val choose_s, chr_s, chset_s, circref_s, close_s;
-extern val closure_s, cobj_s, coll_s, collect_each_s, collect_each_star_s;
-extern val collect_s, colon_k, compl_s, compound_s, cond_s;
-extern val cons_s, continue_k, continue_s, counter_k, cptr_s;
-extern val cset_s, cspace_k, ctime_k, ctime_s, cword_char_k;
-extern val data_s, day_s, debug_quit_s, decline_k, defex_s;
-extern val deffilter_s, define_s, defmacro_s, defparm_s, defparml_s;
-extern val defr_warning_s, defsymacro_s, defun_s, defvar_s, defvarl_s;
-extern val dev_k, dev_s, digit_k, dir_s, do_s;
-extern val dohash_s, domainname_s, double_s, downcase_k, dst_s;
-extern val dvbind_s, dwim_s, each_op_s, each_s, each_star_s;
-extern val empty_s, env_k, env_s, eof_s, eol_s;
-extern val eq_s, eql_s, equal_based_k, equal_s, error_s;
-extern val eval_error_s, expr_s, fail_s, family_s, fbind_s;
-extern val fd_k, ffi_call_desc_s, ffi_closure_s, ffi_type_s, file_error_s;
-extern val filter_k, filter_s, finally_s, finish_k, first_s;
-extern val fixnum_s, flags_s, flatten_s, flet_s, float_s;
-extern val flow_info_s, for_op_s, for_s, for_star_s, force_s;
-extern val forget_s, form_k, format_s, freeform_s, from_current_k;
-extern val from_end_k, from_list_s, from_start_k, frombase64_k, fromhtml_k;
-extern val frompercent_k, fromurl_k, fun_k, fun_s, fuzz_s;
-extern val gap_k, gather_s, gecos_s, gen_s, generate_s;
-extern val gensym_counter_s, gid_k, gid_s, gmtoff_s, greedy_k;
-extern val group_s, gun_s, handler_bind_s, hash_construct_s, hash_iter_s;
-extern val hash_lit_s, hash_s, hextoint_k, hour_s, iapply_s;
-extern val identity_s, if_s, iflag_s, iflet_s, in_package_s;
-extern val inc_s, include_s, ino_k, ino_s, int16_s;
-extern val int32_s, int64_s, int8_s, int_s, integer_s;
-extern val internal_error_s, into_k, intr_s, ipf_s, ispeed_s;
-extern val keyword_package_s, labels_s, lambda_s, lambda_set_s, last_s;
-extern val lbind_s, lcons_s, let_s, let_star_s, lfilt_k;
-extern val lflag_s, line_s, lines_k, lisp1_setq_s, list_k;
+#if HAVE_GRGID
+extern val group_s, mem_s;
+#endif
+#if HAVE_PWUID
+extern val dir_s, gecos_s, passwd_s, shell_s;
+#endif
+#if HAVE_SOCKETS
+extern val socket_error_s;
+#endif
+#if HAVE_UNAME
+extern val domainname_s, machine_s, nodename_s, release_s, sysname_s;
+extern val utsname_s, version_s;
+#endif
+#if CONFIG_DEBUG_SUPPORT
+extern val debug_quit_s;
+#endif
+#if HAVE_LIBFFI
+extern val array_s, bchar_s, bstr_d_s, bstr_s, buf_d_s;
+extern val carray_s, char_s, closure_s, double_s, downcase_k;
+extern val ffi_call_desc_s, ffi_closure_s, ffi_type_s, filter_k, frombase64_k;
+extern val fromhtml_k, frompercent_k, fromurl_k, hextoint_k, int16_s;
+extern val int32_s, int64_s, int8_s, int_s, lfilt_k;
+extern val long_s, ptr_in_d_s, ptr_in_s, ptr_out_d_s, ptr_out_s;
+extern val ptr_out_s_s, ptr_s, rfilt_k, short_s, str_d_s;
+extern val struct_s, tobase64_k, tofloat_k, tohtml_k, tohtml_star_k;
+extern val toint_k, tonumber_k, topercent_k, tourl_k, uchar_s;
+extern val uint16_s, uint32_s, uint64_s, uint8_s, uint_s;
+extern val ulong_s, upcase_k, ushort_s, void_s, wchar_s;
+extern val wstr_d_s, wstr_s, zarray_s;
+#endif
+#if HAVE_SYSLOG
+extern val prio_k;
+#endif
+#if HAVE_DLOPEN
+extern val dlhandle_s, dlsym_s;
+#endif
+#if HAVE_TERMIOS
+extern val cc_s, cflag_s, iflag_s, ispeed_s, lflag_s;
+extern val oflag_s, ospeed_s, termios_s;
+#endif
+#if HAVE_SOCKETS
+extern val addr_s, addrinfo_s, canonname_s, family_s, flags_s;
+extern val flow_info_s, port_s, protocol_s, scope_id_s, sockaddr_in6_s;
+extern val sockaddr_in_s, sockaddr_un_s, socktype_s;
+#endif
+
+extern val accept_s, addr_k, all_s, and_s, ap_s;
+extern val apf_s, append_each_s, append_each_star_s, append_k, append_s;
+extern val apply_s, aret_s, args_k, assert_s, atime_k;
+extern val atime_s, atom_s, auto_k, bignum_s, bind_s;
+extern val blksize_k, blksize_s, block_s, block_star_s, blocks_k;
+extern val blocks_s, buf_s, byte_oriented_k, call_s, car_s;
+extern val caseq_s, caseq_star_s, caseql_s, caseql_star_s, casequal_s;
+extern val casequal_star_s, cases_s, cat_s, catch_s, cdigit_k;
+extern val cdr_s, chain_s, chand_s, chars_k, choose_s;
+extern val chr_s, chset_s, circref_s, close_s, cobj_s;
+extern val coll_s, collect_each_s, collect_each_star_s, collect_s, colon_k;
+extern val compl_s, compound_s, cond_s, cons_s, continue_k;
+extern val continue_s, counter_k, cptr_s, cset_s, cspace_k;
+extern val ctime_k, ctime_s, cword_char_k, data_s, day_s;
+extern val decline_k, defex_s, deffilter_s, define_s, defmacro_s;
+extern val defparm_s, defparml_s, defr_warning_s, defsymacro_s, defun_s;
+extern val defvar_s, defvarl_s, dev_k, dev_s, digit_k;
+extern val do_s, dohash_s, dst_s, dvbind_s, dwim_s;
+extern val each_op_s, each_s, each_star_s, empty_s, env_k;
+extern val env_s, eof_s, eol_s, eq_s, eql_s;
+extern val equal_based_k, equal_s, error_s, eval_error_s, expr_s;
+extern val fail_s, fbind_s, fd_k, file_error_s, filter_s;
+extern val finally_s, finish_k, first_s, fixnum_s, flatten_s;
+extern val flet_s, float_s, for_op_s, for_s, for_star_s;
+extern val force_s, forget_s, form_k, format_s, freeform_s;
+extern val from_current_k, from_end_k, from_list_s, from_start_k, fun_k;
+extern val fun_s, fuzz_s, gap_k, gather_s, gen_s;
+extern val generate_s, gensym_counter_s, gid_k, gid_s, gmtoff_s;
+extern val greedy_k, gun_s, handler_bind_s, hash_construct_s, hash_iter_s;
+extern val hash_lit_s, hash_s, hour_s, iapply_s, identity_s;
+extern val if_s, iflet_s, in_package_s, inc_s, include_s;
+extern val ino_k, ino_s, integer_s, internal_error_s, into_k;
+extern val intr_s, ipf_s, keyword_package_s, labels_s, lambda_s;
+extern val lambda_set_s, last_s, lbind_s, lcons_s, let_s;
+extern val let_star_s, line_s, lines_k, lisp1_setq_s, list_k;
 extern val list_s, list_star_s, listener_hist_len_s, listener_multi_line_p_s, listener_sel_inclusive_p_s;
 extern val lit_s, load_path_s, load_recursive_s, load_s, local_s;
-extern val long_s, longest_k, lstr_s, mac_param_bind_s, machine_s;
-extern val macro_s, macro_time_s, macrolet_s, make_struct_lit_s, mandatory_k;
-extern val maxgap_k, maxtimes_k, maybe_s, mdo_s, mem_s;
-extern val memq_s, memql_s, memqual_s, merge_s, meth_s;
-extern val min_s, mingap_k, mintimes_k, mod_s, mode_k;
-extern val mode_s, modlast_s, month_s, mtime_k, mtime_s;
-extern val name_k, name_s, named_k, next_s, next_spec_k;
-extern val nlink_k, nlink_s, nodename_s, none_s, nongreedy_s;
-extern val not_s, nothrow_k, noval_s, null_s, nullify_s;
-extern val number_s, numeric_error_s, oand_s, oflag_s, oneplus_s;
-extern val op_s, opip_s, optional_s, or_s, ospeed_s;
-extern val output_s, package_alist_s, package_s, panic_s, parser_s;
-extern val passwd_s, path_s, pkg_s, plus_s, port_s;
-extern val pprint_flo_format_s, print_base_s, print_circle_s, print_flo_digits_s, print_flo_format_s;
-extern val print_flo_precision_s, print_s, prio_k, process_error_s, prof_s;
-extern val prog1_s, progn_s, promise_forced_s, promise_inprogress_s, promise_s;
-extern val protocol_s, ptr_in_d_s, ptr_in_s, ptr_out_d_s, ptr_out_s;
-extern val ptr_out_s_s, ptr_s, qquote_s, qref_s, quasi_s;
-extern val quasilist_s, query_error_s, quote_s, random_state_s, random_state_var_s;
-extern val random_warmup_s, range_error_s, range_s, rcons_s, rdev_k;
-extern val rdev_s, real_time_k, rebind_s, reflect_k, regex_s;
-extern val release_s, rep_s, repeat_s, repeat_spec_k, require_s;
-extern val resolve_k, rest_s, restart_s, ret_s, return_from_s;
-extern val return_s, rfilt_k, scope_id_s, sec_s, sequence_s;
-extern val set_s, setq_s, setqf_s, shell_s, short_s;
-extern val shortest_k, single_s, size_k, size_s, skip_s;
-extern val slot_s, sockaddr_in6_s, sockaddr_in_s, sockaddr_un_s, socket_error_s;
-extern val socktype_s, some_s, space_k, special_s, splice_s;
-extern val stat_s, static_slot_s, stddebug_s, stderr_s, stdin_s;
-extern val stdio_stream_s, stdnull_s, stdout_s, str_d_s, str_s;
-extern val stream_s, string_k, string_s, struct_lit_s, struct_s;
-extern val struct_type_s, switch_s, sym_s, symacro_k, symacrolet_s;
-extern val syntax_error_s, sys_abscond_from_s, sys_apply_s, sys_catch_s, sys_lisp1_value_s;
-extern val sys_mark_special_s, sys_qquote_s, sys_splice_s, sys_unquote_s, sysname_s;
-extern val system_error_s, system_package_s, termios_s, text_s, throw_s;
+extern val longest_k, lstr_s, mac_param_bind_s, macro_s, macro_time_s;
+extern val macrolet_s, make_struct_lit_s, mandatory_k, maxgap_k, maxtimes_k;
+extern val maybe_s, mdo_s, memq_s, memql_s, memqual_s;
+extern val merge_s, meth_s, min_s, mingap_k, mintimes_k;
+extern val mod_s, mode_k, mode_s, modlast_s, month_s;
+extern val mtime_k, mtime_s, name_k, name_s, named_k;
+extern val next_s, next_spec_k, nlink_k, nlink_s, none_s;
+extern val nongreedy_s, not_s, nothrow_k, noval_s, null_s;
+extern val nullify_s, number_s, numeric_error_s, oand_s, oneplus_s;
+extern val op_s, opip_s, optional_s, or_s, output_s;
+extern val package_alist_s, package_s, panic_s, parser_s, path_s;
+extern val pkg_s, plus_s, pprint_flo_format_s, print_base_s, print_circle_s;
+extern val print_flo_digits_s, print_flo_format_s, print_flo_precision_s, print_s, process_error_s;
+extern val prof_s, prog1_s, progn_s, promise_forced_s, promise_inprogress_s;
+extern val promise_s, qquote_s, qref_s, quasi_s, quasilist_s;
+extern val query_error_s, quote_s, random_state_s, random_state_var_s, random_warmup_s;
+extern val range_error_s, range_s, rcons_s, rdev_k, rdev_s;
+extern val real_time_k, rebind_s, reflect_k, regex_s, rep_s;
+extern val repeat_s, repeat_spec_k, require_s, resolve_k, rest_s;
+extern val restart_s, ret_s, return_from_s, return_s, sec_s;
+extern val sequence_s, set_s, setq_s, setqf_s, shortest_k;
+extern val single_s, size_k, size_s, skip_s, slot_s;
+extern val some_s, space_k, special_s, splice_s, stat_s;
+extern val static_slot_s, stddebug_s, stderr_s, stdin_s, stdio_stream_s;
+extern val stdnull_s, stdout_s, str_s, stream_s, string_k;
+extern val string_s, struct_lit_s, struct_type_s, switch_s, sym_s;
+extern val symacro_k, symacrolet_s, syntax_error_s, sys_abscond_from_s, sys_apply_s;
+extern val sys_catch_s, sys_lisp1_value_s, sys_mark_special_s, sys_qquote_s, sys_splice_s;
+extern val sys_unquote_s, system_error_s, system_package_s, text_s, throw_s;
 extern val time_local_s, time_parse_s, time_s, time_string_s, time_utc_s;
-extern val timeout_error_s, times_k, tlist_k, tobase64_k, tofloat_k;
-extern val tohtml_k, tohtml_star_k, toint_k, tonumber_k, topercent_k;
-extern val tourl_k, trailer_s, tree_bind_s, tree_case_s, try_s;
-extern val type_error_s, uchar_s, uid_k, uid_s, uint16_s;
-extern val uint32_s, uint64_s, uint8_s, uint_s, ulong_s;
+extern val timeout_error_s, times_k, tlist_k, trailer_s, tree_bind_s;
+extern val tree_case_s, try_s, type_error_s, uid_k, uid_s;
 extern val unbound_s, unique_s, unquote_s, until_s, until_star_s;
-extern val upcase_k, uref_s, user_package_s, userdata_k, ushort_s;
-extern val utsname_s, uw_protect_s, var_k, var_s, vars_k;
-extern val vec_list_s, vec_s, vecref_s, vector_lit_s, version_s;
-extern val void_s, warning_s, wchar_s, weak_keys_k, weak_vals_k;
-extern val when_s, while_s, while_star_s, whole_k, wild_s;
-extern val with_dyn_rebinds_s, word_char_k, wrap_k, wstr_d_s, wstr_s;
-extern val year_s, zap_s, zarray_s, zeroplus_s, zone_s;
+extern val uref_s, user_package_s, userdata_k, uw_protect_s, var_k;
+extern val var_s, vars_k, vec_list_s, vec_s, vecref_s;
+extern val vector_lit_s, warning_s, weak_keys_k, weak_vals_k, when_s;
+extern val while_s, while_star_s, whole_k, wild_s, with_dyn_rebinds_s;
+extern val word_char_k, wrap_k, year_s, zap_s, zeroplus_s;
+extern val zone_s;
+
 
 val *protected_sym[] = {
-  &accept_s, &addr_k, &addr_s, &addrinfo_s, &all_s,
-  &and_s, &ap_s, &apf_s, &append_each_s, &append_each_star_s,
-  &append_k, &append_s, &apply_s, &aret_s, &args_k,
-  &array_s, &assert_s, &atime_k, &atime_s, &atom_s,
-  &auto_k, &bchar_s, &bignum_s, &bind_s, &blksize_k,
-  &blksize_s, &block_s, &block_star_s, &blocks_k, &blocks_s,
-  &bstr_d_s, &bstr_s, &buf_d_s, &buf_s, &byte_oriented_k,
-  &call_s, &canonname_s, &car_s, &caseq_s, &caseq_star_s,
-  &caseql_s, &caseql_star_s, &casequal_s, &casequal_star_s, &cases_s,
-  &cat_s, &catch_s, &cc_s, &cdigit_k, &cdr_s,
-  &cflag_s, &chain_s, &chand_s, &char_s, &chars_k,
-  &choose_s, &chr_s, &chset_s, &circref_s, &close_s,
-  &closure_s, &cobj_s, &coll_s, &collect_each_s, &collect_each_star_s,
-  &collect_s, &colon_k, &compl_s, &compound_s, &cond_s,
-  &cons_s, &continue_k, &continue_s, &counter_k, &cptr_s,
-  &cset_s, &cspace_k, &ctime_k, &ctime_s, &cword_char_k,
-  &data_s, &day_s, &debug_quit_s, &decline_k, &defex_s,
-  &deffilter_s, &define_s, &defmacro_s, &defparm_s, &defparml_s,
-  &defr_warning_s, &defsymacro_s, &defun_s, &defvar_s, &defvarl_s,
-  &dev_k, &dev_s, &digit_k, &dir_s, &do_s,
-  &dohash_s, &domainname_s, &double_s, &downcase_k, &dst_s,
-  &dvbind_s, &dwim_s, &each_op_s, &each_s, &each_star_s,
-  &empty_s, &env_k, &env_s, &eof_s, &eol_s,
-  &eq_s, &eql_s, &equal_based_k, &equal_s, &error_s,
-  &eval_error_s, &expr_s, &fail_s, &family_s, &fbind_s,
-  &fd_k, &ffi_call_desc_s, &ffi_closure_s, &ffi_type_s, &file_error_s,
-  &filter_k, &filter_s, &finally_s, &finish_k, &first_s,
-  &fixnum_s, &flags_s, &flatten_s, &flet_s, &float_s,
-  &flow_info_s, &for_op_s, &for_s, &for_star_s, &force_s,
-  &forget_s, &form_k, &format_s, &freeform_s, &from_current_k,
-  &from_end_k, &from_list_s, &from_start_k, &frombase64_k, &fromhtml_k,
-  &frompercent_k, &fromurl_k, &fun_k, &fun_s, &fuzz_s,
-  &gap_k, &gather_s, &gecos_s, &gen_s, &generate_s,
-  &gensym_counter_s, &gid_k, &gid_s, &gmtoff_s, &greedy_k,
-  &group_s, &gun_s, &handler_bind_s, &hash_construct_s, &hash_iter_s,
-  &hash_lit_s, &hash_s, &hextoint_k, &hour_s, &iapply_s,
-  &identity_s, &if_s, &iflag_s, &iflet_s, &in_package_s,
-  &inc_s, &include_s, &ino_k, &ino_s, &int16_s,
-  &int32_s, &int64_s, &int8_s, &int_s, &integer_s,
-  &internal_error_s, &into_k, &intr_s, &ipf_s, &ispeed_s,
-  &keyword_package_s, &labels_s, &lambda_s, &lambda_set_s, &last_s,
-  &lbind_s, &lcons_s, &let_s, &let_star_s, &lfilt_k,
-  &lflag_s, &line_s, &lines_k, &lisp1_setq_s, &list_k,
+#if HAVE_GRGID
+  &group_s, &mem_s,
+#endif
+#if HAVE_PWUID
+  &dir_s, &gecos_s, &passwd_s, &shell_s,
+#endif
+#if HAVE_SOCKETS
+  &socket_error_s,
+#endif
+#if HAVE_UNAME
+  &domainname_s, &machine_s, &nodename_s, &release_s, &sysname_s,
+  &utsname_s, &version_s,
+#endif
+#if CONFIG_DEBUG_SUPPORT
+  &debug_quit_s,
+#endif
+#if HAVE_LIBFFI
+  &array_s, &bchar_s, &bstr_d_s, &bstr_s, &buf_d_s,
+  &carray_s, &char_s, &closure_s, &double_s, &downcase_k,
+  &ffi_call_desc_s, &ffi_closure_s, &ffi_type_s, &filter_k, &frombase64_k,
+  &fromhtml_k, &frompercent_k, &fromurl_k, &hextoint_k, &int16_s,
+  &int32_s, &int64_s, &int8_s, &int_s, &lfilt_k,
+  &long_s, &ptr_in_d_s, &ptr_in_s, &ptr_out_d_s, &ptr_out_s,
+  &ptr_out_s_s, &ptr_s, &rfilt_k, &short_s, &str_d_s,
+  &struct_s, &tobase64_k, &tofloat_k, &tohtml_k, &tohtml_star_k,
+  &toint_k, &tonumber_k, &topercent_k, &tourl_k, &uchar_s,
+  &uint16_s, &uint32_s, &uint64_s, &uint8_s, &uint_s,
+  &ulong_s, &upcase_k, &ushort_s, &void_s, &wchar_s,
+  &wstr_d_s, &wstr_s, &zarray_s,
+#endif
+#if HAVE_SYSLOG
+  &prio_k,
+#endif
+#if HAVE_DLOPEN
+  &dlhandle_s, &dlsym_s,
+#endif
+#if HAVE_TERMIOS
+  &cc_s, &cflag_s, &iflag_s, &ispeed_s, &lflag_s,
+  &oflag_s, &ospeed_s, &termios_s,
+#endif
+#if HAVE_SOCKETS
+  &addr_s, &addrinfo_s, &canonname_s, &family_s, &flags_s,
+  &flow_info_s, &port_s, &protocol_s, &scope_id_s, &sockaddr_in6_s,
+  &sockaddr_in_s, &sockaddr_un_s, &socktype_s,
+#endif
+
+  &accept_s, &addr_k, &all_s, &and_s, &ap_s,
+  &apf_s, &append_each_s, &append_each_star_s, &append_k, &append_s,
+  &apply_s, &aret_s, &args_k, &assert_s, &atime_k,
+  &atime_s, &atom_s, &auto_k, &bignum_s, &bind_s,
+  &blksize_k, &blksize_s, &block_s, &block_star_s, &blocks_k,
+  &blocks_s, &buf_s, &byte_oriented_k, &call_s, &car_s,
+  &caseq_s, &caseq_star_s, &caseql_s, &caseql_star_s, &casequal_s,
+  &casequal_star_s, &cases_s, &cat_s, &catch_s, &cdigit_k,
+  &cdr_s, &chain_s, &chand_s, &chars_k, &choose_s,
+  &chr_s, &chset_s, &circref_s, &close_s, &cobj_s,
+  &coll_s, &collect_each_s, &collect_each_star_s, &collect_s, &colon_k,
+  &compl_s, &compound_s, &cond_s, &cons_s, &continue_k,
+  &continue_s, &counter_k, &cptr_s, &cset_s, &cspace_k,
+  &ctime_k, &ctime_s, &cword_char_k, &data_s, &day_s,
+  &decline_k, &defex_s, &deffilter_s, &define_s, &defmacro_s,
+  &defparm_s, &defparml_s, &defr_warning_s, &defsymacro_s, &defun_s,
+  &defvar_s, &defvarl_s, &dev_k, &dev_s, &digit_k,
+  &do_s, &dohash_s, &dst_s, &dvbind_s, &dwim_s,
+  &each_op_s, &each_s, &each_star_s, &empty_s, &env_k,
+  &env_s, &eof_s, &eol_s, &eq_s, &eql_s,
+  &equal_based_k, &equal_s, &error_s, &eval_error_s, &expr_s,
+  &fail_s, &fbind_s, &fd_k, &file_error_s, &filter_s,
+  &finally_s, &finish_k, &first_s, &fixnum_s, &flatten_s,
+  &flet_s, &float_s, &for_op_s, &for_s, &for_star_s,
+  &force_s, &forget_s, &form_k, &format_s, &freeform_s,
+  &from_current_k, &from_end_k, &from_list_s, &from_start_k, &fun_k,
+  &fun_s, &fuzz_s, &gap_k, &gather_s, &gen_s,
+  &generate_s, &gensym_counter_s, &gid_k, &gid_s, &gmtoff_s,
+  &greedy_k, &gun_s, &handler_bind_s, &hash_construct_s, &hash_iter_s,
+  &hash_lit_s, &hash_s, &hour_s, &iapply_s, &identity_s,
+  &if_s, &iflet_s, &in_package_s, &inc_s, &include_s,
+  &ino_k, &ino_s, &integer_s, &internal_error_s, &into_k,
+  &intr_s, &ipf_s, &keyword_package_s, &labels_s, &lambda_s,
+  &lambda_set_s, &last_s, &lbind_s, &lcons_s, &let_s,
+  &let_star_s, &line_s, &lines_k, &lisp1_setq_s, &list_k,
   &list_s, &list_star_s, &listener_hist_len_s, &listener_multi_line_p_s, &listener_sel_inclusive_p_s,
   &lit_s, &load_path_s, &load_recursive_s, &load_s, &local_s,
-  &long_s, &longest_k, &lstr_s, &mac_param_bind_s, &machine_s,
-  &macro_s, &macro_time_s, &macrolet_s, &make_struct_lit_s, &mandatory_k,
-  &maxgap_k, &maxtimes_k, &maybe_s, &mdo_s, &mem_s,
-  &memq_s, &memql_s, &memqual_s, &merge_s, &meth_s,
-  &min_s, &mingap_k, &mintimes_k, &mod_s, &mode_k,
-  &mode_s, &modlast_s, &month_s, &mtime_k, &mtime_s,
-  &name_k, &name_s, &named_k, &next_s, &next_spec_k,
-  &nlink_k, &nlink_s, &nodename_s, &none_s, &nongreedy_s,
-  &not_s, &nothrow_k, &noval_s, &null_s, &nullify_s,
-  &number_s, &numeric_error_s, &oand_s, &oflag_s, &oneplus_s,
-  &op_s, &opip_s, &optional_s, &or_s, &ospeed_s,
-  &output_s, &package_alist_s, &package_s, &panic_s, &parser_s,
-  &passwd_s, &path_s, &pkg_s, &plus_s, &port_s,
-  &pprint_flo_format_s, &print_base_s, &print_circle_s, &print_flo_digits_s, &print_flo_format_s,
-  &print_flo_precision_s, &print_s, &prio_k, &process_error_s, &prof_s,
-  &prog1_s, &progn_s, &promise_forced_s, &promise_inprogress_s, &promise_s,
-  &protocol_s, &ptr_in_d_s, &ptr_in_s, &ptr_out_d_s, &ptr_out_s,
-  &ptr_out_s_s, &ptr_s, &qquote_s, &qref_s, &quasi_s,
-  &quasilist_s, &query_error_s, &quote_s, &random_state_s, &random_state_var_s,
-  &random_warmup_s, &range_error_s, &range_s, &rcons_s, &rdev_k,
-  &rdev_s, &real_time_k, &rebind_s, &reflect_k, &regex_s,
-  &release_s, &rep_s, &repeat_s, &repeat_spec_k, &require_s,
-  &resolve_k, &rest_s, &restart_s, &ret_s, &return_from_s,
-  &return_s, &rfilt_k, &scope_id_s, &sec_s, &sequence_s,
-  &set_s, &setq_s, &setqf_s, &shell_s, &short_s,
-  &shortest_k, &single_s, &size_k, &size_s, &skip_s,
-  &slot_s, &sockaddr_in6_s, &sockaddr_in_s, &sockaddr_un_s, &socket_error_s,
-  &socktype_s, &some_s, &space_k, &special_s, &splice_s,
-  &stat_s, &static_slot_s, &stddebug_s, &stderr_s, &stdin_s,
-  &stdio_stream_s, &stdnull_s, &stdout_s, &str_d_s, &str_s,
-  &stream_s, &string_k, &string_s, &struct_lit_s, &struct_s,
-  &struct_type_s, &switch_s, &sym_s, &symacro_k, &symacrolet_s,
-  &syntax_error_s, &sys_abscond_from_s, &sys_apply_s, &sys_catch_s, &sys_lisp1_value_s,
-  &sys_mark_special_s, &sys_qquote_s, &sys_splice_s, &sys_unquote_s, &sysname_s,
-  &system_error_s, &system_package_s, &termios_s, &text_s, &throw_s,
+  &longest_k, &lstr_s, &mac_param_bind_s, &macro_s, &macro_time_s,
+  &macrolet_s, &make_struct_lit_s, &mandatory_k, &maxgap_k, &maxtimes_k,
+  &maybe_s, &mdo_s, &memq_s, &memql_s, &memqual_s,
+  &merge_s, &meth_s, &min_s, &mingap_k, &mintimes_k,
+  &mod_s, &mode_k, &mode_s, &modlast_s, &month_s,
+  &mtime_k, &mtime_s, &name_k, &name_s, &named_k,
+  &next_s, &next_spec_k, &nlink_k, &nlink_s, &none_s,
+  &nongreedy_s, &not_s, &nothrow_k, &noval_s, &null_s,
+  &nullify_s, &number_s, &numeric_error_s, &oand_s, &oneplus_s,
+  &op_s, &opip_s, &optional_s, &or_s, &output_s,
+  &package_alist_s, &package_s, &panic_s, &parser_s, &path_s,
+  &pkg_s, &plus_s, &pprint_flo_format_s, &print_base_s, &print_circle_s,
+  &print_flo_digits_s, &print_flo_format_s, &print_flo_precision_s, &print_s, &process_error_s,
+  &prof_s, &prog1_s, &progn_s, &promise_forced_s, &promise_inprogress_s,
+  &promise_s, &qquote_s, &qref_s, &quasi_s, &quasilist_s,
+  &query_error_s, &quote_s, &random_state_s, &random_state_var_s, &random_warmup_s,
+  &range_error_s, &range_s, &rcons_s, &rdev_k, &rdev_s,
+  &real_time_k, &rebind_s, &reflect_k, &regex_s, &rep_s,
+  &repeat_s, &repeat_spec_k, &require_s, &resolve_k, &rest_s,
+  &restart_s, &ret_s, &return_from_s, &return_s, &sec_s,
+  &sequence_s, &set_s, &setq_s, &setqf_s, &shortest_k,
+  &single_s, &size_k, &size_s, &skip_s, &slot_s,
+  &some_s, &space_k, &special_s, &splice_s, &stat_s,
+  &static_slot_s, &stddebug_s, &stderr_s, &stdin_s, &stdio_stream_s,
+  &stdnull_s, &stdout_s, &str_s, &stream_s, &string_k,
+  &string_s, &struct_lit_s, &struct_type_s, &switch_s, &sym_s,
+  &symacro_k, &symacrolet_s, &syntax_error_s, &sys_abscond_from_s, &sys_apply_s,
+  &sys_catch_s, &sys_lisp1_value_s, &sys_mark_special_s, &sys_qquote_s, &sys_splice_s,
+  &sys_unquote_s, &system_error_s, &system_package_s, &text_s, &throw_s,
   &time_local_s, &time_parse_s, &time_s, &time_string_s, &time_utc_s,
-  &timeout_error_s, &times_k, &tlist_k, &tobase64_k, &tofloat_k,
-  &tohtml_k, &tohtml_star_k, &toint_k, &tonumber_k, &topercent_k,
-  &tourl_k, &trailer_s, &tree_bind_s, &tree_case_s, &try_s,
-  &type_error_s, &uchar_s, &uid_k, &uid_s, &uint16_s,
-  &uint32_s, &uint64_s, &uint8_s, &uint_s, &ulong_s,
+  &timeout_error_s, &times_k, &tlist_k, &trailer_s, &tree_bind_s,
+  &tree_case_s, &try_s, &type_error_s, &uid_k, &uid_s,
   &unbound_s, &unique_s, &unquote_s, &until_s, &until_star_s,
-  &upcase_k, &uref_s, &user_package_s, &userdata_k, &ushort_s,
-  &utsname_s, &uw_protect_s, &var_k, &var_s, &vars_k,
-  &vec_list_s, &vec_s, &vecref_s, &vector_lit_s, &version_s,
-  &void_s, &warning_s, &wchar_s, &weak_keys_k, &weak_vals_k,
-  &when_s, &while_s, &while_star_s, &whole_k, &wild_s,
-  &with_dyn_rebinds_s, &word_char_k, &wrap_k, &wstr_d_s, &wstr_s,
-  &year_s, &zap_s, &zarray_s, &zeroplus_s, &zone_s,
+  &uref_s, &user_package_s, &userdata_k, &uw_protect_s, &var_k,
+  &var_s, &vars_k, &vec_list_s, &vec_s, &vecref_s,
+  &vector_lit_s, &warning_s, &weak_keys_k, &weak_vals_k, &when_s,
+  &while_s, &while_star_s, &whole_k, &wild_s, &with_dyn_rebinds_s,
+  &word_char_k, &wrap_k, &year_s, &zap_s, &zeroplus_s,
+  &zone_s,
+
   convert(val *, 0)
 };