summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-16 11:20:06 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-16 11:20:06 +0000
commit682ab87c6b1d601ed8a420e79c4c1883ae7f5291 (patch)
tree10b851c2269de5ffd8a7ebe364e6ae6c076faea8
parent2c9179d882d794c5050a659653549afe969bbe9b (diff)
downloadruby-682ab87c6b1d601ed8a420e79c4c1883ae7f5291.tar.gz
ruby-682ab87c6b1d601ed8a420e79c4c1883ae7f5291.tar.xz
ruby-682ab87c6b1d601ed8a420e79c4c1883ae7f5291.zip
* lib/delegate.rb (Delegator#method_missing): remove backtrace
lines _until_ `method_missing'. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/delegate.rb4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dbc3d355..614c223b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/delegate.rb (Delegator#method_missing): remove backtrace
+ lines _until_ `method_missing'.
+
Fri Oct 16 20:09:55 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator#freeze): #freeze should freeze self
diff --git a/lib/delegate.rb b/lib/delegate.rb
index d8a63660a..da58048f3 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -137,7 +137,9 @@ class Delegator
target.__send__(m, *args, &block)
end
rescue Exception
- $@.delete_if{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s}
+ if i = $@.index{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s}
+ $@[0..i] = []
+ end
::Kernel::raise
end
end