diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 19:35:50 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-29 19:35:50 +0000 |
commit | 0d0c31ff8414edc38417b7b172819275e03f4dc3 (patch) | |
tree | b428b50b998547922d3dc15622137d69494bb455 /array.c | |
parent | c5ed8911f282a04b96d0f0241055542894dc2c9b (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -3064,27 +3064,34 @@ rb_ary_nitems(ary) /* * call-seq: + * array.count -> int * array.count(obj) -> int * array.count { |item| block } -> int * - * Returns the number of elements which equals to <i>obj</i>. - * If a block is given, counts the number of elements yielding a true value. + * Returns the number of elements. If an argument is given, counts + * the number of elements which equals to <i>obj</i>. If a block is + * given, counts the number of elements yielding a true value. * * ary = [1, 2, 4, 2] + * ary.count # => 4 * ary.count(2) # => 2 * ary.count{|x|x%2==0} # => 3 * */ static VALUE -rb_ary_count(int argc, VALUE *argv, VALUE ary) +rb_ary_count(argc, argv, ary) + int argc; + VALUE *argv; + VALUE ary; { long n = 0; if (argc == 0) { VALUE *p, *pend; - RETURN_ENUMERATOR(ary, 0, 0); + if (!rb_block_given_p()) + return LONG2NUM(RARRAY_LEN(ary)); for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { if (RTEST(rb_yield(*p))) n++; |