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

* array.c (rb_ary_slice_bang): Be consistent with Array#slice()

Browse source 
and String#slice!().  Just return nil when a negative length or
  out of boundary index is given instead of raising an exception
  via internal functions.
  (rb_ary_slice_bang): should not use rb_ary_subseq() which shares
  internal pointer.  splice modifies the receiver right after
  subseq.  [ruby-dev:34005]
  (rb_ary_slice_bang): should adjust length before making
  sub-array.

* enumerator.c (Init_Enumerator): Override
  Enumerable::Enumerator#each_with_index with #with_index.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-05-24 20:07:54 +00:00
parent 258129588f
commit 065f538086
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Sun May 25 05:07:19 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
and String#slice!(). Just return nil when a negative length or
out of boundary index is given instead of raising an exception
via internal functions.
(rb_ary_slice_bang): should not use rb_ary_subseq() which shares
internal pointer. splice modifies the receiver right after
subseq. [ruby-dev:34005]
(rb_ary_slice_bang): should adjust length before making
sub-array.
* enumerator.c (Init_Enumerator): Override
Enumerable::Enumerator#each_with_index with #with_index.
Sun May 25 03:13:09 2008 Akinori MUSHA <knu@iDaemons.org> Sun May 25 03:13:09 2008 Akinori MUSHA <knu@iDaemons.org>
* eval.c (Init_Thread): Initialize recursive_key. * eval.c (Init_Thread): Initialize recursive_key.

13
array.c
View file

@ -2078,17 +2078,24 @@ rb_ary_slice_bang(argc, argv, ary)
VALUE ary; VALUE ary;
{ {
VALUE arg1, arg2; VALUE arg1, arg2;
long pos, len; long pos, len, orig_len;
if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) { if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
pos = NUM2LONG(arg1); pos = NUM2LONG(arg1);
len = NUM2LONG(arg2); len = NUM2LONG(arg2);
delete_pos_len: delete_pos_len:
if (len < 0) return Qnil;
orig_len = RARRAY_LEN(ary);
if (pos < 0) { if (pos < 0) {
pos = RARRAY(ary)->len + pos; pos += orig_len;
if (pos < 0) return Qnil; if (pos < 0) return Qnil;
} }
arg2 = rb_ary_subseq(ary, pos, len); else if (orig_len <= pos) return Qnil;
if (orig_len < pos + len) {
len = orig_len - pos;
}
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); /* Qnil/rb_ary_new2(0) */
return arg2; return arg2;
} }

1
enumerator.c
View file

@ -422,6 +422,7 @@ Init_Enumerator()
rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1); rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1); rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1);
rb_define_method(rb_cEnumerator, "each", enumerator_each, 0); rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
rb_define_method(rb_cEnumerator, "each_with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0); rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "next", enumerator_next, 0); rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0); rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);