diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-10 13:25:39 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-10 13:25:39 +0000 |
commit | d2e596ad04050ebfe575106ea815849aefb689b2 (patch) | |
tree | b0263011852abcd32f8d941951ffa11c02e6e592 /array.c | |
parent | 6d7999c13285a7a2bec9073504703226e1a2b2f2 (diff) | |
download | ruby-d2e596ad04050ebfe575106ea815849aefb689b2.tar.gz |
* array.c (rb_ary_slice_bang): If an invalid range is given, do
not raise an exception but return nil just like slice() does.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1895,8 +1895,18 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary) return arg2; } - if (!FIXNUM_P(arg1) && rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 1)) { - goto delete_pos_len; + if (!FIXNUM_P(arg1)) { + switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) { + case Qtrue: + /* valid range */ + goto delete_pos_len; + case Qnil: + /* invalid range */ + return Qnil; + default: + /* not a range */ + break; + } } return rb_ary_delete_at(ary, NUM2LONG(arg1)); |