ruby-changes:12651
From: nobu <ko1@a...>
Date: Mon, 3 Aug 2009 15:57:17 +0900 (JST)
Subject: [ruby-changes:12651] Ruby:r24365 (trunk): * array.c (permute0): use chars for boolean array.
nobu 2009-08-03 15:56:57 +0900 (Mon, 03 Aug 2009) New Revision: 24365 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24365 Log: * array.c (permute0): use chars for boolean array. Modified files: trunk/ChangeLog trunk/array.c Index: array.c =================================================================== --- array.c (revision 24364) +++ array.c (revision 24365) @@ -3664,7 +3664,7 @@ * 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 @@ 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); Index: ChangeLog =================================================================== --- ChangeLog (revision 24364) +++ ChangeLog (revision 24365) @@ -1,5 +1,7 @@ -Mon Aug 3 15:48:40 2009 Nobuyoshi Nakada <nobu@r...> +Mon Aug 3 15:56:52 2009 Nobuyoshi Nakada <nobu@r...> + * array.c (permute0): use chars for boolean array. + * array.c (rb_ary_{permutation,combination}): disallow reentrance with continuation since work-buffers cannot restore. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/