From 25ff7ef4c68ef7b6f53a8eb61ef4ec57142852b9 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 1 Oct 2007 14:46:07 +0000 Subject: * array.c (rb_ary_combination): revisit #combination behavior. suggested by David Flanagan. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 0c25de0705..4c75c6d70d 100644 --- a/array.c +++ b/array.c @@ -3028,13 +3028,11 @@ rb_ary_combination(VALUE ary, VALUE num) RETURN_ENUMERATOR(ary, 1, &num); n = NUM2LONG(num); len = RARRAY_LEN(ary); - if (n < 1 || len < n) { + if (len < n) { /* yield nothing */ } - else if (n == 0) { - for (i = 0; i < len; i++) { - rb_yield(rb_ary_new2(0)); - } + else if (n <= 0) { + rb_yield(rb_ary_new2(0)); } else if (n == 1) { for (i = 0; i < len; i++) { -- cgit v1.2.3