diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 19:28:54 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 19:28:54 +0000 |
commit | 4e968660ee0e903f82ea7c6c79ebbaadb87edce2 (patch) | |
tree | 454e8c3383b971632c594a4369e8e9b5ded67201 | |
parent | 1b5c41b460bf0713e8abf12a0c067aecb576a87c (diff) |
Backport revision 28309:
* lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/delegate.rb | 16 |
2 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Jun 13 04:27:55 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139] + Sun Jun 13 02:17:49 2010 NARUSE, Yui <naruse@ruby-lang.org> * enc/trans/utf8_mac.trans (buf_apply): fix for patterns diff --git a/lib/delegate.rb b/lib/delegate.rb index dead782bbb..2c1db88a75 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -117,7 +117,7 @@ class Delegator < BasicObject kernel = ::Kernel.dup kernel.class_eval do - [:to_s,:inspect,:=~,:!~,:===,:<=>].each do |m| + [:to_s,:inspect,:=~,:!~,:===,:<=>,:eql?,:hash].each do |m| undef_method m end end @@ -187,7 +187,7 @@ class Delegator < BasicObject # Note: no need to specialize private_methods, since they are not forwarded # - # Returns true if two objects are considered same. + # Returns true if two objects are considered of equal value. # def ==(obj) return true if obj.equal?(self) @@ -195,6 +195,18 @@ class Delegator < BasicObject end # + # Returns true if two objects are not considered of equal value. + # + def !=(obj) + return false if obj.equal?(self) + __getobj__ != obj + end + + def ! + !__getobj__ + end + + # # This method must be overridden by subclasses and should return the object # method calls are being delegated to. # |