1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

array.c: yield_indexed_values

Browse Source 
* array.c (yield_indexed_values): extract from permute0(),
  rpermute0(), and rcombinate0().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-13 08:33:58 +00:00
parent e6f1557562
commit 95bac4f75e
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 13 17:32:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (yield_indexed_values): extract from permute0(),
rpermute0(), and rcombinate0().
Fri Jun 13 13:42:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 13 13:42:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_permutation): `p` is the array of size `r`, as * array.c (rb_ary_permutation): `p` is the array of size `r`, as

57
array.c
View File

@ -4722,6 +4722,25 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
#define tmpary(n) rb_ary_tmp_new(n) #define tmpary(n) rb_ary_tmp_new(n)
#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray)) #define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
/*
* Build a ruby array of the corresponding values and yield it to the
* associated block.
* Return the class of +values+ for reentry check.
*/
static int
yield_indexed_values(const VALUE values, const long r, const long *const p)
{
const VALUE result = rb_ary_new2(r);
VALUE *const result_array = RARRAY_PTR(result);
const VALUE *const values_array = RARRAY_CONST_PTR(values);
long i;
for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
ARY_SET_LEN(result, r);
rb_yield(result);
return !RBASIC(values)->klass;
}
/* /*
* Recursively compute permutations of +r+ elements of the set * Recursively compute permutations of +r+ elements of the set
* <code>[0..n-1]</code>. * <code>[0..n-1]</code>.
@ -4739,7 +4758,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
static void static void
permute0(long n, long r, long *p, long index, char *used, VALUE values) permute0(long n, long r, long *p, long index, char *used, VALUE values)
{ {
long i,j; long i;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (used[i] == 0) { if (used[i] == 0) {
p[index] = i; p[index] = i;
@ -4750,17 +4769,7 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
used[i] = 0; /* index unused */ used[i] = 0; /* index unused */
} }
else { else {
/* We have a complete permutation of array indexes */ if (!yield_indexed_values(values, r, p)) {
/* Build a ruby array of the corresponding values */
/* And yield it to the associated block */
VALUE result = rb_ary_new2(r);
VALUE *result_array = RARRAY_PTR(result);
const VALUE *values_array = RARRAY_PTR(values);
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
ARY_SET_LEN(result, r);
rb_yield(result);
if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "permute reentered"); rb_raise(rb_eRuntimeError, "permute reentered");
} }
} }
@ -4974,24 +4983,14 @@ rb_ary_combination(VALUE ary, VALUE num)
static void static void
rpermute0(long n, long r, long *p, long index, VALUE values) rpermute0(long n, long r, long *p, long index, VALUE values)
{ {
long i, j; long i;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
p[index] = i; p[index] = i;
if (index < r-1) { /* if not done yet */ if (index < r-1) { /* if not done yet */
rpermute0(n, r, p, index+1, values); /* recurse */ rpermute0(n, r, p, index+1, values); /* recurse */
} }
else { else {
/* We have a complete permutation of array indexes */ if (!yield_indexed_values(values, r, p)) {
/* Build a ruby array of the corresponding values */
/* And yield it to the associated block */
VALUE result = rb_ary_new2(r);
VALUE *result_array = RARRAY_PTR(result);
const VALUE *values_array = RARRAY_PTR(values);
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
ARY_SET_LEN(result, r);
rb_yield(result);
if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "repeated permute reentered"); rb_raise(rb_eRuntimeError, "repeated permute reentered");
} }
} }
@ -5072,7 +5071,6 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
static void static void
rcombinate0(long n, long r, long *p, long index, long rest, VALUE values) rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
{ {
long j;
if (rest > 0) { if (rest > 0) {
for (; index < n; ++index) { for (; index < n; ++index) {
p[r-rest] = index; p[r-rest] = index;
@ -5080,14 +5078,7 @@ rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
} }
} }
else { else {
VALUE result = rb_ary_new2(r); if (!yield_indexed_values(values, r, p)) {
VALUE *result_array = RARRAY_PTR(result);
const VALUE *values_array = RARRAY_PTR(values);
for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
ARY_SET_LEN(result, r);
rb_yield(result);
if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "repeated combination reentered"); rb_raise(rb_eRuntimeError, "repeated combination reentered");
} }
} }