From c3e7816a7834d7361a2b1f394e6992962f9924f3 Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 27 May 2008 11:18:50 +0000 Subject: * array.c (rb_ary_slice_bang): Return an empty array instead of nil when pos is valid and len is adjusted from a valid value to zero; caught by RubySpec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ array.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0367b00abe..6939f42956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue May 27 20:18:30 2008 Akinori MUSHA + + * array.c (rb_ary_slice_bang): Return an empty array instead of + nil when pos is valid and len is adjusted from a valid value to + zero; caught by RubySpec. + Tue May 27 19:12:37 2008 Nobuyoshi Nakada * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get diff --git a/array.c b/array.c index 3e8be3f280..5dd172c157 100644 --- a/array.c +++ b/array.c @@ -1815,13 +1815,14 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE 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, Qundef); /* Qnil/rb_ary_new2(0) */ + rb_ary_splice(ary, pos, len, Qundef); return arg2; } -- cgit v1.2.3