Adjust for addition of column numbers

Author: rocky

test/data/highlight-310.right

@@ -1,4 +1,4 @@
-(gcd.py:1): <module>
+(gcd.py:1:0): <module>
 -> 1 #!/usr/bin/env python3
 Set basename is on.
 Set event is on.

test/data/step-311.right

@@ -1,23 +1,23 @@
-(gcd.py:1): <module>
+(gcd.py:1:0): <module>
 -> 1 #!/usr/bin/env python3
 Set basename is on.
 Set event is on.
 Set stopping is off.
 Set confirmation is off.
 line - gcd.py:2
-(gcd.py:2): <module>
+(gcd.py:2:0): <module>
 -- 2 """Greatest Common Divisor
   2  ->	"""Greatest Common Divisor
 Set stopping is on.
 line - gcd.py:11
-(gcd.py:11): <module>
+(gcd.py:11:0): <module>
 -- 11 import sys
  11  ->	import sys
 Set stopping is off.
 line - gcd.py:14
 line - gcd.py:29
 line - gcd.py:44
-(gcd.py:44): <module>
+(gcd.py:44:3): <module>
 -- 44 if __name__ == "__main__":
  44  ->	if __name__ == "__main__":
 trepan3k: That's all, folks...

test/functional/fn_helper.py

@@ -75,6 +75,8 @@ def compare_output(right: list, d):
                 pass
             pass
         pass
+    if right != got:
+        breakpoint()
     assert right ==  got
     return
 

trepan/lib/stack.py

@@ -25,7 +25,7 @@
 import re
 from opcode import opname
 from reprlib import repr
-from types import FrameType
+from types import CodeType, FrameType
 from typing import Optional, Tuple
 
 import xdis
@@ -77,18 +77,25 @@ def count_frames(frame: FrameType, count_start=0) -> int:
         return 1000
     return count
 
-def get_column_start(frame: FrameType) -> int:
+def get_column_start_from_frame(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
+    return get_column_start_from_code(frame.f_code, frame.f_lasti)
+
+def get_column_start_from_code(code: CodeType, f_lasti: int) -> int:
+    """
+    Given a code object, 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 = code.co_positions()
+    instruction_number = 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

trepan/processor/cmdproc.py

@@ -27,6 +27,7 @@
 
 # Note: the module name pre 3.2 is repr
 from reprlib import Repr
+from types import FrameType
 from typing import Optional, Set, Tuple
 
 import pyficache
@@ -36,6 +37,7 @@
 import trepan.exception as Mexcept
 import trepan.lib.display as Mdisplay
 import trepan.lib.file as Mfile
+from trepan.lib.stack import get_column_start_from_frame
 import trepan.lib.thred as Mthread
 import trepan.misc as Mmisc
 from trepan.interfaces.script import ScriptInterface
@@ -77,15 +79,15 @@ def arg_split(s, posix=False):
     return args_list
 
 
-def get_stack(f, t, botframe, proc_obj=None) -> Tuple[list, int]:
+def get_stack(frame: FrameType, t, botframe, proc_obj=None) -> Tuple[list, int]:
     """Return a stack of frames which the debugger will use for in
     showing backtraces and in frame switching. As such various frame
     that are really around may be excluded unless we are debugging the
     sebugger. Also we will add traceback frame on top if that
     exists."""
 
-    def false_fn(f):
-        return false_fn
+    def false_fn(_):
+        return False
 
     def fn_is_ignored(f):
         return proc_obj.core.ignore_filter.is_excluded(f)
@@ -98,20 +100,23 @@ def fn_is_ignored(f):
             pass
         pass
     stack = []
-    if t and t.tb_frame is f:
+    if t and t.tb_frame is frame:
         t = t.tb_next
-    while f is not None:
-        if exclude_frame(f):
+    curframe = frame
+    while curframe is not None:
+        if exclude_frame(curframe):
             break  # See commented alternative below
-        stack.append((f, f.f_lineno))
+        column_number = get_column_start_from_frame(curframe)
+        stack.append((frame, frame.f_lineno, column_number))
         # bdb has:
         # if f is botframe: break
-        f = f.f_back
+        curframe = curframe.f_back
         pass
     stack.reverse()
     i = max(0, len(stack) - 1)
     while t is not None:
-        stack.append((t.tb_frame, t.tb_lineno))
+        column_number = get_column_start_from_frame(t.tb_frame)
+        stack.append((t.tb_frame, t.tb_lineno, column_number))
         t = t.tb_next
         pass
     return stack, i
@@ -744,14 +749,20 @@ def setup(self):
                 None,
             )  # NOQA
             pass
+        self.column_number = -1
         if self.frame or exc_traceback:
             self.stack, self.curindex = get_stack(self.frame, exc_traceback, None, self)
             self.curframe = self.stack[self.curindex][0]
             self.thread_name = Mthread.current_thread_name()
+            self.list_offset = self.curframe.f_lasti
+            self.list_object = self.curframe
+            self.column_number = get_column_start_from_frame(self.curframe)
             if exc_traceback:
                 self.list_lineno = traceback.extract_tb(exc_traceback, 1)[0][1]
-                self.list_offset = self.curframe.f_lasti
-                self.list_object = self.curframe
+                # FIXME: Do any other fields need to be changed?
+            else:
+                self.list_lineno = self.curframe.f_lineno
+            pass
         else:
             self.stack = self.curframe = self.botframe = None
             pass

trepan/processor/command/info_subcmd/threads.py

@@ -17,7 +17,7 @@
 import sys
 import threading
 
-from trepan.lib.stack import format_stack_entry, get_column_start
+from trepan.lib.stack import format_stack_entry, get_column_start_from_frame
 from trepan.lib import thred as Mthread
 
 # Our local modules
@@ -63,7 +63,7 @@ def stack_trace(self, frame):
                 self.core.ignore_filter.is_excluded(frame)
                 or self.settings["dbg_trepan"]
             ):
-                column_start = get_column_start(frame)
+                column_start = get_column_start_from_frame(frame)
                 s = format_stack_entry(self, (frame, frame.f_lineno, column_start))
                 self.msg(" " * 4 + s)
                 pass
@@ -177,7 +177,7 @@ def run(self, args):
                 s += "    thread id: %d" % thread_id
                 pass
             s += "\n    "
-            column_start = get_column_start(frame)
+            column_start = get_column_start_from_frame(frame)
             s += format_stack_entry(
                 self,
                 (frame, frame.f_lineno, column_start),

trepan/processor/command/jump.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2009, 2013, 2015, 2020, 2023-2024 Rocky Bernstein
+#  Copyright (C) 2009, 2013, 2015, 2020, 2023-2025 Rocky Bernstein
 #
 #  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 @@
 from trepan.processor.cmdproc import print_location
 
 # Our local modules
+from trepan.lib.stack import get_column_start_from_frame
 from trepan.processor.command.base_cmd import DebuggerCommand
 
 
@@ -91,9 +92,11 @@ def run(self, args):
             # Set to change position, update our copy of the stack,
             # and display the new position
             self.proc.curframe.f_lineno = lineno
+            column = get_column_start_from_frame(self.proc.curframe)
             self.proc.stack[self.proc.curindex] = (
                 self.proc.stack[self.proc.curindex][0],
                 lineno,
+                column,
             )
             print_location(self.proc)
         except ValueError as e:

trepan/processor/command/skip.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#  Copyright (C) 2009, 2013, 2015, 2020, 2024 Rocky Bernstein
+#  Copyright (C) 2009, 2013, 2015, 2020, 2024-2025 Rocky Bernstein
 #
 #  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
@@ -15,6 +15,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Our local modules
+from trepan.lib.stack import get_column_start_from_frame
 from trepan.processor.command.base_cmd import DebuggerCommand
 from trepan.processor.cmdproc import print_location
 from trepan.lib.bytecode import next_linestart
@@ -69,9 +70,11 @@ def run(self, args):
             # Set to change position, update our copy of the stack,
             # and display the new position
             self.proc.curframe.f_lineno = lineno
+            column = get_column_start_from_frame(self.proc.curframe)
             self.proc.stack[self.proc.curindex] = (
                 self.proc.stack[self.proc.curindex][0],
                 lineno,
+                column,
             )
             print_location(self.proc)
             self.proc.continue_running = True  # Break out of command read loop

trepan/processor/print.py

@@ -94,18 +94,25 @@ def print_source_line(msg, lineno, line, event_str=None, is_pyasm: bool = False)
 
 
 def print_source_location_info(
-    print_fn, filename, lineno, fn_name=None, f_lasti=None, remapped_file=None
+    print_fn,
+    filename,
+    line_number: int,
+    column_number: int,
+    fn_name=None,
+    f_lasti=None,
+    remapped_file=None,
 ):
     """Print out a source location , e.g. the first line in
     line in:
-        (/tmp.py:2 @21):  <module>
+        (/tmp.py:2:4 @21):  <module>
         L -- 2 import sys,os
         (trepan3k)
     """
+    col_str = f":{column_number}"  if column_number >= 0 else ""
     if remapped_file and filename != remapped_file:
-        mess = f"({remapped_file}:{lineno} remapped {filename}"
+        mess = f"({remapped_file}:{line_number}{col_str} remapped {filename}"
     else:
-        mess = f"({filename}:{lineno}"
+        mess = f"({filename}:{line_number}{col_str}"
     if f_lasti and f_lasti != -1:
         mess += " @%d" % f_lasti
         pass
@@ -152,13 +159,13 @@ def prefix_for_filename(deparsed_text: str) -> str:
     eval_kind = None
     i_stack = min(i_stack, len(proc_obj.stack) - 1)
     while i_stack >= 0:
-        frame, lineno = proc_obj.stack[i_stack]
+        frame, line_number, column_number = proc_obj.stack[i_stack]
 
         # Before starting a program a location for a module with
         # line number 0 may be reported. Treat that as though
         # we were on the first line.
-        if frame.f_code.co_name == "<module>" and lineno == 0:
-            lineno = 1
+        if frame.f_code.co_name == "<module>" and line_number == 0:
+            line_number = 1
 
         i_stack -= 1
 
@@ -181,7 +188,7 @@ def prefix_for_filename(deparsed_text: str) -> str:
                     tempdir=proc_obj.settings("tempdir"),
                 )
                 pyficache.remap_file(filename, remapped_file)
-                filename, lineno = pyficache.unmap_file_line(filename, lineno)
+                filename, line_number = pyficache.unmap_file_line(filename, line_number)
                 pass
             pass
         elif "<string>" == filename:
@@ -250,7 +257,7 @@ def prefix_for_filename(deparsed_text: str) -> str:
             opts["style"] = "plain"
             opts["output"] = "plain"
 
-        line = pyficache.getline(filename, lineno, opts)
+        line = pyficache.getline(filename, line_number, opts)
 
         if not line:
             if (
@@ -266,8 +273,8 @@ def prefix_for_filename(deparsed_text: str) -> str:
                 temp_filename, _ = deparse_and_cache(
                     co, proc_obj.errmsg, tempdir=tempdir
                 )
-                lineno = 1
-                # _, lineno = pyficache.unmap_file_line(temp_filename, lineno, True)
+                line_number = 1
+                # _, line_number = pyficache.unmap_file_line(temp_filename, line_number, True)
                 if temp_filename:
                     filename = temp_filename
                 pass
@@ -299,7 +306,7 @@ def prefix_for_filename(deparsed_text: str) -> str:
 
                     pass
 
-            line = linecache.getline(filename, lineno, proc_obj.curframe.f_globals)
+            line = linecache.getline(filename, line_number, proc_obj.curframe.f_globals)
             if not line:
                 m = re.search("^<frozen (.*)>", filename)
                 if m and m.group(1):
@@ -313,13 +320,13 @@ def prefix_for_filename(deparsed_text: str) -> str:
                         remapped_file = sys.modules[remapped_file].__file__
                         pyficache.remap_file(filename, remapped_file)
                         line = linecache.getline(
-                            remapped_file, lineno, proc_obj.curframe.f_globals
+                            remapped_file, line_number, proc_obj.curframe.f_globals
                         )
                     else:
                         remapped_file = m.group(1)
                         code = proc_obj.curframe.f_code
                         filename, line = cmdfns.deparse_getline(
-                            code, remapped_file, lineno, opts
+                            code, remapped_file, line_number, opts
                         )
                     pass
             pass
@@ -342,7 +349,8 @@ def prefix_for_filename(deparsed_text: str) -> str:
         print_source_location_info(
             intf_obj.msg,
             filename,
-            lineno,
+            line_number,
+            column_number,
             fn_name,
             remapped_file=remapped_file,
             f_lasti=last_i,
@@ -351,7 +359,7 @@ def prefix_for_filename(deparsed_text: str) -> str:
             if proc_obj.event:
                 print_source_line(
                     intf_obj.msg,
-                    lineno,
+                    line_number,
                     line,
                     proc_obj.event2short[proc_obj.event],
                     is_pyasm,