From 57a285edf74b7b304fc00991b1b4fd5e2d62a703 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 26 Aug 2007 17:22:26 +0000
Subject: * io.c (rb_io_each_byte): caused infinite loop.  [ruby-dev:31652]

* io.c (rb_io_getc): should return nil at EOF, not EOFError.

* lib/delegate.rb (SimpleDelegator::__setobj__): use raise
  argument to specify backtrace.

* test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test):
  String#include? no longer works for Fixnum.  use #chr.
  [ruby-dev:31652]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/delegate.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 01ed0871c..9084a7f19 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -283,8 +283,7 @@ def DelegateClass(superclass)
 	  begin
 	    @delegate_dc_obj.__send(:#{method}, *args, &block)
 	  rescue
-	    $@[0,2] = nil
-	    raise
+	    raise $!, $@[2..-1]
 	  end
 	end
       EOS
-- 
cgit