diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-18 17:48:18 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-18 17:48:18 +0000 |
commit | 2849ee5d18360f26b55643a2643a1c597376865d (patch) | |
tree | 3e6b37ebb7b4576b78d4faf34d9e0f99ba006bb9 | |
parent | 041224017c5a865ad0ea0d360bce1709b39d2255 (diff) | |
download | ruby-2849ee5d18360f26b55643a2643a1c597376865d.tar.gz |
* lib/set.rb (Set#delete_if, Set#keep_if): Make Set#delete_if and
Set#keep_if more space and time efficient by avoiding to_a.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/set.rb | 4 | ||||
-rw-r--r-- | test/test_set.rb | 12 |
3 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun May 19 02:46:32 2013 Akinori MUSHA <knu@iDaemons.org> + + * lib/set.rb (Set#delete_if, Set#keep_if): Make Set#delete_if and + Set#keep_if more space and time efficient by avoiding to_a. + Sun May 19 02:33:09 2013 Akinori MUSHA <knu@iDaemons.org> * misc/ruby-electric.el (ruby-electric-setup-keymap): Make diff --git a/lib/set.rb b/lib/set.rb index b378253606..4f925e3ec6 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -272,7 +272,7 @@ class Set # true, and returns self. def delete_if block_given? or return enum_for(__method__) - to_a.each { |o| @hash.delete(o) if yield(o) } + select(&proc).each(&@hash.method(:delete)) self end @@ -280,7 +280,7 @@ class Set # false, and returns self. def keep_if block_given? or return enum_for(__method__) - to_a.each { |o| @hash.delete(o) unless yield(o) } + reject(&proc).each(&@hash.method(:delete)) self end diff --git a/test/test_set.rb b/test/test_set.rb index 1027cc1381..904118250c 100644 --- a/test/test_set.rb +++ b/test/test_set.rb @@ -368,6 +368,18 @@ class TC_Set < Test::Unit::TestCase assert_equal(Set[1,2,4,5,7,8,10], set) end + def test_keep_if + set = Set.new(1..10) + ret = set.keep_if { |i| i <= 10 } + assert_same(set, ret) + assert_equal(Set.new(1..10), set) + + set = Set.new(1..10) + ret = set.keep_if { |i| i % 3 != 0 } + assert_same(set, ret) + assert_equal(Set[1,2,4,5,7,8,10], set) + end + def test_collect! set = Set[1,2,3,'a','b','c',-1..1,2..4] |