ruby-changes:2692
From: ko1@a...
Date: 10 Dec 2007 22:27:19 +0900
Subject: [ruby-changes:2692] knu - Ruby:r14183 (trunk): * array.c (rb_ary_slice_bang): If an invalid range is given, do
knu 2007-12-10 22:25:39 +0900 (Mon, 10 Dec 2007) New Revision: 14183 Modified files: trunk/ChangeLog trunk/array.c trunk/test/ruby/test_array.rb Log: * array.c (rb_ary_slice_bang): If an invalid range is given, do not raise an exception but return nil just like slice() does. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/array.c?r1=14183&r2=14182 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14183&r2=14182 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_array.rb?r1=14183&r2=14182 Index: array.c =================================================================== --- array.c (revision 14182) +++ array.c (revision 14183) @@ -1895,8 +1895,18 @@ 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)); Index: ChangeLog =================================================================== --- ChangeLog (revision 14182) +++ ChangeLog (revision 14183) @@ -1,3 +1,8 @@ +Mon Dec 10 22:08:47 2007 Akinori MUSHA <knu@i...> + + * array.c (rb_ary_slice_bang): If an invalid range is given, do + not raise an exception but return nil just like slice() does. + Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@r...> * transcode.c (str_transcode): allow non-registered encodings. Index: test/ruby/test_array.rb =================================================================== --- test/ruby/test_array.rb (revision 14182) +++ test/ruby/test_array.rb (revision 14183) @@ -1031,6 +1031,8 @@ assert_equal(@cls[10, 11, 12], a.slice(9, 3)) assert_equal(@cls[10, 11, 12], a.slice(-91, 3)) + assert_nil(a.slice(-101, 2)) + assert_equal(@cls[1], a.slice(0..0)) assert_equal(@cls[100], a.slice(99..99)) assert_equal(@cls[], a.slice(100..100)) @@ -1041,6 +1043,8 @@ assert_equal(@cls[10, 11, 12], a.slice(9..11)) assert_equal(@cls[10, 11, 12], a.slice(-91..-89)) + assert_nil(a.slice(-101..-1)) + assert_nil(a.slice(10, -3)) # Ruby 1.8 feature change: # Array#slice[size..x] always returns []. @@ -1072,6 +1076,18 @@ a = @cls[1, 2, 3, 4, 5] assert_equal(nil, a.slice!(20)) assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(nil, a.slice!(-6)) + assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(nil, a.slice!(-6..4)) + assert_equal(@cls[1, 2, 3, 4, 5], a) + + a = @cls[1, 2, 3, 4, 5] + assert_equal(nil, a.slice!(-6,2)) + assert_equal(@cls[1, 2, 3, 4, 5], a) end def test_sort -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml