diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-16 17:46:14 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-16 17:46:14 +0000 |
| commit | 3ec0bc3828794a6ef6293b53b403af8bc2362934 (patch) | |
| tree | a4f261c3a26c5d96eb562c8185e3521af2d07241 | |
| parent | 653ad6fd4bb186157514f36ca100917e09dfd78d (diff) | |
* lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
debug_silent_eval() when $1 is not set. (ruby-bugs PR#1194)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/debug.rb | 10 |
2 files changed, 11 insertions, 4 deletions
@@ -9,6 +9,11 @@ Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <[email protected]> in a callback operation, Ruby/Tk shows a (verbose) backtrace information on the callback process. +Thu Oct 16 17:09:19 2003 Yukihiro Matsumoto <[email protected]> + + * 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 <[email protected]> * 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 |