diff options
| -rw-r--r-- | lib.c | 9 | ||||
| -rw-r--r-- | txr.1 | 9 |
2 files changed, 12 insertions, 6 deletions
@@ -3814,24 +3814,25 @@ val split_str_keep(val str, val sep, val keep_sep) if (regexp(sep)) { list_collect_decl (out, iter); val pos = zero; + val slen = length(str); - do { + for (;;) { cons_bind (new_pos, len, search_regex(str, sep, pos, nil)); - if (eql(pos, new_pos) && len == zero) + if (len == zero && new_pos != slen) new_pos = plus(new_pos, one); iter = list_collect(iter, sub_str(str, pos, new_pos)); pos = new_pos; - if (len) { + if (len && pos != slen) { pos = plus(pos, len); if (keep_sep) iter = list_collect(iter, sub_str(str, new_pos, pos)); continue; } break; - } while (le(pos, length_str(str))); + } return out; } else { @@ -18469,11 +18469,16 @@ characters. In this case, if .meta string is of length one or zero, then it is considered to have no such pieces, and a list of one element is returned containing the original string. +These remarks also apply to the situation when +.meta sep +is a regular expression which matches only an empty +substring of +.metn string . If a match for .meta sep -is not found in the string at all, then the string is not -split at all: a list of one element is returned containing the original +is not found in the string at all (not even an empty match), then the string is +not split at all: a list of one element is returned containing the original string. If |