diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-01 14:46:07 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-01 14:46:07 +0000 |
commit | ed4f2c0744489f2be58f75f912dcd4fa6b8cb0ca (patch) | |
tree | 26c2ecff4ed2b78fd5a63eac3ecc1d9a5a82c59b /array.c | |
parent | 75f42f8d134496760c86ac2af04ab8b4f2feb86a (diff) | |
download | ruby-ed4f2c0744489f2be58f75f912dcd4fa6b8cb0ca.tar.gz ruby-ed4f2c0744489f2be58f75f912dcd4fa6b8cb0ca.tar.xz ruby-ed4f2c0744489f2be58f75f912dcd4fa6b8cb0ca.zip |
* array.c (rb_ary_combination): revisit #combination behavior.
suggested by David Flanagan.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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++) { |