From 9e97f6ca6324060e309f8cb020da71f9ad49dbaa Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 24 Apr 2013 16:19:00 +0000 Subject: [PATCH] debug.rb: Fix debug listing * lib/debug.rb (display_list): Fix debug listing when called from the same file it has been required. patch by Dario Bertini [Bug #8318] [fix GH-280] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/debug.rb | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7f065332d9..7c7462df23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 25 01:18:55 2013 Nobuyoshi Nakada + + * lib/debug.rb (display_list): Fix debug listing when called from the + same file it has been required. patch by Dario Bertini [Bug #8318] [fix GH-280] + Wed Apr 24 21:51:13 2013 Tanaka Akira * configure.in: Check mblen(). diff --git a/lib/debug.rb b/lib/debug.rb index 40886b14a6..b5ae3e95c8 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -753,8 +753,8 @@ EOHELP end def display_list(b, e, file, line) - stdout.printf "[%d, %d] in %s\n", b, e, file if lines = SCRIPT_LINES__[file] and lines != true + stdout.printf "[%d, %d] in %s\n", b, e, file b.upto(e) do |n| if n > 0 && lines[n-1] if n == line @@ -764,6 +764,9 @@ 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