summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 17:11:36 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-06 17:11:36 +0000
commit68c90c4a2d0b9431ad6f12ba12c91c7e3d65360d (patch)
treeaa287401867b69d08566bf9c1d41b9543d08b6eb /array.c
parent6bbf668d6e797a402a3e6819f4efda5315db1a11 (diff)
* array.c (rb_ary_repeated_permutation): Support for repeated_permutation.size
[Feature #6636] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/array.c b/array.c
index a9a8d95c36..3eeafc8621 100644
--- a/array.c
+++ b/array.c
@@ -26,7 +26,7 @@
VALUE rb_cArray;
-static ID id_cmp, id_div;
+static ID id_cmp, id_div, id_power;
#define ARY_DEFAULT_SIZE 16
#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
@@ -4552,6 +4552,19 @@ rpermute0(long n, long r, long *p, long index, VALUE values)
}
}
+static VALUE
+rb_ary_repeated_permutation_size(VALUE ary, VALUE args)
+{
+ long n = RARRAY_LEN(ary);
+ long k = NUM2LONG(RARRAY_PTR(args)[0]);
+
+ if (k < 0) {
+ return LONG2FIX(0);
+ }
+
+ return rb_funcall(LONG2NUM(n), id_power, 1, LONG2NUM(k));
+}
+
/*
* call-seq:
* ary.repeated_permutation(n) { |p| block } -> ary
@@ -4581,7 +4594,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
long r, n, i;
n = RARRAY_LEN(ary); /* Array length */
- RETURN_ENUMERATOR(ary, 1, &num); /* Return Enumerator if no block */
+ RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size); /* Return Enumerator if no block */
r = NUM2LONG(num); /* Permutation size from argument */
if (r < 0) {
@@ -5262,4 +5275,5 @@ Init_Array(void)
id_cmp = rb_intern("<=>");
sym_random = ID2SYM(rb_intern("random"));
id_div = rb_intern("div");
+ id_power = rb_intern("**");
}