diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-27 11:20:37 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-27 11:20:37 +0000 |
commit | 4c5e9c3500aa6cf7ca2d1a80ec9987d2cf96dd8e (patch) | |
tree | 4ec3bb9d75386ca0fc4415675b412c4ca85a13a8 /array.c | |
parent | b0278ac7647e01e612c104490ec700a7538f3206 (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -2090,18 +2090,19 @@ rb_ary_slice_bang(argc, argv, ary) pos += orig_len; if (pos < 0) return Qnil; } - else if (orig_len <= pos) return Qnil; + else if (orig_len < pos) return Qnil; if (orig_len < pos + len) { len = orig_len - pos; } + if (len == 0) return rb_ary_new2(0); arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos); RBASIC(arg2)->klass = rb_obj_class(ary); - rb_ary_splice(ary, pos, len, Qnil); /* Qnil/rb_ary_new2(0) */ + rb_ary_splice(ary, pos, len, Qnil); /* Qundef in 1.9 */ return arg2; } if (!FIXNUM_P(arg1)) { - switch (rb_range_beg_len(arg1, &pos, &len, RARRAY(ary)->len, 0)) { + switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) { case Qtrue: /* valid range */ goto delete_pos_len; |