nobu	2007-11-07 15:07:52 +0900 (Wed, 07 Nov 2007)

  New Revision: 13833

  Modified files:
    trunk/ChangeLog
    trunk/enum.c

  Log:
    * enum.c (enum_each_with_index): make different arrays at each
      iteration.  [ruby-dev:32181]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13833&r2=13832
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enum.c?r1=13833&r2=13832

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13832)
+++ ChangeLog	(revision 13833)
@@ -1,3 +1,8 @@
+Wed Nov  7 15:07:51 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* enum.c (enum_each_with_index): make different arrays at each
+	  iteration.  [ruby-dev:32181]
+
 Tue Nov  7 05:17:24 2007  David Flanagan <davidflanagan@r...>
 
 	* eval.c: fix typo in invoke_method documentation
Index: enum.c
===================================================================
--- enum.c	(revision 13832)
+++ enum.c	(revision 13833)
@@ -1293,15 +1293,9 @@
 static VALUE
 each_with_index_i(VALUE val, VALUE memo)
 {
-    long n;
-    VALUE idx = RARRAY_PTR(memo)[1];
+    long n = (*(VALUE *)memo)++;
 
-    RARRAY_PTR(memo)[0] = val;
-    rb_yield(memo);
-    n = NUM2LONG(idx);
-    n++;
-    RARRAY_PTR(memo)[1] = INT2NUM(n);
-    return Qnil;
+    return rb_yield(rb_ary_new3(2, val, INT2NUM(n)));
 }
 
 /*
@@ -1322,12 +1316,12 @@
 static VALUE
 enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo;
+    long memo;
 
     RETURN_ENUMERATOR(obj, argc, argv);
 
-    memo = rb_ary_new3(2, Qnil, INT2FIX(0));
-    rb_block_call(obj, id_each, argc, argv, each_with_index_i, memo);
+    memo = 0;
+    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
     return obj;
 }
 
@@ -1534,7 +1528,6 @@
     return args[0];
 }
 
-
 static VALUE
 cycle_i(VALUE i, VALUE ary)
 {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml