diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:02:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:02:06 +0000 |
| commit | 2a333424b7317c9410e08b24c273b3fbc76f5bf9 (patch) | |
| tree | 6ed170dff258179821cdf31ec709e82b551b71ec | |
| parent | 818bbd4f3e8c9139fe1c6b162bc448ecd163c832 (diff) | |
| download | ruby-2a333424b7317c9410e08b24c273b3fbc76f5bf9.tar.gz ruby-2a333424b7317c9410e08b24c273b3fbc76f5bf9.tar.xz ruby-2a333424b7317c9410e08b24c273b3fbc76f5bf9.zip | |
merges r20169 from trunk into ruby_1_9_1.
* lib/delegate.rb (Delegator.delegating_block): should not refer
DelegateClass specific @delegate_dc_obj. a patch from Erik
Hollensbe in [ruby-core:19671].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/delegate.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Nov 10 10:50:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/delegate.rb (Delegator.delegating_block): should not refer + DelegateClass specific @delegate_dc_obj. a patch from Erik + Hollensbe in [ruby-core:19671]. + Sun Nov 9 13:04:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * struct.c (rb_struct_initialize_m): avoid unnecessary array diff --git a/lib/delegate.rb b/lib/delegate.rb index 353c68ee9..025e901a8 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -234,7 +234,7 @@ end def Delegator.delegating_block(mid) lambda do |*args, &block| begin - @delegate_dc_obj.__send__(mid, *args, &block) + __getobj__.__send__(mid, *args, &block) rescue re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o $!.backtrace.delete_if {|t| re =~ t} |