diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/irb.rb | 18 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sat Feb 9 00:44:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than + SystemExit and SignalException. [ruby-core:15359] + Fri Feb 8 23:51:36 2008 Tanaka Akira <akr@fsij.org> * missing/lgamma_r.c (lgamma_r): use smaller argument for sin function. diff --git a/lib/irb.rb b/lib/irb.rb index 77a5f22eb1..1274a15e9f 100644 --- a/lib/irb.rb +++ b/lib/irb.rb @@ -148,10 +148,15 @@ module IRB line.untaint @context.evaluate(line, line_no) output_value if @context.echo? - rescue StandardError, ScriptError, Abort - $! = RuntimeError.new("unknown exception raised") unless $! - print $!.class, ": ", $!, "\n" - if $@[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && $!.class.to_s !~ /^IRB/ + exc = nil + rescue Interrupt => exc + rescue SystemExit, SignalException + raise + rescue Exception => exc + end + if exc + print exc.class, ": ", exc, "\n" + if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ irb_bug = true else irb_bug = false @@ -160,7 +165,7 @@ module IRB messages = [] lasts = [] levels = 0 - for m in $@ + for m in exc.backtrace m = @context.workspace.filter_backtrace(m) unless irb_bug if m if messages.size < @context.back_trace_limit @@ -182,8 +187,7 @@ module IRB print "Maybe IRB bug!!\n" if irb_bug end if $SAFE > 2 - warn "Error: irb does not work for $SAFE level higher than 2" - exit 1 + abort "Error: irb does not work for $SAFE level higher than 2" end end end @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-08" +#define RUBY_RELEASE_DATE "2008-02-09" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080208 +#define RUBY_RELEASE_CODE 20080209 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |