kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) f1b76ea63ce40670071a857f408a4747c571f1e9,1d1f98d49c9908f4e3928e582d31fd2e9f252f92: [Backport #16024]

Browse source 
Occupy match data

	* string.c (rb_str_split_m): occupy match data not to be modified
	  during yielding the block.  [Bug #16024]

	Reuse match data

	* string.c (rb_str_split_m): reuse occupied match data.  [Bug #16024]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2019-08-18 05:07:50 +00:00
parent 9ab43c7a6c
commit 54a470d09e
5 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal.h
View file

@ -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);

6
re.c
View file

@ -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)
{

9
string.c
View file

@ -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);

3
test/ruby/test_string.rb
View file

@ -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

2
version.h
View file

@ -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