read-until-match can optionally keep matched text.

* regex.c (read_until_match): New argument, include_match.
Three times repeated termination code refactored into block
reached by forward goto.
(regex_init): Registration of read-until-match updated.

* regex.h (read_until_match): Declaration updated.

* stream.c (struct record_adapter_base): New member,
include_match.
(record_adapter_get_line): Pass match to read_until_match
as new argument.
(record_adapater): New argument, include_match.
(stream_init): Update registration of record-adapter.

* stream.h (record_adapter): Declaration updated.

* txr.1: Updated.

1 files changed, 1 insertions, 1 deletions

diff --git a/regex.h b/regex.h
index ac84af26..75bad120 100644
--- a/regex.h
+++ b/regex.h
@@ -39,6 +39,6 @@ val search_regst(val haystack, val needle_regex, val start_num, val from_end);
 val match_regst(val str, val regex, val pos);
 val match_regst_right(val str, val regex, val end);
 val regsub(val regex, val repl, val str);
-val read_until_match(val regex, val stream);
+val read_until_match(val regex, val stream, val keep_match);
 int wide_display_char_p(wchar_t ch);
 void regex_init(void);