Extend "set patsub"; sync with trepan2

Author: rocky

trepan/lib/core.py

@@ -27,6 +27,7 @@
 import os.path as osp
 
 # External packages
+import pyficache
 import tracer
 
 # Our local modules
@@ -174,6 +175,8 @@ def canonic(self, filename):
                 pass
             canonic = osp.realpath(osp.normcase(canonic))
             self.filename_cache[filename] = canonic
+        canonic = pyficache.unmap_file(canonic)
+
         return canonic
 
     def canonic_filename(self, frame):

trepan/lib/stack.py

@@ -109,11 +109,7 @@ def format_stack_entry(
     s = format_token(Mformat.Function, funcname, highlight=color)
 
     args, varargs, varkw, local_vars = inspect.getargvalues(frame)
-    if "<module>" == funcname and ([], None, None,) == (
-        args,
-        varargs,
-        varkw,
-    ):
+    if "<module>" == funcname and ([], None, None,) == (args, varargs, varkw,):
         is_module = True
         if is_exec_stmt(frame):
             fn_name = format_token(Mformat.Function, "exec", highlight=color)
@@ -229,9 +225,12 @@ def check_path_with_frame(frame, path):
     if bc_size and bc_size != my_size:
         return False, "bytecode and local files mismatch"
     if fs_size and fs_size != my_size:
-        return False, (
-            "frame file size, %d bytes, and local file size, %d bytes, on file %s mismatch"
-            % (fs_size, my_size, path)
+        return (
+            False,
+            (
+                "frame file size, %d bytes, and local file size, %d bytes, on file %s mismatch"
+                % (fs_size, my_size, path)
+            ),
         )
     return True, None
 

trepan/processor/cmdproc.py

@@ -229,6 +229,8 @@ def print_location(proc_obj):
                     remapped_file = None
                     pass
                 pass
+            elif pyficache.main.remap_re_hash:
+                remapped_file = pyficache.remap_file_pat(filename, pyficache.main.remap_re_hash)
             elif m and m.group(1) in sys.modules:
                 remapped_file = m.group(1)
                 pyficache.remap_file(filename, remapped_file)
@@ -390,6 +392,7 @@ def __init__(self, core_obj, opts=None):
 
         self.preloop_hooks = []
         self.postcmd_hooks = []
+        self.remap_file_re = None
 
         self._populate_cmd_lists()
 
@@ -443,6 +446,13 @@ def add_preloop_hook(self, hook, position=-1, nodups=True):
         self.preloop_hooks.insert(position, hook)
         return True
 
+    def add_remap_pat(self, pat, replace, clear_remap=True):
+        self.remap_re_hash[re.compile(pat)] = (pat, replace)
+        pyficache.main.add_remap_pat(pat, replace, clear_remap)
+        if clear_remap:
+             self.file2file_remap = {}
+             pyficache.file2file_remap = {}
+
     # To be overridden in derived debuggers
     def defaultFile(self):
         """Produce a reasonable default."""

trepan/processor/command/set_subcmd/patsub.py

@@ -38,13 +38,12 @@ class SetPatSub(Mbase_subcmd.DebuggerSubcommand):
     """
 
     in_list = True
+    max_args = 2
     min_abbrev = len("pats")
+    min_args = 2
     short_help = "Set pattern substitution rule"
 
     def run(self, args):
-        if len(args) != 2:
-            self.errmsg("Expecting two arguments; got %d." % len(args))
-            return
         self.proc.add_remap_pat(args[0], args[1])
 
     pass