Handle breakpoint() calls better.

* Record call as being in caller of trepan.api not in trepan.api
* info breakpoints shows "breakpoint()" rather than "breakpoint" as the "type"
* Don't allow deleting  breakpoint(); instead suggest "disable"ing the breakpoint
* Don't disallow fast continue if the only breakpoints we have are breakpoint() calls
* Breakpoint icon for breakpoint() enabled is now "X" distinct from "B"; and disabled "x" distinct from "b".

Author: rocky

.pre-commit-config.yaml

@@ -5,11 +5,15 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
-      - id: check-merge-conflict
-      - id: debug-statements
-        stages: [pre-commit]
-      - id: end-of-file-fixer
-        stages: [pre-commit]
+    - id: check-merge-conflict
+    - id: debug-statements
+      stages: [pre-commit]
+      exclude: ChangeLog-spell-corrected.diff|mathics/builtin/system.py
+    - id: end-of-file-fixer
+      stages: [pre-commit]
+      exclude: ChangeLog-spell-corrected.diff
+    - id: trailing-whitespace
+      exclude: ChangeLog-spell-corrected.diff
   - repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
@@ -18,12 +22,20 @@ repos:
   - repo: https://github.com/psf/black
     rev: 25.11.0
     hooks:
-      - id: black
-    language_version: python3
-    stages: [pre-commit]
-    additional_dependencies: ["click"]
-    exclude: 'trepan/version.py'
+    - id: black
+      language_version: python3
+      stages: [pre-commit]
+      additional_dependencies: ["click"]
+      exclude: 'trepan/version.py'
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.31.0  # Use the latest version
     hooks:
       - id: check-github-workflows
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.11.2
+    hooks:
+      - id: mypy
+        args:
+          - --install-types
+          - --ignore-missing-imports
+          - --non-interactive

trepan/api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2009, 2013-2017, 2019-2021, 2023-2025 Rocky
+#   Copyright (C) 2008-2009, 2013-2017, 2019-2021, 2023-2026 Rocky
 #   Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -34,10 +34,13 @@
 # functions below.  It also doesn't work once we add the exception handling
 # we see below. So for now, we'll live with the code duplication.
 
+import inspect
 import os
 import sys
 import traceback
 
+from typing import Optional
+
 import trepan
 from trepan.debugger import Trepan
 from trepan.interfaces.server import ServerInterface
@@ -187,12 +190,24 @@ def debug(
 
     bp = bpmgr.find_breakpoint(filename, line_number)
     if bp is None:
+
+        frame = inspect.currentframe()
+        if frame is not None and frame.f_code.co_filename == filename:
+            # Don't log the breakpoint as being in trepan.api. Instead, back one frame.
+            frame = frame.f_back
+            if frame is not None:
+                code = frame.f_code
+                filename = code.co_filename
+                line_number = frame.f_lineno
+
         bp = core.bpmgr.add_breakpoint(
             filename=filename,
             line_number=line_number,
             is_code_offset=False,
             condition=None,
-            func_or_code=code)
+            func_or_code=code,
+            is_breakpoint_call=True
+        )
     elif not bp.enabled:
         core.step_ignore = -1
         return
@@ -232,7 +247,7 @@ def debugger_on_post_mortem():
     return
 
 
-def run_call(func, *args, debug_opts=DEBUGGER_SETTINGS, start_opts=None, **kwds):
+def run_call(func, *args, debug_opts=DEBUGGER_SETTINGS, start_opts:Optional[dict]=None, **kwds):
     """Call the function (a function or method object, not a string)
     with the given arguments starting with the statement after
     the place that this appears in your program.
@@ -242,6 +257,8 @@ def run_call(func, *args, debug_opts=DEBUGGER_SETTINGS, start_opts=None, **kwds)
     entered."""
 
     dbg = Trepan(opts=debug_opts)
+    if start_opts is not None:
+        kwds["start_opts"] = start_opts
     try:
         return dbg.run_call(func, *args, **kwds)
     except Exception:

trepan/debugger.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2010, 2013-2015, 2018, 2023-2025
+#   Copyright (C) 2008-2010, 2013-2015, 2018, 2023-2026
 #   Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 
 import sys
 import types
-from typing import Any, Callable, Union
+from typing import Any, Callable, Optional, Union
 
 import pyficache
 import tracer
@@ -169,7 +169,7 @@ def complete(self, last_token: str, state: int):
             return results[state]
         return
 
-    def run(self, cmd, start_opts=None, globals_=None, locals_=None):
+    def run(self, cmd, start_opts: Optional[dict]=None, globals_=None, locals_=None):
         """Run debugger on string `cmd' using builtin function eval
         and if that builtin exec.  Arguments `globals_' and `locals_'
         are the dictionaries to use for local and global variables. By
@@ -238,7 +238,7 @@ def run_exec(self, cmd, start_opts=None, globals_=None, locals_=None):
             self.core.stop()
         return
 
-    def run_call(self, func: Callable, *args, start_opts=None, **kwds):
+    def run_call(self, func: Callable, *args, start_opts: Optional[dict]=None, **kwds):
         """Run debugger on function call: `func(*args, **kwds)'
 
         See also ``run_eval`` if what you want to run is an eval'able

trepan/lib/breakpoint.py

@@ -62,6 +62,7 @@ def __init__(
         code: Optional[CodeType] = None,
         position: Optional[int] = None,
         is_code_offset: bool = True,
+        is_breakpoint_call: bool = False
     ):
         # FIXME: split out this top part into a part that fills out information
         if code is not None:
@@ -122,6 +123,8 @@ def __init__(
         # Number of times to ignore breakpoint before stopping
         self.ignore = 0
 
+        self.is_breakpoint_call = is_breakpoint_call
+
         self.line_number = line_number
         self.number = bp_number
 
@@ -183,9 +186,13 @@ def icon_char(self) -> str:
         't': temporary breakpoint
         'B': enabled breakpoint
         'b': disabled breakpoint
+        'x': disabled breakpoint()
+        'X': enabled breakpoint()
         """
         if self.temporary:
             return "t"
+        elif self.is_breakpoint_call:
+            return "X" if self.enabled else "x"
         elif self.enabled:
             return "B"
         return "b"
@@ -209,7 +216,7 @@ def __init__(self):
 
         return
 
-    def bpnumbers(self):
+    def bpnumbers(self)-> list[int]:
         """Returns a list of strings of breakpoint numbers"""
         return ["%d" % bp.number for bp in self.bpbynumber if bp is not None]
 
@@ -231,7 +238,7 @@ def get_breakpoint(self, i) -> tuple:
             )
         bp = self.bpbynumber[i]
         if bp is None:
-            return (False, "Breakpoint %d previously deleted." % i, None)
+            return (False, f"Breakpoint {i} previously deleted.", None)
         return (True, None, bp)
 
     def add_breakpoint(
@@ -243,6 +250,7 @@ def add_breakpoint(
         temporary: bool = False,
         condition: Optional[str] = None,
         func_or_code=None,
+        is_breakpoint_call: bool = False,
     ):
         """
         Add a breakpoint in ``filename`` at line number ``line_number``.
@@ -254,6 +262,7 @@ def add_breakpoint(
         The parameter ``position`` is -1 when we want a breakpoint on a call event.
         """
         bpnum = len(self.bpbynumber)
+
         if filename:
             filename = osp.realpath(filename)
 
@@ -303,6 +312,7 @@ def add_breakpoint(
             code,
             position,
             is_code_offset,
+            is_breakpoint_call,
         )
 
         # Build the internal lists of breakpoints
@@ -364,6 +374,8 @@ def delete_breakpoint_by_number(self, bpnum: int) -> tuple:
         success, msg, bp = self.get_breakpoint(bpnum)
         if not success:
             return False, msg
+        if bp.is_breakpoint_call:
+            return False, "Cannot delete a breakpoint() call; use disable instead."
         self.delete_breakpoint(bp)
         return (True, "")
 
@@ -480,6 +492,15 @@ def find_breakpoint(self, filename: str, line_number: int) -> Optional[Breakpoin
             return b
         return None
 
+    def needs_no_tracing(self) -> bool:
+        """
+        Return True if all breakpoints do not need any sys.tracing
+        support, i.e. they are handled either by explicit breakpoint() calls
+        or the newer debug protocal handles the breakpoints
+        """
+        # return len(self.bplist) == 0
+        return all(not getattr(item, 'is_breakpoint_call', False) for item in self.bplist)
+
     def last(self):
         return len(self.bpbynumber) - 1
 

trepan/processor/cmdproc.py

@@ -592,7 +592,7 @@ def process_commands(self):
             pass
         run_hooks(self, self.postcmd_hooks)
         if self.fast_continue:
-            if len(self.core.bpmgr.bplist) == 0:
+            if self.core.bpmgr.needs_no_tracing:
                 # Remove tracing on frames and remove trace hook.
                 frame = self.curframe
                 while frame:

trepan/processor/command/info_subcmd/breakpoints.py

@@ -48,6 +48,7 @@ class InfoBreakpoints(Mbase_subcmd.DebuggerSubcommand):
                 breakpoint already  hit 1 time
         3   breakpoint    keep y     20 at /tmp/fib.py:6
                 stop only if x > 0
+        4   breakpoint()  keep y     30 at /tmp/fib.py:6
 
     See also:
     ---------
@@ -76,11 +77,13 @@ def bpprint(self, bp):
             column_str = ":%d" % (bp.column + 1)
         else:
             column_str = ""
+        brkpt_type = "breakpoint()" if bp.is_breakpoint_call else "breakpoint"
         if bp.offset is None:
             self.msg(
-                "%-4dbreakpoint    %s  any at %s:%d%s"
+                "%-4d%-12s  %s  any at %s:%d%s"
                 % (
                     bp.number,
+                    brkpt_type,
                     disp,
                     self.core.filename(bp.filename),
                     bp.line_number,
@@ -89,9 +92,10 @@ def bpprint(self, bp):
             )
         else:
             self.msg(
-                "%-4dbreakpoint    %s %4s at %s:%d%s"
+                "%-4d%-12s  %s %4s at %s:%d%s"
                 % (
                     bp.number,
+                    brkpt_type,
                     disp,
                     "*" + str(bp.offset),
                     self.core.filename(bp.filename),