Allow modules in list and disasm for a filename

Author: rocky

trepan/processor/command/disassemble.py

@@ -173,6 +173,9 @@ def run(self, args):
                     opts["end_line"] = last = None
                     do_parse = False
                     bytecode_file = None
+                elif inspect.ismodule(obj):
+                    proc.current_command = proc.current_command.replace(args[1], __file__, 1)
+                    args[1] = __file__
 
         if do_parse:
             (
@@ -271,6 +274,11 @@ def doit(cmd, args):
     command = DisassembleCommand(cp)
     prefix = "-" * 20 + " disassemble "
 
+    # FIXME
+    # Note osp has already been imported
+    print(prefix + "osp")
+    doit(command, ["disassemble", "osp"])
+
     print(prefix + 'doit')
     doit(command, ['disassemble', 'doit()'])
 
@@ -279,10 +287,6 @@ def doit(cmd, args):
 
     doit(command, ["disassemble", f"{doit_return_line}, {doit_return_line+2}"])
 
-    # FIXME
-    # print(prefix + "os.path")
-    # doit(command, ["disassemble", "os.path"])
-
     print(prefix + "cp.errmsg()")
     doit(command, ["disassemble", "cp.errmsg()"])
 

trepan/processor/command/list.py

@@ -63,6 +63,7 @@ class ListCommand(DebuggerCommand):
         list foo.py:5        # List starting from line 5 of file foo.py
         list foo()           # List starting from function foo
         list os.path:5       # List starting from line 5 of module os.path
+                             # Note: os.path should have been imported
         list os.path:5, 6    # list lines 5 and 6 of os.path
         list os.path:5, +1   #  Same as above. +1 is an offset
         list os.path:5, 1    # Same as above, since 1 < 5.
@@ -93,7 +94,23 @@ def run(self, args):
         curframe = proc.curframe
         if filename is None:
             return
-        filename = pyficache.unmap_file(pyficache.resolve_name_to_path(filename))
+        resolved_name = pyficache.resolve_name_to_path(filename)
+        if not osp.exists(resolved_name):
+            # See of resuled_filename is a module name:
+            # START HERE with try: eval, except
+            try:
+                obj = self.proc.eval(filename, show_error=False)
+            except Exception:
+                self.errmsg(f"File {filename} not found")
+                return
+            else:
+                if inspect.ismodule(obj):
+                    resolved_name = pyficache.resolve_name_to_path(obj.__file__)
+                else:
+                    self.errmsg(f"Can't use {obj} as a file-like object")
+                    return
+
+        filename = pyficache.unmap_file(resolved_name)
         is_pyasm = filename.endswith(".pyasm")
 
         # We now have range information. Do the listing.
@@ -207,6 +224,10 @@ def doit(cmd, args):
     cmdproc.setup()
     lcmd = ListCommand(cmdproc)
 
+    # Note: osp is defined abouve
+    doit(lcmd, ['list', "osp:1"])
+    # print('--' * 10)
+
     print("--" * 10)
     # doit(lcmd, ['list'])