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

* enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix

Browse source 
a bug where any parameter but the first one is dropped even if
  multiple values are yielded with. [Bug #1198]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2009-03-17 09:07:18 +00:00
parent 929a85f60e
commit 6712cca3b5
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 17 18:00:55 2009 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix
a bug where any parameter but the first one is dropped even if
multiple values are yielded with. [Bug #1198]
Tue Mar 17 14:25:16 2009 Tanaka Akira <akr@fsij.org> Tue Mar 17 14:25:16 2009 Tanaka Akira <akr@fsij.org>
* lib/pathname.rb (Pathname#sub): set $~ in block.binding. * lib/pathname.rb (Pathname#sub): set $~ in block.binding.

19
enumerator.c
View file

@ -397,11 +397,17 @@ enumerator_each(VALUE obj)
} }
static VALUE static VALUE
enumerator_with_index_i(VALUE val, VALUE *memo) enumerator_with_index_i(VALUE val, VALUE *memo, int argc, VALUE *argv)
{ {
val = rb_yield_values(2, val, INT2FIX(*memo)); VALUE idx;
idx = INT2FIX(*memo);
++*memo; ++*memo;
return val;
if (argc <= 1)
return rb_yield_values(2, val, idx);
return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
} }
/* /*
@ -451,9 +457,12 @@ enumerator_each_with_index(VALUE obj)
} }
static VALUE static VALUE
enumerator_with_object_i(VALUE val, VALUE memo) enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
{ {
return rb_yield_values(2, val, memo); if (argc <= 1)
return rb_yield_values(2, val, memo);
return rb_yield_values(2, rb_ary_new4(argc, argv), memo);
} }
/* /*