diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/set.rb | 26 |
2 files changed, 25 insertions, 10 deletions
@@ -1,3 +1,11 @@ +Fri Feb 12 02:27:39 2010 Akinori MUSHA <knu@iDaemons.org> + + * lib/set.rb (Set#initialize, Set#replace, Set#merge) + (Set#subtract, Set#&): Fix duck type tests. [ruby-core:28078] + + * lib/set.rb (Set#initialize, Set#replace, Set#merge) + (Set#subtract, Set#&): Try #each if #each_entry fails. + Thu Feb 11 20:43:00 2010 Tanaka Akira <akr@fsij.org> * io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND. @@ -358,6 +366,7 @@ Tue Feb 2 14:30:27 2010 Yukihiro Matsumoto <matz@ruby-lang.org> for duck typing. * lib/set.rb (SortedSet#add): typo fixed. + Tue Feb 2 11:13:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/delegate.rb (Delegator#marshal_dump): exclude diff --git a/lib/set.rb b/lib/set.rb index 3e22a8c839..0835f8a4ca 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -70,13 +70,23 @@ class Set enum.nil? and return if block - enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable" - enum.each_entry { |o| add(block[o]) } + do_with_enum(enum) { |o| add(block[o]) } else merge(enum) end end + def do_with_enum(enum, &block) + if enum.respond_to?(:each_entry) + enum.each_entry(&block) + elsif enum.respond_to?(:each) + enum.each(&block) + else + raise ArgumentError, "value must be enumerable" + end + end + private :do_with_enum + # Copy internal hash. def initialize_copy(orig) @hash = orig.instance_eval{@hash}.dup @@ -123,9 +133,8 @@ class Set if enum.class == self.class @hash.replace(enum.instance_eval { @hash }) else - enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable" clear - enum.each_entry { |o| add(o) } + merge(enum) end self @@ -281,8 +290,7 @@ class Set if enum.instance_of?(self.class) @hash.update(enum.instance_variable_get(:@hash)) else - enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable" - enum.each_entry { |o| add(o) } + do_with_enum(enum) { |o| add(o) } end self @@ -291,8 +299,7 @@ class Set # Deletes every element that appears in the given enumerable object # and returns self. def subtract(enum) - enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable" - enum.each_entry { |o| delete(o) } + do_with_enum(enum) { |o| delete(o) } self end @@ -314,9 +321,8 @@ class Set # Returns a new set containing elements common to the set and the # given enumerable object. def &(enum) - enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable" n = self.class.new - enum.each_entry { |o| n.add(o) if include?(o) } + do_with_enum(enum) { |o| n.add(o) if include?(o) } n end alias intersection & ## |