From 6fe4aa6ed75908cab04f23a36619d04b19cf3466 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 15 Apr 2016 07:22:53 +0000 Subject: merge revision(s) 53381: [Backport #11916] * lib/forwardable.rb (def_instance_delegator) fix delegating to 'args' and 'block', clashing with local variables in generated methods. [ruby-core:72579] [Bug #11916] * lib/forwardable.rb (def_single_delegator): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/forwardable.rb | 12 ++++++++++-- version.h | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e59d0742f..3a1be9620d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 15 14:52:06 2016 Elliot Winkler + + * lib/forwardable.rb (def_instance_delegator) fix delegating to + 'args' and 'block', clashing with local variables in generated + methods. [ruby-core:72579] [Bug #11916] + + * lib/forwardable.rb (def_single_delegator): ditto. + Fri Apr 15 14:27:48 2016 NARUSE, Yui * lib/irb/ext/save-history.rb: suppress warning: method redefined; diff --git a/lib/forwardable.rb b/lib/forwardable.rb index cd15eeab0c..f27437af82 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -178,6 +178,10 @@ module Forwardable # q.push 23 #=> NoMethodError # def def_instance_delegator(accessor, method, ali = method) + if method_defined?(accessor) || private_method_defined?(accessor) + accessor = "#{accessor}()" + end + line_no = __LINE__; str = %{ def #{ali}(*args, &block) begin @@ -270,7 +274,11 @@ module SingleForwardable # the method of the same name in _accessor_). If _new_name_ is # provided, it is used as the name for the delegate method. def def_single_delegator(accessor, method, ali = method) - str = %{ + if method_defined?(accessor) || private_method_defined?(accessor) + accessor = "#{accessor}()" + end + + line_no = __LINE__; str = %{ def #{ali}(*args, &block) begin #{accessor}.__send__(:#{method}, *args, &block) @@ -281,7 +289,7 @@ module SingleForwardable end } - instance_eval(str, __FILE__, __LINE__) + instance_eval(str, __FILE__, line_no) end alias delegate single_delegate diff --git a/version.h b/version.h index 3649df25e3..6d12a8698d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-15" -#define RUBY_PATCHLEVEL 79 +#define RUBY_PATCHLEVEL 80 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -- cgit v1.2.3