From 227f0d19dc5313edbebbb56ba6b4966012a2370e Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Wed, 5 Feb 2014 16:36:33 -0800
Subject: * 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.
---
 lib.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib.h')

diff --git a/lib.h b/lib.h
index 03a67406..1fc95a00 100644
--- a/lib.h
+++ b/lib.h
@@ -106,7 +106,7 @@ struct func {
   unsigned fixparam : 7; /* total non-variadic parameters */
   unsigned optargs : 7;  /* fixparam - optargs = required args */
   unsigned variadic : 1;
-  unsigned mark_missing_args: 1; /* missing opt. args given as special value */
+  unsigned : 1;
   unsigned functype : 16;
   val env;
   union {
@@ -601,7 +601,6 @@ val func_interp(val env, val form);
 val func_get_form(val fun);
 val func_get_env(val fun);
 val func_set_env(val fun, val env);
-val func_set_mark_missing(val fun);
 val functionp(val);
 val interp_fun_p(val);
 val funcall(val fun);
@@ -740,6 +739,16 @@ INLINE val null_or_missing_p(val v) { return (!v || v == colon_k) ? t : nil; }
 
 #define c_true(c_cond) ((c_cond) ? t : nil)
 
+INLINE val default_arg(val arg, val dfl)
+{
+  return if3(null_or_missing_p(arg), dfl, arg);
+}
+
+INLINE val default_bool_arg(val arg)
+{
+  return if3(missingp(arg), nil, arg);
+}
+
 #define list_collect_decl(OUT, PTAIL)           \
   val OUT = nil, *PTAIL = &OUT
 
-- 
cgit v1.2.3