diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/set.rb | 4 | ||||
| -rw-r--r-- | test/test_set.rb | 27 |
3 files changed, 37 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Jun 15 14:33:02 2015 Akinori MUSHA <knu@iDaemons.org> + + * lib/set.rb: Make Set#each and SortedSet#each generate a sized + enumerator. [GH-931] by kachick (Kenichi Kamiya) + + * test/test_set.rb: Import tests from Set into SortedSet. [GH-931] + by kachick (Kenichi Kamiya) + Mon Jun 15 02:26:34 2015 NARUSE, Yui <naruse@ruby-lang.org> * lib/net/http.rb (Net::HTTP#connect): use connect_nonblock and diff --git a/lib/set.rb b/lib/set.rb index 59d70e82ca..d612fdcb92 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -284,7 +284,7 @@ class Set # the element as parameter. Returns an enumerator if no block is # given. def each(&block) - block or return enum_for(__method__) + block or return enum_for(__method__) { size } @hash.each_key(&block) self end @@ -663,7 +663,7 @@ class SortedSet < Set end def each(&block) - block or return enum_for(__method__) + block or return enum_for(__method__) { size } to_a.each(&block) self end diff --git a/test/test_set.rb b/test/test_set.rb index e9867dd923..854bcc637b 100644 --- a/test/test_set.rb +++ b/test/test_set.rb @@ -364,6 +364,10 @@ class TC_Set < Test::Unit::TestCase ary.empty? or raise "forgotten elements: #{ary.join(', ')}" } + + assert_equal(6, e.size) + set << 42 + assert_equal(7, e.size) end def test_add @@ -669,6 +673,29 @@ class TC_SortedSet < Test::Unit::TestCase assert_equal(['four', 'one', 'three', 'two'], s.to_a) assert_equal(['four', 'one', 'three', 'two'], a) end + + def test_each + ary = [1,3,5,7,10,20] + set = SortedSet.new(ary) + + ret = set.each { |o| } + assert_same(set, ret) + + e = set.each + assert_instance_of(Enumerator, e) + + assert_nothing_raised { + set.each { |o| + ary.delete(o) or raise "unexpected element: #{o}" + } + + ary.empty? or raise "forgotten elements: #{ary.join(', ')}" + } + + assert_equal(6, e.size) + set << 42 + assert_equal(7, e.size) + end end class TC_Enumerable < Test::Unit::TestCase |