Better eval string printing

Author: rocky

trepan/lib/format.py

@@ -102,7 +102,7 @@ def format_token(token_type, token_value: str, style: Optional[str]) -> str:
     Decorate ``token_value`` with coloring matching `token_type` and return
     the resulting string.
     """
-    if style == "none" or style is None:
+    if style is None or style == "none":
         return token_value
     terminal_256_formatter = Terminal256Formatter(style=style)
     return format([[token_type, token_value]], terminal_256_formatter)
@@ -403,11 +403,11 @@ def format_unencoded(self, tokensource, outfile):
 python_lexer = PythonLexer()
 
 
-def format_python(python_str: str, style) -> str:
+def format_python(python_str: str, style: Optional[str]) -> str:
     """Add terminial formatting for a Python string
     ``python_str``, using pygments style ``style``.
     """
-    if style is None:
+    if style is None or style == "none":
         return python_str
     terminal_formatter = Terminal256Formatter(style=style)
     return highlight(python_str, python_lexer, terminal_formatter)

trepan/lib/stack.py

@@ -22,8 +22,9 @@
 import linecache
 import os
 import os.path as osp
+import pyficache
 import re
-from dataclasses import dataclass
+
 from opcode import opname
 from reprlib import repr
 from types import CodeType, FrameType
@@ -67,8 +68,7 @@ def deparse_offset(_code, _name: str, _list_i: int, _) -> tuple:
 
 opc = xdis.get_opcode_module(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
 
-# A mapping frame to its ExtraFrameInfo. This is a weak dictionary so that
-# frames are automatically removed.
+# A mapping frame to its ExtraFrameInfo.
 FrameInfo: Dict[FrameType, int] = {}
 
 def count_frames(frame: FrameType) -> int:
@@ -227,7 +227,12 @@ def format_function_and_parameters(
     else:
         is_module = False
         try:
-            params = inspect.formatargvalues(args, varargs, varkw, local_vars)
+            if is_eval_or_exec_stmt(frame):
+                # Nuke the function name
+                s = ""
+                params = get_exec_or_eval_string(frame)
+            else:
+                params = inspect.formatargvalues(args, varargs, varkw, local_vars)
             formatted_params = format_python(params, style=style)
         except Exception:
             pass
@@ -271,12 +276,14 @@ def format_return_and_location(
     if include_location:
         is_pseudo_file = _re_pseudo_file.match(filename)
         add_quotes_around_file = not is_pseudo_file
-        if is_module:
-            if filename == "<string>":
-                if (func_name := is_eval_or_exec_stmt(frame)):
-                    s += f" in {func_name}"
-            elif not is_eval_or_exec_stmt(frame) and not is_pseudo_file:
-                s += " file"
+        # FIXME: DRY
+        if filename == "<string>":
+            if (func_name := is_eval_or_exec_stmt(frame)):
+                s += f" in {func_name}"
+            if remapped_filename := pyficache.main.code2tempfile.get(frame.f_code):
+                filename = remapped_filename
+        elif not is_eval_or_exec_stmt(frame) and not is_pseudo_file:
+            s += " file"
         elif s == "?()":
             if (func_name := is_eval_or_exec_stmt(frame)):
                 s = f"in {func_name}"
@@ -677,6 +684,9 @@ def fn(x):
                     dd, (frame.f_back, frame.f_back.f_code.co_firstlineno, -1)
                 )
             )
+            dd.core.processor.curframe = frame.f_back
+            dd.core.processor.stack = [(dd.core.processor.curframe, 1, 0)]
+            print_stack_entry(dd.core.processor, 0)
 
         _, mess = format_function_and_parameters(frame, dd, style="tango")
         print(mess)

trepan/processor/print.py

@@ -199,23 +199,26 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
         #                 break
 
         filename = frame2file(core_obj, frame, canonic=False)
+        # FIXME: DRY
         if "<string>" == filename:
             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)
+                # FIXME: DRY
                 if "<string>" == filename:
-                    remapped_file = cmdfns.source_tempfile_remap(
-                        "eval_string",
-                        dbgr_obj.eval_string,
-                        tempdir=proc_obj.settings("tempdir"),
-                    )
-                    # pyficache.remap_file(filename, remapped_file)
-                    pyficache.main.code2tempfile[frame.f_code] = filename
-                    filename, line_number = pyficache.unmap_file_line(
-                        remapped_file, line_number
-                    )
+                    if not (remapped_file := pyficache.main.code2tempfile.get(frame.f_code)):
+                        remapped_file = cmdfns.source_tempfile_remap(
+                            "eval_string",
+                            dbgr_obj.eval_string,
+                            tempdir=proc_obj.settings("tempdir"),
+                        )
+                        # pyficache.remap_file(filename, remapped_file)
+                        pyficache.main.code2tempfile[frame.f_code] = filename
+                        filename, line_number = pyficache.unmap_file_line(
+                            remapped_file, line_number
+                        )
                     pass
                 pass