knu	2008-05-14 12:46:37 +0900 (Wed, 14 May 2008)

  New Revision: 16412

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb

  Log:
    * array.c (rb_ary_count): Override Enumerable#count for better
      performance.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/array.c?r1=16412&r2=16411&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16412&r2=16411&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_array.rb?r1=16412&r2=16411&diff_format=u

Index: array.c
===================================================================
--- array.c	(revision 16411)
+++ array.c	(revision 16412)
@@ -2776,7 +2776,50 @@
     return LONG2NUM(n);
 }
 
+/*
+ *  call-seq:
+ *     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 tthe number of elements yielding a true value.
+ *
+ *     ary = [1, 2, 4, 2]
+ *     ary.count(2)          # => 2
+ *     ary.count{|x|x%2==0}  # => 3
+ *
+ */
+
 static VALUE
+rb_ary_count(int argc, VALUE *argv, VALUE ary)
+{
+    long n = 0;
+
+    if (argc == 0) {
+	VALUE *p, *pend;
+
+	RETURN_ENUMERATOR(ary, 0, 0);
+
+	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+	    if (RTEST(rb_yield(*p))) n++;
+	}
+    }
+    else {
+	VALUE obj, *p, *pend;
+
+	rb_scan_args(argc, argv, "1", &obj);
+	if (rb_block_given_p()) {
+	    rb_warn("given block not used");
+	}
+	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+	    if (rb_equal(*p, obj)) n++;
+	}
+    }
+
+    return LONG2NUM(n);
+}
+
+static VALUE
 flatten(VALUE ary, int level, int *modified)
 {
     long i = 0;
@@ -3461,6 +3504,7 @@
     rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
     rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
     rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
+    rb_define_method(rb_cArray, "count", rb_ary_count, -1);
     rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
     rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
     rb_define_method(rb_cArray, "choice", rb_ary_choice, 0);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16411)
+++ ChangeLog	(revision 16412)
@@ -1,3 +1,8 @@
+Wed May 14 12:42:36 2008  Akinori MUSHA  <knu@i...>
+
+	* array.c (rb_ary_count): Override Enumerable#count for better
+	  performance.
+
 Wed May 14 11:29:06 2008  Koichi Sasada  <ko1@a...>
 
 	* insns.def: add a "putcbase" instruction.
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 16411)
+++ test/ruby/test_array.rb	(revision 16412)
@@ -537,6 +537,14 @@
     assert_equal([1, 2, 3, 1, 2, 3], a)
   end
 
+  def test_count
+    a = @cls[1, 2, 3, 1, 2]
+    assert_equal(2, a.count(1))
+    assert_equal(3, a.count {|x| x % 2 == 1 })
+    assert_equal(2, a.count(1) {|x| x % 2 == 1 })
+    assert_raise(ArgumentError) { a.count(0, 1) }
+  end
+
   def test_delete
     a = @cls[*('cab'..'cat').to_a]
     assert_equal('cap', a.delete('cap'))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/