Better information when exec current frame

Author: rocky

trepan/lib/stack.py

@@ -120,8 +120,10 @@ def format_function_name(frame, style: str) -> Tuple[Optional[str], Optional[str
     Pick out the function name from ``frame`` and return both the name
     and the name styled according to ``style``
     """
-    if is_eval_or_exec_stmt(frame):
+    if (exec_type := is_eval_or_exec_stmt(frame)):
         funcname = get_call_function_name(frame)
+        if funcname is None:
+            funcname = exec_type
     elif frame.f_code.co_name:
         funcname = frame.f_code.co_name
     else:

trepan/processor/cmdfns.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2013, 2015, 2017-2018, 2020-2021, 2023 Rocky
+#   Copyright (C) 2013, 2015, 2017-2018, 2020-2021, 2023-2024 Rocky
 #   Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -38,13 +38,16 @@ def source_tempfile_remap(prefix, text, tempdir=None):
 
 def deparse_fn(code):
     try:
+        if PYTHON_VERSION_TRIPLE >= (3, 9):
+            # Don't have decompiler here yet.
+            return None
         if (3, 7) <= PYTHON_VERSION_TRIPLE < (3, 9):
             from decompyle3.semantics.linemap import (
                 code_deparse_with_fragments_and_map as deparse_code,
             )
         else:
             from uncompyle6.semantics.linemap import (
-                deparse_code_with_fragments_and_map as deparse_code,
+                code_deparse_with_fragments_and_map as deparse_code,
             )
 
     except ImportError:
@@ -246,4 +249,9 @@ def msg(m):
     print(want_different_line("s", False))
     print(want_different_line("s", True))
     print(want_different_line("s", True))
+
+    my_frame = inspect.currentframe()
+    print("=" * 30)
+    print(deparse_fn(my_frame.f_code).text)
+
     pass

trepan/processor/print.py

@@ -116,12 +116,25 @@ def print_source_location_info(
     print_fn(mess)
     return
 
-
 def print_location(proc_obj):
     """Show where we are. GUI's and front-end interfaces often
     use this to update displays. So it is helpful to make sure
     we give at least some place that's located in a file.
     """
+
+    def prefix_for_filename(deparsed_text: str) -> str:
+        """
+        Return a reasonable filename-friendly string from some
+        deparsed text. We do this so that the user gets some idea of
+        what the string (source code text) is contained in the file.
+
+        """
+        lines = deparsed_text.split("\n")
+        # FIXME Rather than blindly take the first line,
+        # check if it is blank and if so use other lines.
+        first_text_line = lines[0]
+        return proc_obj._saferepr(first_text_line)[1:-1][:10]
+
     i_stack = proc_obj.curindex
     if i_stack is None or proc_obj.stack is None:
         return False
@@ -176,11 +189,8 @@ def print_location(proc_obj):
             if deparsed:
                 # Create a nice prefix for the temporary file to write.
                 # Use the exec type and first line of the deparsed text.
-                first_text_line = deparsed.text.split("\n")[0]
-                # Strip of quotes added by repr and up the first 10 characters
-                # of result.
-                leading_code = proc_obj._saferepr(first_text_line)[1:-1][:10]
-                prefix = f"{eval_kind}-{leading_code}-"
+                leading_code_str = prefix_for_filename(deparsed.text)
+                prefix = f"{eval_kind}-{leading_code_str}-"
 
                 remapped_file = cmdfns.source_tempfile_remap(
                     prefix,
@@ -192,6 +202,11 @@ def print_location(proc_obj):
                 filename = remapped_file
             else:
                 eval_kind = is_eval_or_exec_stmt(frame)
+                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:
                     source_text = f"{eval_kind}(...)"
                     pass
@@ -251,7 +266,7 @@ def print_location(proc_obj):
                 # FIXME:
                 if source_text:
                     lines = source_text.split("\n")
-                    temp_name = "string-"
+                    temp_name = "string-" + prefix_for_filename(source_text)
                 else:
                     # try with good ol linecache and consider fixing pyficache
                     lines = linecache.getlines(filename)