Improve "info line" and "info lines"

Add * in "info" output when we mean an offset.
Uses revised pyficache line_info information which always stores code
object and offset.

Author: rocky

trepan/lib/breakpoint.py

@@ -72,7 +72,7 @@ def __init__(
             if (code_info := code_position_cache.get(code)) is not None:
                 if position == -1:
                     # Figure out the code offset from the line number.
-                    if linecache_info is not None and (tup := linecache_info.lineno_info.get(line_number)):
+                    if linecache_info is not None and (tup := linecache_info.line_info.get(line_number)):
                         self.offset = tup[0]
                         # When an offset value is Python code, then column information is stored in the parent.
                         # FIXME: -1 and 1 might not be right when we have a line with some code and a

trepan/lib/core.py

@@ -199,7 +199,7 @@ def canonic_filename(self, frame: Optional[FrameType]) -> str:
         if "<string>" == filename:
             if (new_filename := pyficache.main.code2tempfile.get(frame.f_code)):
                 filename = new_filename
-        return self.canonic(frame.f_code.co_filename)
+        return self.canonic(filename)
 
     def filename(self, filename=None) -> Optional[str]:
         """Return filename or the basename of that depending on the

trepan/processor/command/info_subcmd/line.py

@@ -15,6 +15,7 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import columnize
 import inspect
 import os.path as osp
 import re
@@ -90,15 +91,16 @@ def lineinfo(self, arg):
 
     def run(self, args):
         """Current line number in source file"""
-        if not self.proc.curframe:
-            self.errmsg("No line number information available.")
-            return
-
         # info line <loc>
         if len(args) == 0:
+            if not self.proc.curframe:
+                self.errmsg("Frame is needed when no line number is given.")
+                return
+
             # No line number. Use current frame line number
             line_number = inspect.getlineno(self.proc.curframe)
             filename = self.core.canonic_filename(self.proc.curframe)
+
         elif len(args) == 1:
             # lineinfo returns (item, file, lineno) or (None,)
             line_number, filename = self.lineinfo(args[2:])
@@ -123,25 +125,21 @@ def run(self, args):
             return
         msg1 = 'Line %d of "%s"' % (line_number, self.core.filename(filename),)
         line_info = linecache_info.line_info
-        if line_info:
-            msg2 = "is at offset(s) %s" % ", ".join(linecache_info.line_numbers[line_number])
-            self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
+        line_number_offsets = line_info.get(line_number)
+        if line_number_offsets:
+            offset_data = [f"{code.co_name}:*{offset}" for code, offset in line_number_offsets]
+            if len(offset_data) == 1:
+                msg2 = f"is at bytecode offset {offset_data[0]}"
+                self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
+            else:
+                msg2 = "is at bytecode offsets:"
+                self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
+                self.msg(columnize.columnize(offset_data, colsep=", ", ljust=False, lineprefix="  "))
         else:
             self.errmsg(
                 "No line information for line %d of %s"
                 % (line_number, self.core.filename(filename))
             )
-        if line_info and len(line_info) > 1:
-            self.msg(
-                wrapped_lines(
-                    "There are multiple line offsets for line number.",
-                    "Other line offsets: %s"
-                    % ", ".join(
-                        ["%s of %s" % (li.offsets[0], li.name) for li in line_info[1:]]
-                    ),
-                    self.settings["width"],
-                )
-            )
         return False
 
     pass

trepan/processor/command/info_subcmd/lines.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2020, 2024 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2020, 2024, 2026 Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 # Our local modules
 from trepan.processor.command.base_subcmd import DebuggerSubcommand
 from trepan.misc import pretty_modfunc_name
+# from pyficache import get_linecache_info
 from pyficache import cache_code_lines
 
 
@@ -96,13 +97,16 @@ def run(self, args):
             return
 
         # No line number. Use current frame line number
-        filename = curframe.f_code.co_filename
+        filename = self.core.canonic_filename(self.proc.curframe)
         file_info = cache_code_lines(
             filename, toplevel_only=False, include_offsets=True
         )
         if file_info:
             self.section(f"Line:   fn, offset for table for {filename}")
             lines = []
+            # linecache_info = get_linecache_info(filename)
+            # line_info = linecache_info.line_info
+
             for line_number, line_info in file_info.line_numbers.items():
                 if not name or any(li.name == name for li in line_info):
                     lines.append(

trepan/processor/command/reload.py

@@ -89,7 +89,7 @@ def run(self, args):
             subcommand_module = importlib.import_module(subcmd.__module__)
             importlib.reload(subcommand_module)
             classnames = [
-                tup[0] for tup in inspect.getmembers(subcommand_module, inspect.isclass)
+                tup[0] for tup in inspect.getmembers(subcommand_module, inspect.isclass) if str(tup[0]) != "DebuggerSubcommand"
             ]
             if len(classnames) == 1:
                 try: