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

ruby-changes:38376

From: glass <ko1@a...>
Date: Sun, 10 May 2015 11:25:40 +0900 (JST)
Subject: [ruby-changes:38376] glass:r50457 (trunk): * enum.c (enum_to_a): Use size to set array capa when possible.

glass	2015-05-10 11:25:33 +0900 (Sun, 10 May 2015)

  New Revision: 50457

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

  Log:
    * enum.c (enum_to_a): Use size to set array capa when possible.
      the patch is from HonoreDB <aweiner at mdsol.com>.
      [fix GH-444]

  Modified files:
    trunk/ChangeLog
    trunk/enum.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50456)
+++ ChangeLog	(revision 50457)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun May 10 11:23:03 2015  Masaki Matsushita <glass.saga@g...>
+
+	* enum.c (enum_to_a): Use size to set array capa when possible.
+	  the patch is from HonoreDB <aweiner at mdsol.com>.
+	  [fix GH-444]
+
 Sat May  9 06:48:36 2015  Eric Wong  <e@8...>
 
 	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
Index: enum.c
===================================================================
--- enum.c	(revision 50456)
+++ enum.c	(revision 50457)
@@ -515,7 +515,14 @@ enum_flat_map(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L515
 static VALUE
 enum_to_a(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE ary = rb_ary_new();
+    VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0);
+
+    if (NIL_P(size) || size == Qundef) {
+	ary = rb_ary_new();
+    }
+    else {
+	ary = rb_ary_new_capa(NUM2LONG(size));
+    }
 
     rb_block_call(obj, id_each, argc, argv, collect_all, ary);
     OBJ_INFECT(ary, obj);

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

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