diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 15:21:32 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 15:21:32 +0000 |
| commit | 36b4396f922816096def6e4c16074c3be09d4f37 (patch) | |
| tree | d8aba0028a482c17216824fec158655bb73e8793 | |
| parent | d5c467c8bfd0318fcd6fd4f7cc761dd772985b3d (diff) | |
| download | ruby-36b4396f922816096def6e4c16074c3be09d4f37.tar.gz ruby-36b4396f922816096def6e4c16074c3be09d4f37.tar.xz ruby-36b4396f922816096def6e4c16074c3be09d4f37.zip | |
* lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
multi-byte characters. a patch from Kenta Murata in [ruby-dev:39066].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/delegate.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Aug 14 00:19:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <s.wanabe@gmail.com> * vm.c (vm_exec): returning from lambda runs ensure section. diff --git a/lib/delegate.rb b/lib/delegate.rb index 5fc0cafb4..d0b732aa8 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 |