summaryrefslogtreecommitdiff
path: root/lib/set.rb
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-13 19:09:36 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-13 19:09:36 +0000
commit8ef3af646f42384cbbd0de83415b1e405ae2393a (patch)
treea04c78e2258772a07ab83c29d6783d0a12fc86de /lib/set.rb
parent242e2aaec2d0e755a54c3cc4c99d2c4d9046f4db (diff)
* lib/set.rb (==): Optimization; patch by Arthur Schreiber [ruby-core:17203]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/set.rb')
-rw-r--r--lib/set.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/set.rb b/lib/set.rb
index 8f2bef9..f21ff14 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -327,13 +327,16 @@ class Set
# Returns true if two sets are equal. The equality of each couple
# of elements is defined according to Object#eql?.
- def ==(set)
- equal?(set) and return true
-
- set.is_a?(Set) && size == set.size or return false
-
- hash = @hash.dup
- set.all? { |o| hash.include?(o) }
+ def ==(other)
+ if self.equal?(other)
+ true
+ elsif other.instance_of?(self.class)
+ @hash == other.instance_variable_get(:@hash)
+ elsif other.is_a?(Set) && self.size == other.size
+ other.all? { |o| @hash.include?(o) }
+ else
+ false
+ end
end
def hash # :nodoc: