ruby-changes:2177
From: ko1@a...
Date: 9 Oct 2007 21:35:54 +0900
Subject: [ruby-changes:2177] nobu - Ruby:r13668 (trunk): * array.c (rb_ary_permutation): use frozen shared hidden array.
nobu 2007-10-09 21:35:31 +0900 (Tue, 09 Oct 2007)
New Revision: 13668
Modified files:
trunk/ChangeLog
trunk/array.c
Log:
* array.c (rb_ary_permutation): use frozen shared hidden array.
[ruby-dev:31985]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/array.c?r1=13668&r2=13667
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13668&r2=13667
Index: array.c
===================================================================
--- array.c (revision 13667)
+++ array.c (revision 13668)
@@ -2988,7 +2988,7 @@
/* And yield it to the associated block */
VALUE result = rb_ary_new2(r);
VALUE *result_array = RARRAY_PTR(result);
- VALUE *values_array = RARRAY_PTR(values);
+ const VALUE *values_array = RARRAY_PTR(values);
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
RARRAY(result)->len = r;
@@ -3044,12 +3044,11 @@
long *p = (long*)RSTRING_PTR(t0);
volatile VALUE t1 = tmpbuf(n,sizeof(int));
int *used = (int*)RSTRING_PTR(t1);
+ VALUE ary0 = ary_make_shared(ary); /* private defensive copy of ary */
- ary = rb_ary_dup(ary); /* private defensive copy of ary */
-
for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
- permute0(n,r,p,0,used,ary); /* compute and yield permutations */
+ permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
}
return ary;
}
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13667)
+++ ChangeLog (revision 13668)
@@ -1,10 +1,13 @@
-Tue Oct 9 21:29:19 2007 Nobuyoshi Nakada <nobu@r...>
+Tue Oct 9 21:35:28 2007 Nobuyoshi Nakada <nobu@r...>
* array.c (rb_ary_permutation, rb_ary_combination): missing type
names.
* array.c (rb_ary_permutation): used buffer should be t1.
+ * array.c (rb_ary_permutation): use frozen shared hidden array.
+ [ruby-dev:31985]
+
Tue Oct 9 16:58:10 2007 Yukihiro Matsumoto <matz@r...>
* array.c: remove to_a completely.
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml