1.4.0

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

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 0771f2feeb..29f2a5ded2 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -34,14 +34,8 @@ class Delegator
 	  begin
 	    __getobj__.__send__(:#{method}, *args, &block)
 	  rescue Exception
-	    c = -caller(0).size
-	    if /:in `__getobj__'$/ =~ $@[c-1]  #`
-	      n = 1
-	    else
-	      c -= 1
-	      n = 2
-	    end
-	    $@[c,n] = nil
+	    $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	    $@.delete_if{|s| /^\\(eval\\):/ =~ s}
 	    raise
 	  end
 	end