[前][次][番号順一覧][スレッド一覧]

ruby-changes:12342

From: yugui <ko1@a...>
Date: Sun, 12 Jul 2009 22:56:41 +0900 (JST)
Subject: [ruby-changes:12342] Ruby:r24037 (ruby_1_9_1): merges r23846 from trunk into ruby_1_9_1.

yugui	2009-07-12 22:56:21 +0900 (Sun, 12 Jul 2009)

  New Revision: 24037

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24037

  Log:
    merges r23846 from trunk into ruby_1_9_1.
    --
    * enum.c (first_i): wrong condition for no argument #first.
      [ruby-core:24017]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enum.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24036)
+++ ruby_1_9_1/ChangeLog	(revision 24037)
@@ -1,3 +1,8 @@
+Thu Jun 25 06:25:49 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* enum.c (first_i): wrong condition for no argument #first.
+	  [ruby-core:24017]
+
 Wed Jun 24 15:02:29 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_set_encode): show the erred file name instead of
Index: ruby_1_9_1/enum.c
===================================================================
--- ruby_1_9_1/enum.c	(revision 24036)
+++ ruby_1_9_1/enum.c	(revision 24037)
@@ -607,23 +607,23 @@
 }
 
 static VALUE
-first_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
 {
     ENUM_WANT_SVALUE();
 
-    if (NIL_P(ary[0])) {
-	ary[1] = i;
+    if (NIL_P(params[1])) {
+	params[1] = i;
 	rb_iter_break();
     }
     else {
-	long n = ary[0];
+	long n = params[0];
 
-	rb_ary_push(ary[1], i);
+	rb_ary_push(params[1], i);
 	n--;
 	if (n <= 0) {
 	    rb_iter_break();
 	}
-	ary[0] = n;
+	params[0] = n;
     }
     return Qnil;
 }
@@ -642,10 +642,10 @@
 static VALUE
 enum_first(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE n, ary[2];
+    VALUE n, params[2];
 
     if (argc == 0) {
-	ary[0] = ary[1] = Qnil;
+	params[0] = params[1] = Qnil;
     }
     else {
 	long len;
@@ -653,12 +653,12 @@
 	rb_scan_args(argc, argv, "01", &n);
 	len = NUM2LONG(n);
 	if (len == 0) return rb_ary_new2(0);
-	ary[0] = len;
-	ary[1] = rb_ary_new2(len);
+	params[0] = len;
+	params[1] = rb_ary_new2(len);
     }
-    rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)ary);
+    rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)params);
 
-    return ary[1];
+    return params[1];
 }
 
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24036)
+++ ruby_1_9_1/version.h	(revision 24037)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-06-25"
-#define RUBY_PATCHLEVEL 203
+#define RUBY_PATCHLEVEL 204
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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

[前][次][番号順一覧][スレッド一覧]