summaryrefslogtreecommitdiffstats
path: root/regex.c
diff options
context:
space:
mode:
Diffstat (limited to 'regex.c')
-rw-r--r--regex.c10
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)) {