[cocas] Rename exceptions

cdm-processors · Feb 8, 2024 · a9bc14c · a9bc14c
1 parent d9defbc
commit a9bc14c
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 72 deletions.
diff --git a/cocas/assembler/__init__.py b/cocas/assembler/__init__.py
@@ -1,6 +1,6 @@
 from .assembler import assemble_files, assemble_module
 from .ast_builder import build_ast
-from .exceptions import CdmAssemblerException
+from .exceptions import AssemblerException
 from .macro_processor import process_macros
 from .object_generator import generate_object_module
 from .targets import import_target, list_assembler_targets
diff --git a/cocas/assembler/ast_builder.py b/cocas/assembler/ast_builder.py
@@ -24,7 +24,7 @@
     UntilLoopNode,
     WhileLoopNode,
 )
-from .exceptions import AntlrErrorListener, CdmAssemblerException, CdmExceptionTag
+from .exceptions import AntlrErrorListener, AsmExceptionTag, AssemblerException
 from .generated import AsmLexer, AsmParser, AsmParserVisitor
 
 
@@ -126,7 +126,7 @@ def visitConnective_condition(self, ctx: AsmParser.Connective_conditionContext):
         cond = self.visitCondition(ctx.condition())
         cond.conjunction = ctx.conjunction().getText()
         if cond.conjunction != 'and' and cond.conjunction != 'or':
-            raise CdmAssemblerException(CdmExceptionTag.ASM, self.source_path, ctx.start.line - self.line_offset,
+            raise AssemblerException(AsmExceptionTag.ASM, self.source_path, ctx.start.line - self.line_offset,
                                         'Expected "and" or "or" in compound condition')
         return cond
 
@@ -218,7 +218,7 @@ def visitStandaloneLabel(self, ctx: AsmParser.StandaloneLabelContext) -> LabelDe
         label_decl = self.visitLabel_declaration(ctx.label_declaration())
         label_decl.external = ctx.Ext() is not None
         if label_decl.entry and label_decl.external:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, self.source_path, ctx.start.line - self.line_offset,
+            raise AssemblerException(AsmExceptionTag.ASM, self.source_path, ctx.start.line - self.line_offset,
                                         f'Label {label_decl.label.name} cannot be both external and entry')
         return label_decl
 
@@ -257,12 +257,12 @@ def build_ast(input_stream: InputStream, filepath: Path):
     str_path = filepath.absolute().as_posix()
     lexer = AsmLexer(input_stream)
     lexer.removeErrorListeners()
-    lexer.addErrorListener(AntlrErrorListener(CdmExceptionTag.ASM, str_path))
+    lexer.addErrorListener(AntlrErrorListener(AsmExceptionTag.ASM, str_path))
     token_stream = CommonTokenStream(lexer)
     token_stream.fill()
     parser = AsmParser(token_stream)
     parser.removeErrorListeners()
-    parser.addErrorListener(AntlrErrorListener(CdmExceptionTag.ASM, str_path))
+    parser.addErrorListener(AntlrErrorListener(AsmExceptionTag.ASM, str_path))
     cst = parser.program()
     bav = BuildAstVisitor(str_path)
     result = bav.visit(cst)

diff --git a/cocas/assembler/code_block.py b/cocas/assembler/code_block.py
@@ -16,7 +16,7 @@
     UntilLoopNode,
     WhileLoopNode,
 )
-from .exceptions import CdmAssemblerException, CdmExceptionTag, CdmTempException
+from .exceptions import AsmExceptionTag, AssemblerException, CdmTempException
 from .targets import ICodeSegment, TargetInstructionsInterface
 
 
@@ -39,8 +39,8 @@ def __init__(self, address: int, lines: list, target_instructions: Type[TargetIn
             target_instructions.finish(temp_storage)
         except CdmTempException as e:
             # if it isn't ok, must be at least one line
-            raise CdmAssemblerException(CdmExceptionTag.ASM, lines[-1].location.file,
-                                        lines[-1].location.line, e.message)
+            raise AssemblerException(AsmExceptionTag.ASM, lines[-1].location.file,
+                                     lines[-1].location.line, e.message)
 
     def append_label(self, label_name):
         self.labels[label_name] = self.address + self.size

diff --git a/cocas/assembler/exceptions.py b/cocas/assembler/exceptions.py
@@ -5,7 +5,7 @@
 from cocas.assembler.generated import AsmParser
 
 
-class CdmExceptionTag(Enum):
+class AsmExceptionTag(Enum):
     MACRO = "Macro"
     ASM = "Assembler"
 
@@ -19,8 +19,8 @@ def __init__(self, message: str):
         self.message = message
 
 
-class CdmAssemblerException(Exception):
-    def __init__(self, tag: CdmExceptionTag, file: str, line: int, description: str):
+class AssemblerException(Exception):
+    def __init__(self, tag: AsmExceptionTag, file: str, line: int, description: str):
         self.tag = tag
         self.file = file
         self.line = line
@@ -36,4 +36,4 @@ def syntaxError(self, recognizer, offending_symbol, line, column, msg, e):
         if isinstance(recognizer, AsmParser):
             line = line - recognizer.current_offset
             self.file = recognizer.current_file
-        raise CdmAssemblerException(self.tag, self.file, line, msg)
+        raise AssemblerException(self.tag, self.file, line, msg)
diff --git a/cocas/assembler/macro_processor.py b/cocas/assembler/macro_processor.py
@@ -9,7 +9,7 @@
 
 from cocas.object_module import CodeLocation
 
-from .exceptions import AntlrErrorListener, CdmAssemblerException, CdmExceptionTag, CdmTempException
+from .exceptions import AntlrErrorListener, AsmExceptionTag, AssemblerException, CdmTempException
 from .generated import MacroLexer, MacroParser, MacroVisitor
 
 
@@ -182,7 +182,7 @@ def visitMlb(self, ctx: MacroParser.MlbContext):
             try:
                 self.add_macro(self.visitMlb_macro(child))
             except CdmTempException as e:
-                raise CdmAssemblerException(CdmExceptionTag.MACRO, self.filepath, child.start.line, e.message)
+                raise AssemblerException(AsmExceptionTag.MACRO, self.filepath, child.start.line, e.message)
         return self.macros
 
     def visitProgram(self, ctx: MacroParser.ProgramContext):
@@ -205,7 +205,7 @@ def visitProgram(self, ctx: MacroParser.ProgramContext):
                         self.rewriter.insertBeforeToken(child.start, expanded_text)
                         self.rewriter.delete(self.rewriter.DEFAULT_PROGRAM_NAME, child.start, child.stop)
             except CdmTempException as e:
-                raise CdmAssemblerException(CdmExceptionTag.MACRO, self.filepath, child.start.line, e.message)
+                raise AssemblerException(AsmExceptionTag.MACRO, self.filepath, child.start.line, e.message)
 
     def visitMacro(self, ctx: MacroParser.MacroContext):
         header = ctx.macro_header()
@@ -305,12 +305,12 @@ def process_macros(input_stream: InputStream, library_macros, filepath: Path):
     str_path = filepath.absolute().as_posix()
     lexer = MacroLexer(input_stream)
     lexer.removeErrorListeners()
-    lexer.addErrorListener(AntlrErrorListener(CdmExceptionTag.MACRO, str_path))
+    lexer.addErrorListener(AntlrErrorListener(AsmExceptionTag.MACRO, str_path))
     token_stream = CommonTokenStream(lexer)
 
     parser = MacroParser(token_stream)
     parser.removeErrorListeners()
-    parser.addErrorListener(AntlrErrorListener(CdmExceptionTag.MACRO, str_path))
+    parser.addErrorListener(AntlrErrorListener(AsmExceptionTag.MACRO, str_path))
     cst = parser.program()
     rewriter = TokenStreamRewriter(token_stream)
     emv = ExpandMacrosVisitor(rewriter, library_macros, str_path)

diff --git a/cocas/assembler/object_generator.py b/cocas/assembler/object_generator.py
@@ -6,10 +6,10 @@
 
 from .ast_nodes import InstructionNode, LabelDeclarationNode, ProgramNode, TemplateSectionNode
 from .code_block import Section
-from .exceptions import CdmExceptionTag
+from .exceptions import AsmExceptionTag
 from .targets import TargetInstructionsInterface
 
-TAG = CdmExceptionTag.ASM
+TAG = AsmExceptionTag.ASM
 
 
 @dataclass

diff --git a/cocas/assembler/targets/abstract_code_segments.py b/cocas/assembler/targets/abstract_code_segments.py
@@ -4,7 +4,7 @@
 
 from cocas.object_module import CodeLocation
 
-from ..exceptions import CdmAssemblerException, CdmExceptionTag
+from ..exceptions import AsmExceptionTag, AssemblerException
 
 if TYPE_CHECKING:
     from cocas.object_module import ObjectSectionRecord
@@ -98,4 +98,4 @@ def fill(self, object_record: "ObjectSectionRecord", section: "Section", labels:
 
 
 def _error(segment: ICodeSegment, message: str):
-    raise CdmAssemblerException(CdmExceptionTag.ASM, segment.location.file, segment.location.line, message)
+    raise AssemblerException(AsmExceptionTag.ASM, segment.location.file, segment.location.line, message)
diff --git a/cocas/assembler/targets/cdm16/code_segments.py b/cocas/assembler/targets/cdm16/code_segments.py
@@ -7,7 +7,7 @@
 from cocas.object_module import CodeLocation, ExternalEntry
 
 from ...ast_nodes import LabelNode, RegisterNode, RelocatableExpressionNode, TemplateFieldNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag
+from ...exceptions import AsmExceptionTag, AssemblerException
 from .. import IAlignedSegment, IAlignmentPaddingSegment, ICodeSegment, IVaryingLengthSegment
 
 if TYPE_CHECKING:
@@ -22,7 +22,7 @@ def pack(fmt, *args):
 
 
 def _error(segment: ICodeSegment, message: str):
-    raise CdmAssemblerException(CdmExceptionTag.ASM, segment.location.file, segment.location.line, message)
+    raise AssemblerException(AsmExceptionTag.ASM, segment.location.file, segment.location.line, message)
 
 
 class CodeSegment(ICodeSegment, ABC):

diff --git a/cocas/assembler/targets/cdm16/target_instructions.py b/cocas/assembler/targets/cdm16/target_instructions.py
@@ -4,7 +4,7 @@
 from typing import Callable, Union, get_args, get_origin
 
 from ...ast_nodes import InstructionNode, LabelNode, RegisterNode, RelocatableExpressionNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag, CdmTempException
+from ...exceptions import AsmExceptionTag, AssemblerException, CdmTempException
 from .. import ICodeSegment, TargetInstructionsInterface
 from .code_segments import (
     AlignmentPaddingSegment,
@@ -56,10 +56,10 @@ def assemble_instruction(line: InstructionNode, temp_storage: dict) -> list[ICod
                     return h.handler(line, temp_storage, h.instructions[line.mnemonic])
             if line.mnemonic.startswith('b'):
                 return TargetInstructions.branch(line)
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line,
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line,
                                         f'Unknown instruction "{line.mnemonic}"')
         except CdmTempException as e:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line, e.message)
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line, e.message)
 
     @staticmethod
     def finish(temp_storage: dict):
@@ -184,7 +184,7 @@ def branch(line: InstructionNode, inverse=False) -> list[ICodeSegment]:
                 branch_code = pair.inv_code if not inverse else pair.code
                 break
         else:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line,
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line,
                                         f'Invalid branch condition: {cond}')
         assert_count_args(line.arguments, RelocatableExpressionNode)
         return [Branch(line.location, branch_code, line.arguments[0])]

diff --git a/cocas/assembler/targets/cdm8/code_segments.py b/cocas/assembler/targets/cdm8/code_segments.py
@@ -5,7 +5,7 @@
 from cocas.object_module import CodeLocation, ExternalEntry
 
 from ...ast_nodes import LabelNode, RelocatableExpressionNode, TemplateFieldNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag
+from ...exceptions import AsmExceptionTag, AssemblerException
 from .. import IAlignmentPaddingSegment, ICodeSegment
 
 if TYPE_CHECKING:
@@ -14,7 +14,7 @@
 
 
 def _error(segment: ICodeSegment, message: str):
-    raise CdmAssemblerException(CdmExceptionTag.ASM, segment.location.file, segment.location.line, message)
+    raise AssemblerException(AsmExceptionTag.ASM, segment.location.file, segment.location.line, message)
 
 
 # noinspection DuplicatedCode

diff --git a/cocas/assembler/targets/cdm8/target_instructions.py b/cocas/assembler/targets/cdm8/target_instructions.py
@@ -5,7 +5,7 @@
 from bitstruct import pack
 
 from ...ast_nodes import InstructionNode, LabelNode, RegisterNode, RelocatableExpressionNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag, CdmTempException
+from ...exceptions import AsmExceptionTag, AssemblerException, CdmTempException
 from .. import ICodeSegment, TargetInstructionsInterface
 from .code_segments import AlignmentPaddingSegment, BytesSegment, ExpressionSegment
 
@@ -48,10 +48,10 @@ def assemble_instruction(line: InstructionNode, temp_storage: dict) -> list[ICod
                     return h.handler(line, temp_storage, h.instructions[line.mnemonic])
             if line.mnemonic.startswith('b'):
                 return TargetInstructions.branch(line)
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line,
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line,
                                         f'Unknown instruction "{line.mnemonic}"')
         except CdmTempException as e:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line, e.message)
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line, e.message)
 
     @staticmethod
     def finish(temp_storage: dict):
@@ -155,7 +155,7 @@ def branch(line: InstructionNode, inverse=False) -> list[ICodeSegment]:
                 branch_code = pair.inv_code if not inverse else pair.code
                 break
         else:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line,
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line,
                                         f'Invalid branch condition: {cond}')
         assert_count_args(line.arguments, RelocatableExpressionNode)
         return [BytesSegment(pack('u4u4', 0xE, branch_code), line.location),

diff --git a/cocas/assembler/targets/cdm8e/code_segments.py b/cocas/assembler/targets/cdm8e/code_segments.py
@@ -5,11 +5,11 @@
 from cocas.object_module import CodeLocation, ExternalEntry
 
 from ...ast_nodes import LabelNode, RelocatableExpressionNode, TemplateFieldNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag
+from ...exceptions import AsmExceptionTag, AssemblerException
 from .. import ICodeSegment, IVaryingLengthSegment
 from .simple_instructions import simple_instructions
 
-TAG = CdmExceptionTag.ASM
+TAG = AsmExceptionTag.ASM
 
 if TYPE_CHECKING:
     from cocas.object_module import ObjectSectionRecord
@@ -178,10 +178,10 @@ def update_varying_length(self, pos: int, section: "Section", labels: dict[str,
                         if label_name in labels:
                             labels[label_name] += shift_length
                 return shift_length
-        except CdmAssemblerException as e:
+        except AssemblerException as e:
             raise e
         except Exception as e:
-            raise CdmAssemblerException(TAG, self.location.file, self.location.line, str(e))
+            raise AssemblerException(TAG, self.location.file, self.location.line, str(e))
 
     def fill(self, object_record: "ObjectSectionRecord", section: "Section", labels: dict[str, int],
              templates: dict[str, dict[str, int]]):
@@ -201,7 +201,7 @@ def fill(self, object_record: "ObjectSectionRecord", section: "Section", labels:
 
 
 def _error(segment: ICodeSegment, message: str):
-    raise CdmAssemblerException(TAG, segment.location.file, segment.location.line, message)
+    raise AssemblerException(TAG, segment.location.file, segment.location.line, message)
 
 
 def eval_rel_expr_seg(seg: RelocatableExpressionSegment, s: "Section",

diff --git a/cocas/assembler/targets/cdm8e/target_instructions.py b/cocas/assembler/targets/cdm8e/target_instructions.py
@@ -3,7 +3,7 @@
 import bitstruct
 
 from ...ast_nodes import InstructionNode, LabelNode, RegisterNode, RelocatableExpressionNode
-from ...exceptions import CdmAssemblerException, CdmExceptionTag, CdmTempException
+from ...exceptions import AsmExceptionTag, AssemblerException, CdmTempException
 from .. import ICodeSegment, TargetInstructionsInterface
 from .code_segments import (
     BytesSegment,
@@ -53,7 +53,7 @@ def assemble_instruction(line: InstructionNode, temp_storage) \
                 segment.location = line.location
             return segments
         except CdmTempException as e:
-            raise CdmAssemblerException(CdmExceptionTag.ASM, line.location.file, line.location.line, e.message)
+            raise AssemblerException(AsmExceptionTag.ASM, line.location.file, line.location.line, e.message)
 
     @staticmethod
     def finish(temp_storage: dict):

diff --git a/cocas/exception_handlers.py b/cocas/exception_handlers.py
@@ -1,8 +1,8 @@
 from colorama import Fore, Style
 
-from cocas.assembler import CdmAssemblerException
-from cocas.linker import CdmLinkException
-from cocas.object_file import CdmObjectFileException
+from cocas.assembler import AssemblerException
+from cocas.linker import LinkerException
+from cocas.object_file import ObjectFileException
 
 
 def log_exception(tag: str, message: str):
@@ -18,18 +18,18 @@ def log_os_error(e: OSError):
     exit(1)
 
 
-def log_asm_exception(e: CdmAssemblerException):
+def log_asm_exception(e: AssemblerException):
     print(f'[{e.tag.value}] {Fore.RED}ERROR{Fore.RESET} at line {Style.BRIGHT}{e.line}{Style.RESET_ALL} of '
           f'{Style.BRIGHT}{e.file}{Style.RESET_ALL}')
     print(f'{e.description}')
 
 
-def log_object_file_exception(e: CdmObjectFileException):
+def log_object_file_exception(e: ObjectFileException):
     print(f'[Object file] {Fore.RED}ERROR{Fore.RESET} at line {Style.BRIGHT}{e.line}{Style.RESET_ALL} of '
           f'{Style.BRIGHT}{e.file}{Style.RESET_ALL}')
     print(f'{e.description}')
 
 
-def log_link_exception(_: CdmLinkException):
+def log_link_exception(_: LinkerException):
     # todo: find this code from previous revisions
     pass
diff --git a/cocas/linker/__init__.py b/cocas/linker/__init__.py
@@ -1,4 +1,4 @@
 from .debug_export import debug_export, write_debug_export
-from .exceptions import CdmLinkException
+from .exceptions import LinkerException
 from .image import write_image
 from .linker import link
diff --git a/cocas/linker/exceptions.py b/cocas/linker/exceptions.py
@@ -1,3 +1,3 @@
-class CdmLinkException(Exception):
+class LinkerException(Exception):
     def __init__(self, message: str):
         self.message = message