aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/debug.rb10
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 306fabbe36..d162142dab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
in a callback operation, Ruby/Tk shows a (verbose) backtrace
information on the callback process.
+Thu Oct 16 17:09:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
+ debug_silent_eval() when $1 is not set. (ruby-bugs PR#1194)
+
Thu Oct 16 16:54:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_upto): ("a"..."a").to_a should return [].
diff --git a/lib/debug.rb b/lib/debug.rb
index 59dcae5e15..a3f6c28007 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -174,8 +174,7 @@ class Context
def debug_silent_eval(str, binding)
begin
- val = eval(str, binding)
- val
+ eval(str, binding)
rescue StandardError, ScriptError
nil
end
@@ -301,9 +300,12 @@ class Context
end
when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
+ p $~.to_a
pos = $2
- file = $1 || file
- klass = debug_silent_eval($1, binding)
+ if $1
+ klass = debug_silent_eval($1, binding)
+ file = $1
+ end
if pos =~ /^\d+$/
pname = pos
pos = pos.to_i