Improvements handling eval/exec

Author: rocky

trepan/lib/stack.py

@@ -345,6 +345,9 @@ def frame2filesize(frame):
         bc_path = frame.f_globals["__cached__"]
     else:
         bc_path = None
+    if frame.f_code.co_filename == "<string>":
+        # There is no source-code file to compare against.
+        return None, None
     path = frame.f_globals["__file__"]
     source_path = getsourcefile(path)
     if source_path is None:

trepan/processor/command/info_subcmd/line.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2009, 2013, 2015, 2020, 2023-2024 Rocky Bernstein
+#   Copyright (C) 2008-2009, 2013, 2015, 2020, 2023-2024, 2026 Rocky Bernstein
 #   <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 import os.path as osp
 import re
 
-from pyficache import code_line_info
+from pyficache import get_linecache_info
 
 from trepan.clifns import search_file
 from trepan.misc import wrapped_lines
@@ -113,14 +113,18 @@ def run(self, args):
             filename = search_file(filename, self.core.search_path, self.main_dirname)
             pass
 
-        line_info = code_line_info(filename, line_number)
+        # FIXME: this needs work.
+        linecache_info = get_linecache_info(filename)
+        if line_number not in linecache_info.line_numbers:
+            self.errmsg(
+                "No line information for line %d of %s"
+                % (line_number, filename)
+            )
+            return
         msg1 = 'Line %d of "%s"' % (line_number, self.core.filename(filename),)
+        line_info = linecache_info.line_info
         if line_info:
-            msg2 = "starts at offset %d of %s and contains %d instructions" % (
-                line_info[0].offsets[0],
-                line_info[0].name,
-                len(line_info[0].offsets),
-            )
+            msg2 = "is at offset(s) %s" % ", ".join(linecache_info.line_numbers[line_number])
             self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
         else:
             self.errmsg(

trepan/processor/print.py

@@ -143,11 +143,14 @@ def prefix_for_filename(deparsed_text: str) -> str:
 
         """
         lines = deparsed_text.split("\n")
+
+
         # FIXME Rather than blindly take the first line,
         # check if it is blank and if so use other lines.
         for line in lines:
             if line:
-                return proc_obj._saferepr(line.strip())[1:-1][:10]
+                cleaned_line = re.sub(r"[()'\"\s]", "_", line.strip())
+                return proc_obj._saferepr(cleaned_line)[1:-1][:10]
         return "..."
 
     def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
@@ -197,7 +200,9 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
 
         filename = frame2file(core_obj, frame, canonic=False)
         if "<string>" == filename:
-            if dbgr_obj.eval_string:
+            if remapped_file := pyficache.main.code2tempfile.get(frame.f_code):
+                filename = remapped_file
+            elif dbgr_obj.eval_string:
                 remapped_file = filename
                 filename = pyficache.unmap_file(filename)
                 if "<string>" == filename:
@@ -214,38 +219,39 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                     pass
                 pass
 
-            # FIXME: should change filename to disambiguated <string> everywhere.
-            eval_kind = is_eval_or_exec_stmt(frame) or "code-"
-            deparsed = deparse_fn(frame.f_code)
-            if deparsed:
-                # Create a nice prefix for the temporary file to write.
-                # Use the exec type and first line of the deparsed text.
-                leading_code_str = prefix_for_filename(deparsed.text)
-                prefix = f"{eval_kind}-{leading_code_str}-"
-
-                remapped_file = cmdfns.source_tempfile_remap(
-                    prefix,
-                    deparsed.text,
-                    tempdir=proc_obj.settings("tempdir"),
-                )
-                # FIXME: pyficache remaps seems backwards
-                pyficache.remap_file(remapped_file, filename)
-                filename = remapped_file
             else:
+                # FIXME: should change filename to disambiguated <string> everywhere.
+                eval_kind = is_eval_or_exec_stmt(frame) or "code-"
                 deparsed = deparse_fn(frame.f_code)
-                if deparsed is not None:
-                    source_text = deparsed.text
-                # else:
-                #   print("Can't deparse", frame.f_code)
-                if source_text is None and eval_kind:
-                    if source_text := get_exec_or_eval_string(frame):
-                        filename = "string-" + prefix_for_filename(source_text) + "-"
-                    else:
-                        source_text = f"{eval_kind}(...)"
+                if deparsed:
+                    # Create a nice prefix for the temporary file to write.
+                    # Use the exec type and first line of the deparsed text.
+                    leading_code_str = prefix_for_filename(deparsed.text)
+                    prefix = f"{eval_kind}-{leading_code_str}-"
+
+                    remapped_file = cmdfns.source_tempfile_remap(
+                        prefix,
+                        deparsed.text,
+                        tempdir=proc_obj.settings("tempdir"),
+                    )
+                    # FIXME: pyficache remaps seems backwards
+                    filename = remapped_file
+
+                else:
+                    deparsed = deparse_fn(frame.f_code)
+                    if deparsed is not None:
+                        source_text = deparsed.text
+                    # else:
+                    #   print("Can't deparse", frame.f_code)
+                    if source_text is None and eval_kind:
+                        if source_text := get_exec_or_eval_string(frame):
+                            filename = "string-" + prefix_for_filename(source_text) + "-"
+                        else:
+                            source_text = f"{eval_kind}(...)"
+                            pass
                         pass
                     pass
                 pass
-            pass
         else:
             m = re.search("^<frozen (.*)>", filename)
             if m and m.group(1) in pyficache.file2file_remap:
@@ -328,7 +334,7 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                         pyficache.remap_file(remapped_file, filename)
                     fd.close()
                     if source_text:
-                        pyficache.main.code2_tempfile[frame.f_code] = remapped_file
+                        pyficache.main.code2tempfile[frame.f_code] = remapped_file
                         intf_obj.msg(
                             f"remapped string {prefix_for_source_text(source_text, 10)} to file {remapped_file}"
                         )