1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (rb_ary_zip): a.zip(b,c) should return an array, not

Browse Source 
enumerator.

* array.c (rb_ary_zip): a.zip(b,c) should return array with size
  truncated to the size of its shortest argument array.
  [incompatible]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-05-13 17:15:25 +00:00
parent aa77090aef
commit 46590a4132
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon May 14 02:12:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_zip): a.zip(b,c) should return an array, not
enumerator.
* array.c (rb_ary_zip): a.zip(b,c) should return array with size
truncated to the size of its shortest argument array.
[incompatible]
Mon May 14 01:54:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Mon May 14 01:54:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_choice): should return nil when the array is * array.c (rb_ary_choice): should return nil when the array is

18
array.c
View File

@ -1974,18 +1974,17 @@ rb_ary_delete_if(VALUE ary)
* Converts any arguments to arrays, then merges elements of * Converts any arguments to arrays, then merges elements of
* <i>self</i> with corresponding elements from each argument. This * <i>self</i> with corresponding elements from each argument. This
* generates a sequence of <code>self.size</code> <em>n</em>-element * generates a sequence of <code>self.size</code> <em>n</em>-element
* arrays, where <em>n</em> is one more that the count of arguments. If * arrays, where <em>n</em> is one more that the count of arguments.
* the size of any argument is less than <code>enumObj.size</code>, * The size of returned array is truncated to the size of the
* <code>nil</code> values are supplied. If a block given, it is * shortest argument enumerable. If a block given, it is invoked
* invoked for each output array, otherwise an array of arrays is * for each output array, otherwise an array of arrays is returned.
* returned.
* *
* a = [ 4, 5, 6 ] * a = [ 4, 5, 6 ]
* b = [ 7, 8, 9 ] * b = [ 7, 8, 9 ]
* *
* [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]] * [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
* [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]] * [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]]
* a.zip([1,2],[8]) #=> [[4,1,8], [5,2,nil], [6,nil,nil]] * a.zip([1,2],[8]) #=> [[4,1,8]]
*/ */
static VALUE static VALUE
@ -1995,12 +1994,14 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
long len; long len;
VALUE result; VALUE result;
RETURN_ENUMERATOR(ary, argc, argv); len = RARRAY_LEN(ary);
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
argv[i] = to_a(argv[i]); argv[i] = to_a(argv[i]);
if (len > RARRAY_LEN(argv[i]))
len = RARRAY_LEN(argv[i]);
} }
if (rb_block_given_p()) { if (rb_block_given_p()) {
for (i=0; i<RARRAY_LEN(ary); i++) { for (i=0; i<len; i++) {
VALUE tmp = rb_ary_new2(argc+1); VALUE tmp = rb_ary_new2(argc+1);
rb_ary_push(tmp, rb_ary_elt(ary, i)); rb_ary_push(tmp, rb_ary_elt(ary, i));
@ -2011,7 +2012,6 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
} }
return Qnil; return Qnil;
} }
len = RARRAY_LEN(ary);
result = rb_ary_new2(len); result = rb_ary_new2(len);
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
VALUE tmp = rb_ary_new2(argc+1); VALUE tmp = rb_ary_new2(argc+1);