diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 17:35:03 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 17:35:03 +0000 |
commit | cc3540ba811a2f0f44a5e2794f961f946e9239eb (patch) | |
tree | 89fb1d18a3eee71f5bda315c8e85a26b228c0db5 | |
parent | b9190c6a5af2e8705ed6b151da6641f5f9191700 (diff) |
merge revision(s) 57374: [Backport #13135]
string.c: rindex(//) should set $~.
This seems a bug introduced by r520 (1.4.0). [ruby-core:79110] [Bug #13135]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | string.c | 6 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -3493,10 +3493,8 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) pos = str_offset(RSTRING_PTR(str), RSTRING_END(str), pos, enc, single_byte_optimizable(str)); - if (!RREGEXP_PTR(sub) || RREGEXP_SRC_LEN(sub)) { - pos = rb_reg_search(sub, str, pos, 1); - pos = rb_str_sublen(str, pos); - } + pos = rb_reg_search(sub, str, pos, 1); + pos = rb_str_sublen(str, pos); if (pos >= 0) return LONG2NUM(pos); break; diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 4dee245462..5b4e27e0fa 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1217,6 +1217,9 @@ CODE assert_nil("foo".rindex(//, -100)) assert_nil($~) + + assert_equal(3, "foo".rindex(//)) + assert_equal([3, 3], $~.offset(0)) end def test_rjust @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-12" -#define RUBY_PATCHLEVEL 29 +#define RUBY_PATCHLEVEL 30 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |