diff options
| -rw-r--r-- | internal.h | 1 | ||||
| -rw-r--r-- | re.c | 6 | ||||
| -rw-r--r-- | string.c | 9 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/internal.h b/internal.h index 28a2f74598..e1e4cc057d 100644 --- a/internal.h +++ b/internal.h @@ -1989,6 +1989,7 @@ long rb_reg_search0(VALUE, VALUE, long, int, int); VALUE rb_reg_match_p(VALUE re, VALUE str, long pos); bool rb_reg_start_with_p(VALUE re, VALUE str); void rb_backref_set_string(VALUE string, long pos, long len); +void rb_match_unbusy(VALUE); int rb_match_count(VALUE match); int rb_match_nth_defined(int nth, VALUE match); VALUE rb_reg_new_ary(VALUE ary, int options); @@ -1300,6 +1300,12 @@ rb_match_busy(VALUE match) FL_SET(match, MATCH_BUSY); } +void +rb_match_unbusy(VALUE match) +{ + FL_UNSET(match, MATCH_BUSY); +} + int rb_match_count(VALUE match) { @@ -7949,9 +7949,13 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) long idx; int last_null = 0; struct re_registers *regs; + VALUE match = 0; - while ((end = rb_reg_search(spat, str, start, 0)) >= 0) { - regs = RMATCH_REGS(rb_backref_get()); + for (; (end = rb_reg_search(spat, str, start, 0)) >= 0; + (match ? (rb_match_unbusy(match), rb_backref_set(match)) : (void)0)) { + match = rb_backref_get(); + if (!result) rb_match_busy(match); + regs = RMATCH_REGS(match); if (start == end && BEG(0) == END(0)) { if (!ptr) { SPLIT_STR(0, 0); @@ -7982,6 +7986,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) } if (!NIL_P(limit) && lim <= ++i) break; } + if (match) rb_match_unbusy(match); } if (RSTRING_LEN(str) > 0 && (!NIL_P(limit) || RSTRING_LEN(str) > beg || lim < 0)) { SPLIT_STR(beg, RSTRING_LEN(str)-beg); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index aad4277d5f..b8ae50d30d 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1784,6 +1784,9 @@ CODE result = []; "".split(//, 1) {|s| result << s} assert_equal([], result) + + result = []; "aaa,bbb,ccc,ddd".split(/,/) {|s| result << s.gsub(/./, "A")} + assert_equal(["AAA"]*4, result) ensure $; = fs end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 93 +#define RUBY_PATCHLEVEL 94 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 8 |