New rr function.

* regex.c (regex_range_search): New function.
(regex_init): Register regex_range_search as rr intrinsic.

* regex.h (regex_range_search): Declared.

* txr.1: Documented rr, and added reference to it
in description of regex-range.

3 files changed, 62 insertions, 5 deletions

diff --git a/regex.c b/regex.c
index ed2fc2d5..e95561ff 100644
--- a/regex.c
+++ b/regex.c
@@ -2812,6 +2812,17 @@ val regex_range_right(val regex, val arg1, val arg2)
   }
 }
 
+val regex_range_search(val regex, val arg1, val arg2, val arg3)
+{
+  if (missingp(arg2)) {
+    return range_regex(arg1, regex, zero, nil);
+  } else if (missingp(arg3)) {
+    return range_regex(arg2, regex, arg1, nil);
+  } else {
+    return range_regex(arg3, regex, arg1, arg2);
+  }
+}
+
 val read_until_match(val regex, val stream_in, val include_match_in)
 {
   regex_machine_t regm;
@@ -2998,6 +3009,7 @@ void regex_init(void)
   reg_fun(intern(lit("r^$"), user_package), func_n3o(regex_range_full, 2));
   reg_fun(intern(lit("r^"), user_package), func_n3o(regex_range_left, 2));
   reg_fun(intern(lit("r$"), user_package), func_n3o(regex_range_right, 2));
+  reg_fun(intern(lit("rr"), user_package), func_n4o(regex_range_search, 2));
   init_special_char_sets();
 }
 
diff --git a/regex.h b/regex.h
index 6af03522..f2e89cfb 100644
--- a/regex.h
+++ b/regex.h
@@ -52,6 +52,7 @@ val regex_match_right(val regex, val arg1, val arg2);
 val regex_range_full(val regex, val arg1, val arg2);
 val regex_range_left(val regex, val arg1, val arg2);
 val regex_range_right(val regex, val arg1, val arg2);
+val regex_range_search(val regex, val arg1, val arg2, val arg3);
 int wide_display_char_p(wchar_t ch);
 void regex_init(void);
 void regex_free_all(void);
diff --git a/txr.1 b/txr.1
index ba023aa2..108dc600 100644
--- a/txr.1
+++ b/txr.1
@@ -32236,6 +32236,12 @@ indicates the position one element past the
 last character of the match. If the match is empty, the two integers
 are equal.
 
+Also see the
+.code rr
+function, which provides an alternative argument syntax for
+the semantics of
+.codn range-regex .
+
 The
 .code search-regst
 differs from
@@ -32698,7 +32704,6 @@ results in a failed match and consequently
 .code nil
 being returned.
 
-
 The
 .code m^$
 function tests whether the entire portion of
@@ -32739,14 +32744,15 @@ Otherwise
 .code nil
 is returned.
 
-.coNP Functions @, r^$ @ r^ and @ r$
+.coNP Functions @, r^$ @, r^ @ r$ and @ rr
 .synb
 .mets (r^$ < regex <> [ position ] << string )
 .mets (r^ < regex <> [ position ] << string )
 .mets (r$ < regex <> [ end-position ] << string )
+.mets (rr < regex >> [ position <> [ from-end ]] << string )
 .syne
 .desc
-These functions perform the same operations as,
+The first three of these functions perform the same operations as,
 respectively,
 .codn m^$ ,
 .code m^
@@ -32760,6 +32766,13 @@ the matching substring within
 rather than the matching substring itself.
 
 The
+.code rr
+function performs the same operation as
+.code range-regex
+with different conventions with regard to argument
+order, harmonizing with those of the other three functions above.
+
+The
 .meta position
 argument, if omitted,
 defaults to zero, so that the
@@ -32777,7 +32790,7 @@ string.
 With one exception, a value in either parameter which is excessively negative
 or positive, such that it indexes before the start of the string or exceeds its
 length results in a failed match and consequently
-.codn nil
+.code nil
 being returned. The exception is that the
 .code rr
 function permits a negative
@@ -32816,7 +32829,7 @@ Otherwise
 is returned.
 
 The
-.code m$
+.code r$
 function tests whether the portion of
 .meta string
 ending just before
@@ -32828,6 +32841,37 @@ Otherwise
 .code nil
 is returned.
 
+The
+.code rr
+function searches
+.meta string
+starting at
+.meta position
+for a matches for
+.codn regex .
+If
+.meta from-end
+is specified and true, the rightmost
+match is reported.
+If a match is found, it is reported
+as a range.
+
+A regular expression which matches empty
+strings matches at the start position,
+and every other position, including
+the position just after the last
+character, coinciding with the length of
+.metn string .
+
+Except for the different argument order such that
+.meta string
+is always the rightmost argument, the
+.code rr
+function is equivalent to the
+.code range-regex
+function, such that correspondingly named
+arguments have the same semantics.
+
 .coNP Functions @, f^$ @ f^ and @ f$
 .synb
 .mets (f^$ < regex <> [ position ])