ruby-changes:16271
From: wyhaines <ko1@a...>
Date: Thu, 10 Jun 2010 02:06:36 +0900 (JST)
Subject: [ruby-changes:16271] Ruby:r28239 (ruby_1_8_6): lib/delegate.rb: Backport #1781 ; allow a block to be properly passed through.
wyhaines 2010-06-10 02:06:24 +0900 (Thu, 10 Jun 2010) New Revision: 28239 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28239 Log: lib/delegate.rb: Backport #1781 [ruby-core:24356]; allow a block to be properly passed through. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/delegate.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 28238) +++ ruby_1_8_6/ChangeLog (revision 28239) @@ -1,6 +1,10 @@ +Thu Jun 10 01:40:00 Kirk Haines <khaines@r...> + + * lib/delegate.rb: Backport #1781 [ruby-core:24356]; allow a block to be properly passed through. + Wed Jun 9 04:35:00 Kirk Haines <khaines@r...> - * gc.c: Backport #1785 [ruby-core:24395]; check to make sure finalizer_table isn't null before trying to run finalizers. + * gc.c: Backport #1785 [ruby-core:24395]; check to make sure finalizer_table isn't null before trying to run finalizers. r28235 Wed Jun 9 02:10:00 Kirk Haines <khaines@r...> Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 28238) +++ ruby_1_8_6/version.h (revision 28239) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2010-06-09" +#define RUBY_RELEASE_DATE "2010-06-10" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20100609 -#define RUBY_PATCHLEVEL 411 +#define RUBY_RELEASE_CODE 20100610 +#define RUBY_PATCHLEVEL 412 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8_6/lib/delegate.rb =================================================================== --- ruby_1_8_6/lib/delegate.rb (revision 28238) +++ ruby_1_8_6/lib/delegate.rb (revision 28239) @@ -152,12 +152,12 @@ alias initialize_methods initialize # Handles the magic of delegation through \_\_getobj\_\_. - def method_missing(m, *args) + def method_missing(m, *args, &block) target = self.__getobj__ unless target.respond_to?(m) - super(m, *args) + super(m, *args, &block) end - target.__send__(m, *args) + target.__send__(m, *args, &block) end # @@ -265,11 +265,11 @@ def initialize(obj) # :nodoc: @_dc_obj = obj end - def method_missing(m, *args) # :nodoc: + def method_missing(m, *args, &block) # :nodoc: unless @_dc_obj.respond_to?(m) - super(m, *args) + super(m, *args, &block) end - @_dc_obj.__send__(m, *args) + @_dc_obj.__send__(m, *args, &block) end def respond_to?(m, include_private = false) # :nodoc: return true if super -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/