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

Let String#slice! return nil (#3533)

Browse source 
Returns `nil` instead of an empty string when non-integer number is given (to make it 2.7 compatible).
This commit is contained in:
Soutaro Matsumoto 2020-09-11 14:34:10 +09:00 • committed by GitHub
parent 0d78390bfb
commit f0ddbd502c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2020-09-11 14:34:35 +09:00 
Merged-By: soutaro <matsumoto@soutaro.com>
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
string.c
View file

@ -4961,7 +4961,10 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str)
return Qnil; return Qnil;
case Qfalse: case Qfalse:
beg = NUM2LONG(indx); beg = NUM2LONG(indx);
goto num_index; if (!(p = rb_str_subpos(str, beg, &len))) return Qnil;
if (!len) return Qnil;
beg = p - RSTRING_PTR(str);
goto subseq;
default: default:
goto num_index; goto num_index;
} }

2
test/ruby/test_string.rb
View file

@ -1588,8 +1588,10 @@ CODE
a = S("FooBar") a = S("FooBar")
if @aref_slicebang_silent if @aref_slicebang_silent
assert_nil( a.slice!(6) ) assert_nil( a.slice!(6) )
assert_nil( a.slice!(6r) )
else else
assert_raise(IndexError) { a.slice!(6) } assert_raise(IndexError) { a.slice!(6) }
assert_raise(IndexError) { a.slice!(6r) }
end end
assert_equal(S("FooBar"), a) assert_equal(S("FooBar"), a)