Go over info {lines,PC}

Author: rocky

trepan/processor/command/info_subcmd/line.py

@@ -20,7 +20,7 @@
 import re
 
 import columnize
-from pyficache import get_linecache_info, file2file_remap
+from pyficache import file2file_remap, get_linecache_info
 
 from trepan.clifns import search_file
 from trepan.lib.format import Filename, format_line_number, format_token

trepan/processor/command/info_subcmd/lines.py

@@ -19,9 +19,9 @@
 from getopt import getopt, GetoptError
 
 from trepan.processor.command.base_subcmd import DebuggerSubcommand
-from trepan.lib.format import format_line_number, format_offset
+from trepan.lib.format import Filename, format_line_number, format_offset, format_token
 from trepan.misc import pretty_modfunc_name
-from pyficache import get_linecache_info
+from pyficache import file2file_remap, get_linecache_info
 
 
 class InfoOffsets(DebuggerSubcommand):
@@ -97,12 +97,25 @@ def run(self, args):
 
         # No line number. Use current frame line number
         filename = self.core.canonic_filename(self.proc.curframe)
-        linecache_info = get_linecache_info(filename)
+
+        remapped_filename = file2file_remap.get(filename, filename)
+
+        style = self.settings["style"]
+        formatted_filename = format_token(
+            Filename,
+            format_token(Filename, remapped_filename, style=style),
+            style=style,
+        )
+
+        if remapped_filename != filename:
+            self.msg(f"{filename} remapped to {formatted_filename}")
+
+        linecache_info = get_linecache_info(remapped_filename)
         style = self.settings["style"]
         if linecache_info:
-            self.section(f"Line:   fn, offset for table for {filename}")
+            self.section(f"Line:   fn, offset for table for {formatted_filename}")
             lines = []
-            linecache_info = get_linecache_info(filename)
+            linecache_info = get_linecache_info(remapped_filename)
             line_info = linecache_info.line_info
             for line_number, code_offset_pair in line_info.items():
                 # FIXME:
@@ -113,7 +126,8 @@ def run(self, args):
                         "%s: %s"
                         % (
                             format_line_number(line_number, style, "%4d"),
-                            "%s *%s" % (pretty_modfunc_name(code), format_offset(offset, style))
+                            "%s *%s"
+                            % (pretty_modfunc_name(code), format_offset(offset, style)),
                         )
                     )
             m = self.columnize_commands(list(sorted(lines)))
@@ -122,9 +136,7 @@ def run(self, args):
             self.section(f"Line:   offset for table for {filename}")
             lines = []
             for offset, line_number in findlinestarts(curframe.f_code):
-                lines.append(
-                    "%4d: *%d" % (line_number, offset)
-                    )
+                lines.append("%4d: *%d" % (line_number, offset))
             m = self.columnize_commands(list(sorted(lines)))
             self.msg(m)
             pass

trepan/processor/command/info_subcmd/pc.py

@@ -86,7 +86,7 @@ def run(self, args):
                 msg = "is not currently running. "
                 self.msg(wrapped_lines(part1, msg, self.settings["width"]))
             else:
-                self.msg("No Python program is currently running.")
+                self.errmsg("No Python program is currently running.")
                 pass
             self.msg(self.core.execution_status)
             pass