From eadc3604c023d04770b81b02651c6f7c3107b3dd Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 13 Aug 2009 15:21:32 +0000 Subject: [PATCH] * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain multi-byte characters. a patch from Kenta Murata in [ruby-dev:39066]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/delegate.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bad1532043..31bdc40b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 14 00:19:49 2009 Yukihiro Matsumoto + + * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain + multi-byte characters. a patch from Kenta Murata in [ruby-dev:39066]. + Thu Aug 13 21:01:03 2009 wanabe * vm.c (vm_exec): returning from lambda runs ensure section. diff --git a/lib/delegate.rb b/lib/delegate.rb index 5fc0cafb4b..d0b732aa8d 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -137,7 +137,7 @@ class Delegator target.__send__(m, *args, &block) end rescue Exception - $@.delete_if{|s| %r"\A#{__FILE__}:\d+:in `method_missing'\z"o =~ s} + $@.delete_if{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s} ::Kernel::raise end end