* arith.c (lognot): Conform to new scheme for defaulting optional args.

* eval.c (apply): Unconditionally use colon_k for missing optional
args, for intrinsic functions.
(eval_intrinsic, rangev, rangev_star, errno_wrap): Conform to new
scheme for defaulting optional args.
(reg_fun_mark): Function removed.
(eval_init): Switch reduce_left and reduce_right back to reg_fun
registration.

* hash.c (gethash_n): Conform to new scheme for defaulting optional
arguments.

* lib.c (sub_list, replace_list, remove_if, keep_if, remove_if_lazy,
keep_if_lazy, tree_find, count_if, some_satisfy, all_satisfy,
none_satisfy, search_str, match_str, match_str_tree, sub_str,
replace_str, cat_str, tok_str, intern, rehome_sym, sub_vec,
replace_vec, lazy_str, sort, multi_sort, find, find_if, set_diff,
obj_print, obj_pprint): Conform to new scheme for defaulting optional
arguments.
(func_f0, func_f1, func_f2, func_f3, func_f4, func_n0, func_n1,
func_n2, func_n3, func_n4, func_n5, func_n6, func_n7, func_f0v,
func_f1v, func_f2v, func_f3v, func_f4v, func_n0v, func_n1v,
func_n2v, func_n3v, func_n4v, func_n5v, func_n6v, func_n7v):
Remove references to removed mark_missing_args member of struct func.
(func_set_mark_missing): Function removed.
(generic_funcall): Unconditionally use colon_k for missing optional
args, for intrinsic functions.

* lib.h (struct func): mark_missing_args member removed.
(func_set_mark_missing): Declaration removed.
(default_arg, default_bool_arg): New inline functions.

* rand.c (random): Left argument is not optional.
(rnd): Conform to new scheme for defaulting optional arguments.

* regex.c (search_regex, match_regex): Conform to new scheme for
defaulting optional arguments.

* stream.c (unget_char, unget_byte, put_string, put_char, put_byte,
put_line): Conform to new scheme for defaulting optional arguments.

* syslog.c (openlog_wrap): Conform to new scheme for defaulting
optional arguments.

* txr.1: Remove the specification that nil is a sentinel value in
default arguments, where necessary. Use consistent syntax for
specifying variable parts in argument lists. A few errors and omissions
addressed.

1 files changed, 5 insertions, 5 deletions

diff --git a/regex.c b/regex.c
index 7632faee..0c7e27b9 100644
--- a/regex.c
+++ b/regex.c
@@ -1770,8 +1770,8 @@ static regm_result_t regex_machine_feed(regex_machine_t *regm, wchar_t ch)
 val search_regex(val haystack, val needle_regex, val start,
                  val from_end)
 {
-  if (!start)
-    start = zero;
+  start = default_arg(start, zero);
+  from_end = default_bool_arg(from_end);
 
   if (length_str_lt(haystack, start)) {
     return nil;
@@ -1827,8 +1827,8 @@ val match_regex(val str, val reg, val pos)
   regex_machine_t regm;
   val i, retval;
   regm_result_t last_res = REGM_INCOMPLETE;
-  if (!pos)
-    pos = zero;
+
+  pos = default_arg(pos, zero);
 
   regex_machine_init(&regm, reg);
 
@@ -1859,7 +1859,7 @@ val match_regex_right(val str, val regex, val end)
   val pos = zero;
   val slen = length(str);
 
-  if (!end || gt(end, slen))
+  if (null_or_missing_p(end) || gt(end, slen))
     end = slen;
 
   while (lt(pos, end)) {