Update break API for "continue" and "tbreak" ...

and also modernize. For 3.13, we need to add the "offset" parameter.

Author: rocky

trepan/processor/cmdproc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2010, 2013-2021, 2023-2024 Rocky Bernstein
+#   Copyright (C) 2008-2010, 2013-2021, 2023-2025 Rocky Bernstein
 #   <[email protected]>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -40,8 +40,8 @@
 import trepan.misc as Mmisc
 from trepan.interfaces.script import ScriptInterface
 from trepan.lib.bytecode import is_class_def, is_def_stmt
-from trepan.processor.print import print_location
 from trepan.processor.complete_rl import completer
+from trepan.processor.print import print_location
 from trepan.vprocessor import Processor
 
 
@@ -159,9 +159,6 @@ def get_option_fn(key):
         super().__init__(core_obj)
 
         self.aliases = {}
-        # "contine_running" is used by step/next/contine to signal breaking out of
-        # the command evaluation loop.
-        self.continue_running = False
 
         # "fast_continue" is used if we should try to see if we can
         # remove the debugger callback hook altogether. It is used by
@@ -243,7 +240,9 @@ def get_option_fn(key):
 
             for cmd, cmd_obj in self.commands.items():
                 if hasattr(cmd_obj, "cmds") and hasattr(cmd_obj.cmds, "cmdlist"):
-                    trepan3k_completer.add_completions(cmd, sorted(cmd_obj.cmds.cmdlist))
+                    trepan3k_completer.add_completions(
+                        cmd, sorted(cmd_obj.cmds.cmdlist)
+                    )
                     for subcmd_name, subcmd_obj in cmd_obj.cmds.subcmds.items():
                         subcmd_key = f"{cmd} {subcmd_name}"
                         if hasattr(subcmd_obj, "completion_choices"):
@@ -269,7 +268,7 @@ def _saferepr(self, str, maxwidth=None):
             maxwidth = self.debugger.settings["width"]
         return self._repr.repr(str)[:maxwidth]
 
-    def add_preloop_hook(self, hook, position=-1, nodups=True):
+    def add_preloop_hook(self, hook, position=-1, _=True):
         if hook in self.preloop_hooks:
             return False
         self.preloop_hooks.insert(position, hook)
@@ -282,8 +281,10 @@ def add_remap_pat(self, pat, replace, clear_remap=True):
             pyficache.file2file_remap = {}
 
     # To be overridden in derived debuggers
-    def defaultFile(self):
+    def defaultFile(self) -> Optional[str]:
         """Produce a reasonable default."""
+        if self.curframe is None:
+            return None
         filename = self.curframe.f_code.co_filename
         # Consider using is_exec_stmt(). I just don't understand
         # the conditions under which the below test is true.

trepan/processor/command/base_cmd.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2009-2010, 2012-2013, 2015, 2021, 2023-2024
+#  Copyright (C) 2009-2010, 2012-2013, 2015, 2021, 2023-2025
 #  Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -59,6 +59,11 @@ def __init__(self, proc):
         # the note below on these latter 3 methods.)
         #
         self.core = proc.core
+
+        # "contine_running" is used by step/next/contine to signal breaking out of
+        # the command evaluation loop.
+        self.continue_running = False
+
         self.debugger = proc.debugger
         self.settings = self.debugger.settings
         return

trepan/processor/command/break.py

@@ -87,6 +87,8 @@ def run(self, args):
                 force=force,
                 offset=offset,
             )
+        else:
+            self.errmsg(f"Did not find stopping spot for: {' '.join(args[1:])}")
         return
 
 

trepan/processor/command/continue.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#  Copyright (C) 2009, 2013, 2015, 2017, 2020, 2024 Rocky Bernstein
+#  Copyright (C) 2009, 2013, 2015, 2017, 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
@@ -51,9 +51,13 @@ class ContinueCommand(DebuggerCommand):
     def run(self, args):
         if len(args) > 1:
             # FIXME: DRY this code. Better is to hook into tbreak.
-            func, filename, lineno, condition, _ = parse_break_cmd(self.proc, args)
-            if not set_break(self, func, filename, lineno, condition, True, args):
-                return False
+            func, filename, lineno, condition, offset = parse_break_cmd(self.proc, args)
+            if not (func is None and filename is None):
+                set_break(
+                    self, func, filename, lineno, condition, True, args, offset=offset
+                    )
+            else:
+                self.errmsg(f"Did not find stopping spot for: {' '.join(args[1:])}")
         self.core.step_events = None  # All events
         self.core.step_ignore = -1
         self.proc.continue_running = True  # Break out of command read loop
@@ -83,7 +87,7 @@ def five():
     for c in (
         ["continue", "wrong", "number", "of", "args"],
         ["c", str(line)],
-        ["c", str(line + 1)], # Invalid
+        ["c", str(line + 1)],  # Invalid
         ["continue", "1"],
         ["c", "five"],
         ["c", "five()"],
@@ -92,13 +96,9 @@ def five():
         cmd.continue_running = False
         cmd.proc.current_command = " ".join(c)
         result = cmd.run(c)
-        print("Run result: %s" % result)
+        print(f"Run result: {result}")
         print(
-            "step_ignore %d, continue_running: %s"
-            % (
-                d.core.step_ignore,
-                cmd.continue_running,
-            )
+            f"step_ignore {d.core.step_ignore}, continue_running: {cmd.continue_running}"
         )
         pass
     pass

trepan/processor/command/tbreak.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009, 2013, 2015, 2017 Rocky Bernstein
+#   Copyright (C) 2009, 2013, 2015, 2017, 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
@@ -68,7 +68,10 @@ class TempBreakCommand(DebuggerCommand):
     def run(self, args):
         func, filename, lineno, condition, offset = parse_break_cmd(self.proc, args)
         if not (func is None and filename is None):
-            set_break(self, func, filename, lineno, condition, True, args)
+            set_break(self, func, filename, lineno, condition, True, args,
+                      offset=offset)
+        else:
+            self.errmsg(f"Did not find stopping spot for: {' '.join(args[1:])}")
         return