More to 1-origin columns conversion

Author: rocky

test/data/highlight-310.right

@@ -1,4 +1,4 @@
-(gcd.py:1:0): <module>
+(gcd.py:1:1): <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:0): <module>
+(gcd.py:1:1): <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:0): <module>
+(gcd.py:2:1): <module>
 -- 2 """Greatest Common Divisor
   2  ->	"""Greatest Common Divisor
 Set stopping is on.
 line - gcd.py:11
-(gcd.py:11:0): <module>
+(gcd.py:11:1): <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:3): <module>
+(gcd.py:44:4): <module>
 -- 44 if __name__ == "__main__":
  44  ->	if __name__ == "__main__":
 trepan3k: That's all, folks...

trepan/lib/breakpoint.py

@@ -86,18 +86,17 @@ def __init__(
                 if column_range:
                     assert isinstance(column_range, tuple)
                     start_line, self.column = column_range[0]
+                    # Python stores columns starting 0 in a line.
+                    # For realgud and lldb compatibility (among others),
+                    # we use columns starting at 1.
+                    self.column += 1
                     assert start_line == line_number
                     pass
                 pass
         else:
             self.column = position
+            # TODO: Figure out code offset.
             self.offset = None
-            # Figure out code offset.
-            if (code_info := code_position_cache.get(code)) is not None:
-                self.column = code_info.lineno_and_start_column.get(
-                    (line_number, self.offset)
-                )
-                pass
 
         self.condition = condition
         self.enabled = True

trepan/lib/stack.py

@@ -102,7 +102,10 @@ def get_column_start_from_code(code: CodeType, code_offset: int) -> int:
     position_tuple = position_list[instruction_number]
     if position_tuple is not None:
         if position_tuple[2] is not None:
-            return position_tuple[2]
+            # Python stores columns starting 0 in a line.
+            # For realgud and lldb compatibility (among others),
+            # we use columns starting at 1.
+            return position_tuple[2] + 1
     return -1