kazu	2008-03-12 02:16:55 +0900 (Wed, 12 Mar 2008)

  New Revision: 15752

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/delegate.rb

  Log:
    * lib/delegate.rb: check $@ to avoid NoMethodError.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15752&r2=15751&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/delegate.rb?r1=15752&r2=15751&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15751)
+++ ruby_1_8/ChangeLog	(revision 15752)
@@ -1,3 +1,7 @@
+Wed Mar 12 02:12:20 2008  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* lib/delegate.rb: check $@ to avoid NoMethodError.
+
 Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (fix_coerce): try conversion before type check.
Index: ruby_1_8/lib/delegate.rb
===================================================================
--- ruby_1_8/lib/delegate.rb	(revision 15751)
+++ ruby_1_8/lib/delegate.rb	(revision 15752)
@@ -139,7 +139,7 @@
 	    begin
 	      __getobj__.__send__(:#{method}, *args, &block)
 	    ensure
-	      $@.delete_if{|s|IgnoreBacktracePat=~s}
+	      $@.delete_if{|s|IgnoreBacktracePat=~s} if $@
 	    end
 	  end
 	EOS
@@ -295,7 +295,7 @@
 	  begin
 	    @_dc_obj.__send__(:#{method}, *args, &block)
 	  ensure
-	    $@.delete_if{|s| ::Delegator::IgnoreBacktracePat =~ s}
+	    $@.delete_if{|s| ::Delegator::IgnoreBacktracePat =~ s} if $@
 	  end
 	end
       EOS

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/