From 7f7236025953af6e0308995e073f9babbe149473 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Feb 2006 04:53:22 +0000
Subject: * parse.y (parser_parse_string): mention "regexp" in a error  
 message.  a patch from Mauricio Fernandez <mfp at acm.org>  
 [ruby-core:07340]

* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
  instance_eval for objects cannot have singleton classes,
  e.g. fixnums and symbols).  [ruby-dev:28178]

* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
  invoking finalizers.

* gc.c (rb_gc_finalize_deferred): ditto.

* io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
  updated or is already freed.  [ruby-dev:28313]

* eval.c (error_line): include the class name of a surrounding
  method in error position description.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/init.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/irb')

diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 842eb1221e..25059e26e9 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -206,7 +206,7 @@ module IRB
       begin
 	load rc_file
       rescue LoadError, Errno::ENOENT
-      rescue
+      rescue # StandardError, ScriptError
 	print "load error: #{rc_file}\n"
 	print $!.class, ": ", $!, "\n"
 	for err in $@[0, $@.size - 2]
@@ -250,7 +250,7 @@ module IRB
     for m in @CONF[:LOAD_MODULES]
       begin
 	require m
-      rescue
+      rescue # StandardError, ScriptError
 	print $@[0], ":", $!.class, ": ", $!, "\n"
       end
     end
-- 
cgit v1.2.3