From 34401f9014c0d983f66d144ca8cccd25b1fe47a7 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Aug 2009 06:56:57 +0000 Subject: [PATCH] * array.c (permute0): use chars for boolean array. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- array.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d4ce9ad0a..729670c27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Mon Aug 3 15:48:40 2009 Nobuyoshi Nakada +Mon Aug 3 15:56:52 2009 Nobuyoshi Nakada + + * array.c (permute0): use chars for boolean array. * array.c (rb_ary_{permutation,combination}): disallow reentrance with continuation since work-buffers cannot restore. diff --git a/array.c b/array.c index 7b5e7ab063..b6a8900049 100644 --- a/array.c +++ b/array.c @@ -3664,7 +3664,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary) * values: the Ruby array that holds the actual values to permute */ static void -permute0(long n, long r, long *p, long index, int *used, VALUE values) +permute0(long n, long r, long *p, long index, char *used, VALUE values) { long i,j; for (i = 0; i < n; i++) { @@ -3746,12 +3746,12 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary) else { /* this is the general case */ volatile VALUE t0 = tmpbuf(n,sizeof(long)); long *p = (long*)RSTRING_PTR(t0); - volatile VALUE t1 = tmpbuf(n,sizeof(int)); - int *used = (int*)RSTRING_PTR(t1); + volatile VALUE t1 = tmpbuf(n,sizeof(char)); + char *used = (char*)RSTRING_PTR(t1); VALUE ary0 = ary_make_substitution(ary); /* private defensive copy of ary */ RBASIC(ary0)->klass = 0; - for (i = 0; i < n; i++) used[i] = 0; /* initialize array */ + MEMZERO(used, char, n); /* initialize array */ permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */ tmpbuf_discard(t0);