diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-13 04:53:22 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-13 04:53:22 +0000 |
| commit | 01aa0f9a4bcdd23dae3a816959ff640bf354ba56 (patch) | |
| tree | 9bf6db5c720b6039d2f913fbfa466ff46d221ca3 /lib/irb | |
| parent | 849eb3113e329a0b8a25670a9191853aa42b5dda (diff) | |
| download | ruby-01aa0f9a4bcdd23dae3a816959ff640bf354ba56.tar.gz ruby-01aa0f9a4bcdd23dae3a816959ff640bf354ba56.tar.xz ruby-01aa0f9a4bcdd23dae3a816959ff640bf354ba56.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@9918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb')
| -rw-r--r-- | lib/irb/init.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/irb/init.rb b/lib/irb/init.rb index 842eb1221..25059e26e 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 |