summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-11-10 06:47:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-11-10 06:47:11 +0000
commit04c7225b78f327aa0645d0f468e7b6d2e20a4d1e (patch)
tree3fa76d26a3de05bb939399c39eb9161c641e1e1b /lib
parent28412851825d1bc7c8e885387e1f1b257cf8a0cf (diff)
19991110
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/debug.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/debug.rb b/lib/debug.rb
index 0a6699f..244db02 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -27,6 +27,7 @@ class DEBUGGER__
@last_file = nil
@last = [nil, nil]
@no_step = nil
+ @finish_pos = 0
end
DEBUG_LAST_CMD = []
@@ -256,9 +257,13 @@ class DEBUGGER__
STDOUT.printf "#%d %s\n", frame_pos, info
when /^fi(?:nish)?$/
- @finish_pos = @frames.size - frame_pos
- frame_pos = 0
- return
+ if frame_pos == 0
+ STDOUT.print "\"finish\" not meaningful in the outermost frame.\n"
+ else
+ @finish_pos = @frames.size - frame_pos
+ frame_pos = 0
+ return
+ end
when /^q(?:uit)?$/
input = readline("really quit? (y/n) ", false)
@@ -373,10 +378,10 @@ class DEBUGGER__
@frames.unshift binding
when 'return', 'end'
+ @frames.shift
if @frames.size == @finish_pos
@stop_next = 1
end
- @frames.shift
when 'raise'
excn_handle(file, line, id, binding)