Update API, more column info showing

Author: rocky

trepan/lib/stack.py

@@ -29,8 +29,8 @@
 from typing import Optional, Tuple
 
 import xdis
-from xdis import IS_PYPY, get_opcode
-from xdis.version_info import PYTHON_VERSION_TRIPLE
+from xdis import get_opcode
+from xdis.version_info import PYTHON_IMPLEMENTATION, PYTHON_VERSION_TRIPLE
 
 from trepan.lib.bytecode import op_at_frame
 from trepan.lib.format import (
@@ -77,6 +77,21 @@ def count_frames(frame: FrameType, count_start=0) -> int:
         return 1000
     return count
 
+def get_column_start(frame: FrameType) -> int:
+    """
+    Given a code frame, return the start column for that
+    frame. (The line number is found in frame.f_lineno).
+    If we can't find a column number, return -1.
+    """
+    co_positions = frame.f_code.co_positions()
+    instruction_number = frame.f_lasti // 2
+    position_list = list(co_positions)
+    position_tuple = position_list[instruction_number]
+    if position_tuple is not None:
+        assert position_tuple[0] == frame.f_lineno
+        if position_tuple[2] is not None:
+            return position_tuple[2]
+    return -1
 
 _re_pseudo_file = re.compile(r"^<.+>")
 
@@ -193,6 +208,7 @@ def format_function_and_parameters(frame: FrameType, debugger, style: str) -> Tu
 def format_return_and_location(
     frame,
     line_number: int,
+    column_number: int,
     debugger,
     is_module: bool,
     include_location: bool,
@@ -241,21 +257,28 @@ def format_return_and_location(
 
         if add_quotes_around_file:
             filename = f"'{filename}'"
-        s += " %s at line %s" % (
-            format_token(Filename, filename, style=style),
-            format_token(LineNumber, str(line_number), style=style),
-        )
+        if column_number >= 0:
+            s += " %s at line %s, column %s" % (
+                format_token(Filename, filename, style=style),
+                format_token(LineNumber, str(line_number), style=style),
+                format_token(LineNumber, str(column_number), style=style),
+            )
+        else:
+            s += " %s at line %s" % (
+                format_token(Filename, filename, style=style),
+                format_token(LineNumber, str(line_number), style=style),
+            )
 
     return s
 
 
 def format_stack_entry(
-    dbg_obj, frame_lineno, lprefix=": ", include_location=True, style="none"
+    dbg_obj, frame_line_col, lprefix=": ", include_location=True, style="none"
 ) -> str:
     """Format and return a stack entry gdb-style.
     Note: lprefix is not used. It is kept for compatibility.
     """
-    frame, line_number = frame_lineno
+    frame, line_number, column_number = frame_line_col
 
     is_module, s = format_function_and_parameters(frame, dbg_obj, style)
     args, varargs, varkw, local_vars = inspect.getargvalues(frame)
@@ -266,7 +289,7 @@ def format_stack_entry(
         s += "\n    "
 
     s += format_return_and_location(
-        frame, line_number, dbg_obj, is_module, include_location, style
+        frame, line_number, column_number, dbg_obj, is_module, include_location, style
     )
     return s
 
@@ -335,7 +358,7 @@ def is_eval_or_exec_stmt(frame) -> Optional[str]:
     return None
 
 
-opc = get_opcode(PYTHON_VERSION_TRIPLE, IS_PYPY)
+opc = get_opcode(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
 
 
 def get_call_function_name(frame) -> Optional[str]:
@@ -392,20 +415,20 @@ def get_call_function_name(frame) -> Optional[str]:
 
 
 def print_stack_entry(proc_obj, i_stack: int, style="none", opts={}):
-    frame_lineno = proc_obj.stack[len(proc_obj.stack) - i_stack - 1]
-    frame, lineno = frame_lineno
+    frame_line_column = proc_obj.stack[len(proc_obj.stack) - i_stack - 1]
+    frame, line_number, _ = frame_line_column
     intf = proc_obj.intf[-1]
     name = "??"
     if frame is proc_obj.curframe:
         intf.msg_nocr(format_token(Arrow, "->", style=style))
     else:
         intf.msg_nocr("##")
     intf.msg(
-        f"{i_stack} {format_stack_entry(proc_obj.debugger, frame_lineno, style=style)}"
+        f"{i_stack} {format_stack_entry(proc_obj.debugger, frame_line_column, style=style)}"
     )
     if opts.get("source", False):
         filename = frame2file(proc_obj.core, frame)
-        line = linecache.getline(filename, lineno, frame.f_globals)
+        line = linecache.getline(filename, line_number, frame.f_globals)
         intf.msg(line)
         pass
 
@@ -551,21 +574,23 @@ def __init__(self):
 
     dd = Trepan()
     my_frame = inspect.currentframe()
-    dd.core.processor.stack = [(my_frame, 100)]
+    dd.core.processor.stack = [(my_frame, 100, 1)]
     dd.core.processor.curframe = my_frame
-    # print_stack_entry(dd.core.processor, 0, "fruity")
+    print_stack_entry(dd.core.processor, 0, "fruity")
 
-    # print(format_stack_entry(m, (frame, 10,)))
     print(
         format_stack_entry(
             m,
             (
                 frame,
                 10,
+                3,
             ),
             style="tango",
         )
     )
+    import sys
+    sys.exit(0)
     # print("frame count: %d" % count_frames(frame))
     # print("frame count: %d" % count_frames(frame.f_back))
     # print("frame count: %d" % count_frames(frame, 1))

trepan/processor/cmdbreak.py

@@ -16,7 +16,7 @@
 
 import inspect
 from dis import findlinestarts
-from pyficache import code_line_info, code_offset_info
+from pyficache import code_line_info
 from trepan.misc import wrapped_lines, pretty_modfunc_name
 from trepan.processor.parse.semantics import build_bp_expr
 from trepan.processor.parse.parser import LocationError
@@ -71,7 +71,7 @@ def set_break(
 
     else:
         assert offset is not None
-        line_number = code_offset_info(filename, offset)
+        line_number = code_line_info(filename, offset)
         if line_number is None:
             part1 = f"File {cmd_obj.core.filename(filename)}"
             msg = wrapped_lines(

trepan/processor/command/disassemble.py

@@ -204,7 +204,7 @@ def run(self, args):
                     _timestamp,
                     _magic_int,
                     obj,
-                    _is_pypy,
+                    _python_implementation,
                     _source_size,
                     _sip_hash,
                     _save_offsets,

trepan/processor/command/info_subcmd/threads.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2009, 2014, 2023-2024 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2009, 2014, 2023-2025 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
@@ -17,7 +17,8 @@
 import sys
 import threading
 
-from trepan.lib import stack as Mstack, thred as Mthread
+from trepan.lib.stack import format_stack_entry, get_column_start
+from trepan.lib import thred as Mthread
 
 # Our local modules
 from trepan.processor.command import base_subcmd as Mbase_subcmd
@@ -55,17 +56,18 @@ def __init__(self, cmd):
         self.name2id = {}
         return
 
-    def stack_trace(self, f):
+    def stack_trace(self, frame):
         """A mini stack trace routine for threads."""
-        while f:
+        while frame:
             if (
-                not self.core.ignore_filter.is_included(f)
+                self.core.ignore_filter.is_excluded(frame)
                 or self.settings["dbg_trepan"]
             ):
-                s = Mstack.format_stack_entry(self, (f, f.f_lineno))
+                column_start = get_column_start(frame)
+                s = format_stack_entry(self, (frame, frame.f_lineno, column_start))
                 self.msg(" " * 4 + s)
                 pass
-            f = f.f_back
+            frame = frame.f_back
             pass
         return
 
@@ -128,13 +130,12 @@ def run(self, args):
             thread_name = args[0]
             if thread_name == ".":
                 thread_name = self.thread_name
-            try:
-                thread_id = int(thread_name)
+            if thread_id := name2id.get(thread_name):
                 if thread_id not in list(threading._active.keys()):
-                    self.errmsg(f"Don't know about thread number {thread_name}")
+                    self.errmsg(f"Don't know about thread number {thread_id}")
                     self.info_thread_terse(name2id)
                     return
-            except ValueError:
+            else:
                 if thread_name not in list(self.name2id.keys()):
                     self.errmsg(f"Don't know about thread {thread_name}")
                     self.info_thread_terse(name2id)
@@ -176,8 +177,11 @@ def run(self, args):
                 s += "    thread id: %d" % thread_id
                 pass
             s += "\n    "
-            s += Mstack.format_stack_entry(
-                self, (frame, frame.f_lineno), style=self.settings["style"]
+            column_start = get_column_start(frame)
+            s += format_stack_entry(
+                self,
+                (frame, frame.f_lineno, column_start),
+                style=self.settings["style"],
             )
             self.section("-" * 40)
             self.msg(s)

trepan/processor/command/list.py

@@ -149,7 +149,7 @@ def run(self, args):
                     break
                 else:
                     if is_pyasm:
-                        self.msg_nocr(line)
+                        self.msg(line)
                         proc.list_lineno = lineno
                         continue