Better handling of pyasm files

pyasm lines have location information and newlines. So don't
add these.

Author: rocky

trepan/processor/command/list.py

@@ -94,6 +94,7 @@ def run(self, args):
         if filename is None:
             return
         filename = pyficache.unmap_file(pyficache.resolve_name_to_path(filename))
+        is_pyasm = filename.endswith(".pyasm")
 
         # We now have range information. Do the listing.
         max_line = pyficache.size(filename)
@@ -147,6 +148,11 @@ def run(self, args):
                     self.msg("[EOF]")
                     break
                 else:
+                    if is_pyasm:
+                        self.msg_nocr(line)
+                        proc.list_lineno = lineno
+                        continue
+
                     line = line.rstrip("\n")
                     s = proc._saferepr(lineno).rjust(3)
                     if len(s) < 5:
@@ -174,6 +180,7 @@ def run(self, args):
                     else:
                         s += a_pad
                         pass
+
                     self.msg(s + "\t" + line)
                     proc.list_lineno = lineno
                     pass
@@ -203,8 +210,8 @@ def doit(cmd, args):
     print("--" * 10)
     # doit(lcmd, ['list'])
 
-    doit(lcmd, ['list', __file__ + ':5'])
-    print('--' * 10)
+    doit(lcmd, ["list", __file__ + ":5"])
+    print("--" * 10)
 
     # doit(lcmd, ['list', 'os:10'])
     # print('--' * 10)

trepan/processor/print.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2024 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2024-2025 Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -19,24 +19,17 @@
 import os.path as osp
 import re
 import sys
-from inspect import ismodule, currentframe
+from inspect import currentframe, ismodule
 from tempfile import NamedTemporaryFile
 from types import CodeType
 
 import pyficache
 
+from trepan.lib.format import Filename, Hex, LineNumber, Symbol, format_token  # Opcode,
 from trepan.lib.stack import check_path_with_frame, frame2file, is_eval_or_exec_stmt
 from trepan.processor import cmdfns
 from trepan.processor.cmdfns import deparse_fn
 
-from trepan.lib.format import (  # Opcode,
-    Filename,
-    Hex,
-    LineNumber,
-    Symbol,
-    format_token,
-)
-
 try:
     from trepan.lib.deparse import deparse_and_cache
 
@@ -53,7 +46,9 @@ def format_code(code_object: CodeType, style) -> str:
     Format according to "style" a Python code object. The
     formatted string is returned.
     """
-    formatted_line = format_token(LineNumber, str(code_object.co_firstlineno), style=style)
+    formatted_line = format_token(
+        LineNumber, str(code_object.co_firstlineno), style=style
+    )
     formatted_id = format_token(Hex, hex(id(code_object)), style=style)
     formatted_name = format_token(Symbol, code_object.co_name, style=style)
     formatted_filename = format_token(Filename, code_object.co_filename, style=style)
@@ -70,14 +65,16 @@ def format_frame(frame_object, style) -> str:
     """
     formatted_line = format_token(LineNumber, str(frame_object.f_lineno), style=style)
     formatted_id = format_token(Hex, hex(id(frame_object)), style=style)
-    formatted_filename = format_token(Filename, frame_object.f_code.co_filename, style=style)
+    formatted_filename = format_token(
+        Filename, frame_object.f_code.co_filename, style=style
+    )
     return (
         f"<frame at {formatted_id} "
         f"file {formatted_filename}, line {formatted_line}>"
     )
 
 
-def print_source_line(msg, lineno, line, event_str=None):
+def print_source_line(msg, lineno, line, event_str=None, is_pyasm: bool = False):
     """Print out a source line of text , e.g. the second
     line in:
         (/tmp.py:2):  <module>
@@ -90,7 +87,10 @@ def print_source_line(msg, lineno, line, event_str=None):
 
     # We don't use the filename normally. ipython and other applications
     # however might.
-    return msg(f"{event_str} {lineno} {line}")
+    if is_pyasm:
+        return msg(f"{event_str}\n{line}")
+    else:
+        return msg(f"{event_str} {lineno} {line}")
 
 
 def print_source_location_info(
@@ -116,6 +116,7 @@ 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
@@ -242,7 +243,15 @@ def prefix_for_filename(deparsed_text: str) -> str:
             opts["style"] = proc_obj.settings("style")
 
         pyficache.update_cache(filename)
+
+        is_pyasm = filename.endswith(".pyasm")
+        if is_pyasm:
+            opts = opts.copy()
+            opts["style"] = "plain"
+            opts["output"] = "plain"
+
         line = pyficache.getline(filename, lineno, opts)
+
         if not line:
             if (
                 not source_text
@@ -290,8 +299,6 @@ def prefix_for_filename(deparsed_text: str) -> str:
 
                     pass
 
-            if isinstance(proc_obj.curframe, int):
-                breakpoint()
             line = linecache.getline(filename, lineno, proc_obj.curframe.f_globals)
             if not line:
                 m = re.search("^<frozen (.*)>", filename)
@@ -343,7 +350,11 @@ def prefix_for_filename(deparsed_text: str) -> str:
         if line and len(line.strip()) != 0:
             if proc_obj.event:
                 print_source_line(
-                    intf_obj.msg, lineno, line, proc_obj.event2short[proc_obj.event]
+                    intf_obj.msg,
+                    lineno,
+                    line,
+                    proc_obj.event2short[proc_obj.event],
+                    is_pyasm,
                 )
             pass
         if "<string>" != filename:
@@ -364,11 +375,14 @@ def prefix_for_filename(deparsed_text: str) -> str:
             pass
     return True
 
+
 # Demo it
 if __name__ == "__main__":
+
     def five():
         from trepan.processor.cmdproc import CommandProcessor
         from trepan.processor.command.mock import MockDebugger
+
         d = MockDebugger()
         cmdproc = CommandProcessor(d.core)
         cmdproc.frame = currentframe()