summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-09 12:35:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-09 12:35:31 +0000
commit7550659a330c099b31c047293a8ab486b8638c8a (patch)
tree1f63c5c9f2360ed75810ec7f52c158176c985e97 /array.c
parentf6a26d06a26cdc094b2d675f29c096110fa14275 (diff)
* array.c (rb_ary_permutation): use frozen shared hidden array.
[ruby-dev:31985] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/array.c b/array.c
index 13e848949e..6360571e40 100644
--- a/array.c
+++ b/array.c
@@ -2988,7 +2988,7 @@ permute0(long n, long r, long *p, long index, int *used, VALUE values)
/* 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 @@ rb_ary_permutation(VALUE ary, VALUE num)
long *p = (long*)RSTRING_PTR(t0);
volatile VALUE t1 = tmpbuf(n,sizeof(int));
int *used = (int*)RSTRING_PTR(t1);
-
- ary = rb_ary_dup(ary); /* private defensive copy of ary */
+ VALUE ary0 = ary_make_shared(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;
}