diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-14 16:50:16 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-14 16:50:16 +0000 |
commit | 970df0d1385ea23c453f4779050a31c4379d6d11 (patch) | |
tree | b1bb745b00858777df90634aa4fc961099ba8045 /lib/delegate.rb | |
parent | fdf4aa982f8265402ec6ecfa137bf2bc4052560d (diff) |
* lib/delegate.rb: catch up with class local variable (@_v) spec.
* lib/singleton.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r-- | lib/delegate.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index 8574bc39ec..b5ebaa15da 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -95,15 +95,15 @@ # class SimpleDelegator < Delegator # def initialize(obj) # super # pass obj to Delegator constructor, required -# @_sd_obj = obj # store obj for future use +# @delegate_sd_obj = obj # store obj for future use # end # # def __getobj__ -# @_sd_obj # return object we are delegating to, required +# @delegate_sd_obj # return object we are delegating to, required # end # # def __setobj__(obj) -# @_sd_obj = obj # change delegation object, a feature we're providing +# @delegate_sd_obj = obj # change delegation object, a feature we're providing # end # # # ... @@ -219,7 +219,7 @@ end class SimpleDelegator<Delegator # Returns the current object method calls are being delegated to. def __getobj__ - @_sd_obj + @delegate_sd_obj end # @@ -238,7 +238,7 @@ class SimpleDelegator<Delegator # def __setobj__(obj) raise ArgumentError, "cannot delegate to self" if self.equal?(obj) - @_sd_obj = obj + @delegate_sd_obj = obj end end @@ -269,11 +269,11 @@ def DelegateClass(superclass) klass.module_eval { include Delegator::MethodDelegation def __getobj__ # :nodoc: - @_dc_obj + @delegate_dc_obj end def __setobj__(obj) # :nodoc: raise ArgumentError, "cannot delegate to self" if self.equal?(obj) - @_dc_obj = obj + @delegate_dc_obj = obj end } for method in methods @@ -281,7 +281,7 @@ def DelegateClass(superclass) klass.module_eval <<-EOS, __FILE__, __LINE__+1 def #{method}(*args, &block) begin - @_dc_obj.__send(:#{method}, *args, &block) + @delegate_dc_obj.__send(:#{method}, *args, &block) rescue $@[0,2] = nil raise |