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

  performance.
  (rb_ary_nitems): Undo the backport.  Use #count {} instead.

* enumerator.c (enumerator_iter_i): Remove an unused function.
  (enumerator_with_index, enumerator_each): Remove unused
  variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 0 deletions

diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 3cb1ec174e..6a816a2c85 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -528,6 +528,14 @@ class TestArray < Test::Unit::TestCase
     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'))