From 6fec28d1a2bf752325814c31de62ace73c5a9b3c Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 20 Feb 2006 00:33:18 +0000 Subject: * lib/delegate.rb (Delegator): should not delegate "funcall". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/delegate.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f56c1c71dc..d766c5354f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 20 09:17:11 2006 Yukihiro Matsumoto + + * lib/delegate.rb (Delegator): should not delegate "funcall". + Mon Feb 20 09:13:42 2006 Yukihiro Matsumoto * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler): diff --git a/lib/delegate.rb b/lib/delegate.rb index 3be335580b..e8a731ae00 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -115,7 +115,7 @@ # implementation, see SimpleDelegator. # class Delegator - preserved = ["__id__", "object_id", "__send__", "respond_to?"] + preserved = ["__id__", "object_id", "__send__", "respond_to?", "send", "funcall"] instance_methods.each do |m| next if preserved.include?(m) undef_method m @@ -262,8 +262,8 @@ def DelegateClass(superclass) klass = Class.new methods = superclass.public_instance_methods(true) methods -= [ - "__id__", "object_id", "__send__", "respond_to?", "==", "equal?", - "initialize", "method_missing", "__getobj__", "__setobj__", + "__id__", "object_id", "__send__", "respond_to?", "send", "funcall", + "==", "equal?", "initialize", "method_missing", "__getobj__", "__setobj__", "clone", "dup", "marshal_dump", "marshal_load", ] klass.module_eval { -- cgit v1.2.3