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

debug.rb: Fix debug listing

Browse source 
* lib/debug.rb (script_lines): get source lines from SCRIPT_LINES__ or
  read from the file.
* lib/debug.rb (display_list): use script_lines instead of recursion.
  [Bug #8318]
* lib/debug.rb (line_at): use script_lines same as display_list.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-24 16:21:54 +00:00
parent 7dd8c1f20f
commit 181a4ea8c6
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,4 +1,12 @@
Thu Apr 25 01:18:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
Thu Apr 25 01:21:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/debug.rb (script_lines): get source lines from SCRIPT_LINES__ or
read from the file.
* lib/debug.rb (display_list): use script_lines instead of recursion.
[Bug #8318]
* lib/debug.rb (line_at): use script_lines same as display_list.
* lib/debug.rb (display_list): Fix debug listing when called from the
same file it has been required. patch by Dario Bertini <berdario AT

21
lib/debug.rb
View file

@ -752,8 +752,17 @@ EOHELP
(id ? ":in `#{id.id2name}'" : "")
end
def script_lines(file, line)
unless (lines = SCRIPT_LINES__[file]) and lines != true
Tracer::Single.get_line(file, line) if File.exist?(file)
lines = SCRIPT_LINES__[file]
lines = nil if lines == true
end
lines
end
def display_list(b, e, file, line)
if lines = SCRIPT_LINES__[file] and lines != true
if lines = script_lines(file, line)
stdout.printf "[%d, %d] in %s\n", b, e, file
b.upto(e) do |n|
if n > 0 && lines[n-1]
@ -764,20 +773,14 @@ EOHELP
end
end
end
elsif File.exists? file
Tracer::Single.get_line(file, line)
display_list(b, e, file, line)
else
stdout.printf "No sourcefile available for %s\n", file
end
end
def line_at(file, line)
lines = SCRIPT_LINES__[file]
if lines
return "\n" if lines == true
line = lines[line-1]
return "\n" unless line
lines = script_lines(file, line)
if lines and line = lines[line-1]
return line
end
return "\n"