kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 15408:

Browse source 
* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
	  SystemExit and SignalException.  [ruby-core:15359]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-13 03:02:17 +00:00
parent d68010a27c
commit 679ae60db2
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jun 13 12:01:57 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 Jun 13 11:57:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Jun 13 11:57:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime * lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime

18
lib/irb.rb
View file

@ -149,10 +149,15 @@ module IRB
line.untaint line.untaint
@context.evaluate(line, line_no) @context.evaluate(line, line_no)
output_value if @context.echo? output_value if @context.echo?
rescue StandardError, ScriptError, Abort exc = nil
$! = RuntimeError.new("unknown exception raised") unless $! rescue Interrupt => exc
print $!.class, ": ", $!, "\n" rescue SystemExit, SignalException
if $@[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && $!.class.to_s !~ /^IRB/ 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 irb_bug = true
else else
irb_bug = false irb_bug = false
@ -161,7 +166,7 @@ module IRB
messages = [] messages = []
lasts = [] lasts = []
levels = 0 levels = 0
for m in $@ for m in exc.backtrace
m = @context.workspace.filter_backtrace(m) unless irb_bug m = @context.workspace.filter_backtrace(m) unless irb_bug
if m if m
if messages.size < @context.back_trace_limit if messages.size < @context.back_trace_limit
@ -183,8 +188,7 @@ module IRB
print "Maybe IRB bug!!\n" if irb_bug print "Maybe IRB bug!!\n" if irb_bug
end end
if $SAFE > 2 if $SAFE > 2
warn "Error: irb does not work for $SAFE level higher than 2" abort "Error: irb does not work for $SAFE level higher than 2"
exit 1
end end
end end
end end

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-13" #define RUBY_RELEASE_DATE "2008-06-13"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080613 #define RUBY_RELEASE_CODE 20080613
#define RUBY_PATCHLEVEL 171 #define RUBY_PATCHLEVEL 172
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8