summaryrefslogtreecommitdiffstats
path: root/regex.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2017-03-17 20:34:47 -0700
committerKaz Kylheku <kaz@kylheku.com>2017-03-17 20:34:47 -0700
commit3f4586d1ee813ecd23456956d5f2c7f4759a5922 (patch)
tree402e17e4fa35841409bf1ccb33ea112009b8dcfe /regex.c
parentfbb35f10c305128e865f7c16e21f61ea6e62083e (diff)
downloadtxr-3f4586d1ee813ecd23456956d5f2c7f4759a5922.tar.gz
txr-3f4586d1ee813ecd23456956d5f2c7f4759a5922.tar.bz2
txr-3f4586d1ee813ecd23456956d5f2c7f4759a5922.zip
Rename badly named default_bool_arg
* lib.h (default_bool_arg): Inline function renamed to default_null_arg. * eval.c (if_fun, pad, ginterate, giterate, range_star, range, constantp, macroexpand_1, macro_form_p, expand_with_free_refs, do_expand, eval_intrinsic, func_get_name, make_env_intrinsic): Follow rename. * arith.c (lognot): Likewise. * gc.c (gc_finalize): Likewise. * glob.c (glob_wrap): Likewise. * hash.c (group_reduce, gethash_n): Likewise. * lib.c (print, multi_sort, lazy_str, vector, iff, tok_str, split_str_keep, search_str, remove_if, val): Likewise. * match.c (match_fun): Likewise. * parser.c (lisp_parse_impl, regex_parse): Likewise. * rand.c (make_random_state): Likewise. * regex.c (read_until_match, search_regex, regex_compile): Likewise. * socket.c (sock_accept, sock_connect): Likewise. * stream.c (open_files_star, open_files, run, open_process, open_tail, get_string, record_adapter): Likewise. * struct.c (static_slot_ensure, static_slot_ens_rec, clear_struct, make_struct_type): Likewise. * sysif.c (exec_wrap, errno_wrap, cobj_ops_init): Likewise. * unwind.c (uw_capture_cont, uw_find_frames_impl): Likewise.
Diffstat (limited to 'regex.c')
-rw-r--r--regex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/regex.c b/regex.c
index 3bbd3492..9568d312 100644
--- a/regex.c
+++ b/regex.c
@@ -2104,7 +2104,7 @@ val regex_compile(val regex_sexp, val error_stream)
val regex_source;
if (stringp(regex_sexp)) {
- regex_sexp = regex_parse(regex_sexp, default_bool_arg(error_stream));
+ regex_sexp = regex_parse(regex_sexp, default_null_arg(error_stream));
return if2(regex_sexp, regex_compile(regex_sexp, error_stream));
}
@@ -2458,7 +2458,7 @@ val search_regex(val haystack, val needle_regex, val start,
{
val slen = nil;
start = default_arg(start, zero);
- from_end = default_bool_arg(from_end);
+ from_end = default_null_arg(from_end);
if (minusp(start)) {
slen = length_str(haystack);
@@ -2965,7 +2965,7 @@ val read_until_match(val regex, val stream_in, val include_match_in)
val stack = nil;
val match = nil;
val stream = default_arg(stream_in, std_input);
- val include_match = default_bool_arg(include_match_in);
+ val include_match = default_null_arg(include_match_in);
regex_machine_init(&regm, regex);