revert r45747 because it introduced severe incompatibility.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 7 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index 6094dee58a..cf886a708f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,27 +34,6 @@ Wed Apr 30 16:09:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an
 	  inline function.
 
-Wed Apr 30 15:20:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator#__getobj__): target object must be set.
-
-	* lib/delegate.rb (DelegateClass#__getobj__): ditto.
-
-Wed Apr 30 15:20:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator#method_missing): try private methods defined in
-	  Kernel after the target.  [Fixes GH-449]
-
-Wed Apr 30 15:20:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator#send): separate from method_missing so
-	  that super calls proper method.
-
-Wed Apr 30 15:20:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator#send): override to get rid of global function interference.
-	  [Fixes GH-449]
-
 Wed Apr 30 15:04:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index b4d495edea..e46e4f8c23 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -43,16 +43,9 @@
 class Delegator < BasicObject
   kernel = ::Kernel.dup
   kernel.class_eval do
-    alias __raise__ raise
     [:to_s,:inspect,:=~,:!~,:===,:<=>,:eql?,:hash].each do |m|
       undef_method m
     end
-    private_instance_methods.each do |m|
-      if /\Ablock_given\?\z|iterator\?\z|\A__raise__\z/ =~ m
-        next
-      end
-      undef_method m
-    end
   end
   include kernel
 
@@ -76,15 +69,9 @@ class Delegator < BasicObject
   def method_missing(m, *args, &block)
     target = self.__getobj__
     begin
-      if target.respond_to?(m)
-        target.__send__(m, *args, &block)
-      elsif ::Kernel.respond_to?(m, true)
-        ::Kernel.instance_method(m).bind(self).(*args, &block)
-      else
-        super(m, *args, &block)
-      end
+      target.respond_to?(m) ? target.__send__(m, *args, &block) : super(m, *args, &block)
     ensure
-      $@.delete_if {|t| %r"\A#{Regexp.quote(__FILE__)}:(?:#{[__LINE__-7, __LINE__-5, __LINE__-3].join('|')}):"o =~ t} if $@
+      $@.delete_if {|t| %r"\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:"o =~ t} if $@
     end
   end
 
@@ -155,7 +142,7 @@ class Delegator < BasicObject
   # method calls are being delegated to.
   #
   def __getobj__
-    __raise__ ::NotImplementedError, "need to define `__getobj__'"
+    raise NotImplementedError, "need to define `__getobj__'"
   end
 
   #
@@ -163,7 +150,7 @@ class Delegator < BasicObject
   # to _obj_.
   #
   def __setobj__(obj)
-    __raise__ ::NotImplementedError, "need to define `__setobj__'"
+    raise NotImplementedError, "need to define `__setobj__'"
   end
 
   #
@@ -278,7 +265,6 @@ end
 class SimpleDelegator<Delegator
   # Returns the current object method calls are being delegated to.
   def __getobj__
-    __raise__ ::ArgumentError, "not delegated" unless defined?(@delegate_sd_obj)
     @delegate_sd_obj
   end
 
@@ -297,7 +283,7 @@ class SimpleDelegator<Delegator
   #   puts names[1]    # => Sinclair
   #
   def __setobj__(obj)
-    __raise__ ::ArgumentError, "cannot delegate to self" if self.equal?(obj)
+    raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
     @delegate_sd_obj = obj
   end
 end
@@ -353,11 +339,10 @@ def DelegateClass(superclass)
   methods -= [:to_s,:inspect,:=~,:!~,:===]
   klass.module_eval do
     def __getobj__  # :nodoc:
-      __raise__ ::ArgumentError, "not delegated" unless defined?(@delegate_dc_obj)
       @delegate_dc_obj
     end
     def __setobj__(obj)  # :nodoc:
-      __raise__ ::ArgumentError, "cannot delegate to self" if self.equal?(obj)
+      raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
       @delegate_dc_obj = obj
     end
     methods.each do |method|
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index cfc16d1d86..948cbc25bc 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -379,29 +379,6 @@ eom
         AssertFile
       end
 
-      def assert_raise_with_message(exception, expected, msg = nil, &block)
-        case expected
-        when String
-          assert = :assert_equal
-        when Regexp
-          assert = :assert_match
-        else
-          raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
-        end
-
-        ex = assert_raise(exception, *msg) {yield}
-        msg = message(msg, "") {"Expected Exception(#{exception}) was raised, but the message doesn't match"}
-
-        if assert == :assert_equal
-          assert_equal(expected, ex.message, msg)
-        else
-          msg = message(msg) { "Expected #{mu_pp expected} to match #{mu_pp ex.message}" }
-          assert expected =~ ex.message, msg
-          block.binding.eval("proc{|_|$~=_}").call($~)
-        end
-        ex
-      end
-
       class << (AssertFile = Struct.new(:message).new)
         include Assertions
         def assert_file_predicate(predicate, *args)
diff --git a/test/test_delegate.rb b/test/test_delegate.rb
index dfe9f1db10..a09451b88f 100644
--- a/test/test_delegate.rb
+++ b/test/test_delegate.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'delegate'
-require_relative 'ruby/envutil'
 
 class TestDelegateClass < Test::Unit::TestCase
   module M
@@ -134,39 +133,4 @@ class TestDelegateClass < Test::Unit::TestCase
     assert_raise(NoMethodError, '[ruby-dev:40314]#4') {d.delegate_test_private}
     assert_raise(NoMethodError, '[ruby-dev:40314]#5') {d.send(:delegate_test_private)}
   end
-
-  def test_global_function
-    klass = Class.new do
-      def open
-      end
-    end
-    obj = klass.new
-    d = SimpleDelegator.new(obj)
-    assert_nothing_raised(ArgumentError) {obj.open}
-    assert_nothing_raised(ArgumentError) {d.open}
-    assert_nothing_raised(ArgumentError) {d.send(:open)}
-  end
-
-  def test_send_method_in_delegator
-    d = Class.new(SimpleDelegator) do
-      def foo
-        "foo"
-      end
-    end.new(Object.new)
-    assert_equal("foo", d.send(:foo))
-  end
-
-  def test_unset_simple_delegator
-    d = SimpleDelegator.allocate
-    assert_raise_with_message(ArgumentError, /not delegated/) {
-      d.__getobj__
-    }
-  end
-
-  def test_unset_delegate_class
-    d = IV.allocate
-    assert_raise_with_message(ArgumentError, /not delegated/) {
-      d.__getobj__
-    }
-  end
 end
diff --git a/version.h b/version.h
index 49e41d5247..818b795a4d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-04-30"
-#define RUBY_PATCHLEVEL 475
+#define RUBY_PATCHLEVEL 476
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 4