Handle eval/exec variables better

Author: rocky

trepan/lib/stack.py

@@ -262,7 +262,7 @@ def format_return_and_location(
         elif s == "?()":
             if (func_name := is_eval_or_exec_stmt(frame)):
                 s = f"in {func_name}"
-                exec_str = get_exec_string(frame.f_back)
+                exec_str = get_exec_or_eval_string(frame.f_back)
                 if exec_str is not None:
                     filename = exec_str
                     add_quotes_around_file = False
@@ -350,7 +350,7 @@ def frame2filesize(frame):
         return None, None
 
 
-def get_exec_string(frame: FrameType) -> Optional[str]:
+def get_exec_or_eval_string(frame: FrameType) -> Optional[str]:
     if (call_frame := frame.f_back) is not None:
         offset = call_frame.f_lasti - 2
         code = call_frame.f_code
@@ -362,6 +362,9 @@ def get_exec_string(frame: FrameType) -> Optional[str]:
                 pass
             elif inst.opname == "LOAD_CONST":
                 return inst.argval
+            elif inst.opname == "LOAD_NAME":
+                arg_name = call_frame.f_code.co_names[inst.argval]
+                return call_frame.f_locals[arg_name]
             else:
                 break
             offset -= 2
@@ -627,9 +630,7 @@ def __init__(self):
             style="tango",
         )
     )
-    import sys
 
-    sys.exit(0)
     # print("frame count: %d" % count_frames(frame))
     # print("frame count: %d" % count_frames(frame.f_back))
     # print("frame count: %d" % count_frames(frame, 1))
@@ -645,9 +646,11 @@ def fn(x):
         eval_str = is_eval_or_exec_stmt(frame.f_back)
         if eval_str:
             print(f"Caller is {eval_str} stmt")
+            eval_exec_arg = get_exec_or_eval_string(frame.f_back)
+            print(f"{eval_str} argument is: {eval_exec_arg}")
             print(
                 format_stack_entry(
-                    dd, (frame.f_back, frame.f_back.f_code.co_firstlineno)
+                    dd, (frame.f_back, frame.f_back.f_code.co_firstlineno, -1)
                 )
             )
 
@@ -658,12 +661,19 @@ def fn(x):
 
     print("=" * 30)
     fn(5)
+    print("=" * 30)
     eval("fn(5)")
+    arg_str = "fn(5)"
+    eval(arg_str)
+    print("+" * 30)
     exec("fn(5)")
-    # print("=" * 30)
-    # print(print_obj("fn", fn))
-    # print("=" * 30)
-    # print(print_obj("len", len))
-    # print("=" * 30)
-    # print(print_obj("MockDebugger", MockDebugger))
+    exec(arg_str)
+
+    print("=" * 30)
+    print(print_obj("fn", fn))
+    print("=" * 30)
+    print(print_obj("len", len))
+    print("=" * 30)
+    print(print_obj("MockDebugger", MockDebugger))
+
     pass

trepan/processor/print.py

@@ -26,7 +26,12 @@
 import pyficache
 
 from trepan.lib.format import Filename, Hex, LineNumber, Symbol, format_token  # Opcode,
-from trepan.lib.stack import check_path_with_frame, frame2file, get_exec_string, is_eval_or_exec_stmt
+from trepan.lib.stack import (
+    check_path_with_frame,
+    frame2file,
+    get_exec_or_eval_string,
+    is_eval_or_exec_stmt,
+)
 from trepan.processor import cmdfns
 from trepan.processor.cmdfns import deparse_fn
 
@@ -108,7 +113,7 @@ def print_source_location_info(
         L -- 2 import sys,os
         (trepan3k)
     """
-    col_str = f":{column_number}"  if column_number >= 0 else ""
+    col_str = f":{column_number}" if column_number >= 0 else ""
     if remapped_file and filename != remapped_file:
         mess = f"({remapped_file}:{line_number}{col_str} remapped {filename}"
     else:
@@ -202,7 +207,9 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                         tempdir=proc_obj.settings("tempdir"),
                     )
                     pyficache.remap_file(filename, remapped_file)
-                    filename, line_number = pyficache.unmap_file_line(filename, line_number)
+                    filename, line_number = pyficache.unmap_file_line(
+                        filename, line_number
+                    )
                     pass
                 pass
 
@@ -230,12 +237,12 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                 # else:
                 #   print("Can't deparse", frame.f_code)
                 if source_text is None and eval_kind:
-                     if (source_text := get_exec_string(frame)):
-                         filename = "string-" + prefix_for_filename(source_text) + "-"
-                     else:
-                         source_text = f"{eval_kind}(...)"
-                         pass
-                     pass
+                    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
         else:
@@ -320,7 +327,9 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                         pyficache.remap_file(remapped_file, filename)
                     fd.close()
                     if source_text:
-                        intf_obj.msg(f"remapped string {prefix_for_source_text(source_text, 10)} to file {remapped_file}")
+                        intf_obj.msg(
+                            f"remapped string {prefix_for_source_text(source_text, 10)} to file {remapped_file}"
+                        )
                     else:
                         intf_obj.msg(f"remapped file {filename} to {remapped_file}")
                     proc_obj.list_filename = remapped_file
@@ -424,10 +433,12 @@ def five():
         cmdproc.curframe = cmdproc.stack[cmdproc.curindex][0]
         print_location(cmdproc)
 
-        exec("""
+        exec(
+            """
 cmdproc.frame = currentframe()
 cmdproc.setup()
 print_location(cmdproc)
-""")
+"""
+        )
 
     exec("five()")