diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 20:21:59 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 20:21:59 +0000 |
commit | a412a7e00d3a2315e8cf252096b83350957e1346 (patch) | |
tree | 106eea3d7f3b542742efae167e19ed5961aa06cd | |
parent | fa0c521a2159ed4cfa25c9898290f2ca7f17f85a (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | array.c | 13 | ||||
-rw-r--r-- | enumerator.c | 1 |
3 files changed, 26 insertions, 3 deletions
@@ -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> * eval.c (Init_Thread): Initialize recursive_key. @@ -2078,17 +2078,24 @@ rb_ary_slice_bang(argc, argv, ary) VALUE ary; { VALUE arg1, arg2; - long pos, len; + long pos, len, orig_len; if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) { pos = NUM2LONG(arg1); len = NUM2LONG(arg2); delete_pos_len: + if (len < 0) return Qnil; + orig_len = RARRAY_LEN(ary); if (pos < 0) { - pos = RARRAY(ary)->len + pos; + pos += orig_len; 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) */ return arg2; } diff --git a/enumerator.c b/enumerator.c index f2c1fa2840..e0365fc5bc 100644 --- a/enumerator.c +++ b/enumerator.c @@ -422,6 +422,7 @@ Init_Enumerator() 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, "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, "next", enumerator_next, 0); rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0); |