From 869ccaeea269a0b42091ab2fd82ca911be00f936 Mon Sep 17 00:00:00 2001
From: Timofey X <vuki03@mail.ru>
Date: Fri, 2 Feb 2024 18:55:21 +0700
Subject: [PATCH] [cocas] Fix remaining warnings in cocas

---
 cocas/assembler/macro_processor.py             |  8 ++++++--
 cocas/assembler/targets/cdm8e/code_segments.py | 13 ++++++++-----
 cocas/linker/linker.py                         |  6 +++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cocas/assembler/macro_processor.py b/cocas/assembler/macro_processor.py
index 0830b82..4be3fcc 100644
--- a/cocas/assembler/macro_processor.py
+++ b/cocas/assembler/macro_processor.py
@@ -2,6 +2,7 @@
 from base64 import b64encode
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Optional
 
 from antlr4 import CommonTokenStream, FileStream, InputStream
 from antlr4.TokenStreamRewriter import TokenStreamRewriter
@@ -102,7 +103,9 @@ def sub_all(ps):
 
 # noinspection PyPep8Naming
 class ExpandMacrosVisitor(MacroVisitor):
-    def __init__(self, rewriter: TokenStreamRewriter, mlb_macros, filepath: str):
+    def __init__(self, rewriter: Optional[TokenStreamRewriter], mlb_macros, filepath: str):
+        # rewriter should be None if then will be called .visit(MlbContext)
+        # rewriter should be valid if then will be called .visit(ProgramContext)
         self.nonce = 0
         self.macros = {name: mlb_macros[name].copy() for name in mlb_macros}
         self.rewriter = rewriter
@@ -294,7 +297,8 @@ def read_mlb(filepath: Path):
     token_stream = CommonTokenStream(lexer)
     parser = MacroParser(token_stream)
     cst = parser.mlb()
-    return ExpandMacrosVisitor(None, dict(), str_path).visit(cst)
+    emv = ExpandMacrosVisitor(None, dict(), str_path)
+    return emv.visit(cst)
 
 
 def process_macros(input_stream: InputStream, library_macros, filepath: Path):
diff --git a/cocas/assembler/targets/cdm8e/code_segments.py b/cocas/assembler/targets/cdm8e/code_segments.py
index c61ee2e..e6522a7 100644
--- a/cocas/assembler/targets/cdm8e/code_segments.py
+++ b/cocas/assembler/targets/cdm8e/code_segments.py
@@ -31,7 +31,7 @@ def location(self, value):
 
 @dataclass
 class RelocatableExpressionSegment(CodeSegment, ABC):
-    expr: RelocatableExpressionNode
+    expr: RelocatableExpressionNode = field(init=True)
 
 
 @dataclass
@@ -133,10 +133,13 @@ def fill(self, object_record: "ObjectSectionRecord", section: "Section", labels:
         object_record.data.extend(val.to_bytes(self.size, 'little', signed=(val < 0)))
 
 
-@dataclass
-class GotoSegment(VaryingLengthSegment):
-    branch_mnemonic: str
-    expr: RelocatableExpressionNode
+class GotoSegment(RelocatableExpressionSegment, VaryingLengthSegment):
+    def __init__(self, branch_mnemonic: str, expr: RelocatableExpressionNode):
+        # noinspection PyArgumentList
+        RelocatableExpressionSegment.__init__(self, expr)
+        VaryingLengthSegment.__init__(self)
+        self.branch_mnemonic = branch_mnemonic
+
     base_size = 2
     expanded_size = 5
 
diff --git a/cocas/linker/linker.py b/cocas/linker/linker.py
index ab4c178..1c6c9c5 100644
--- a/cocas/linker/linker.py
+++ b/cocas/linker/linker.py
@@ -2,7 +2,7 @@
 from typing import Any
 
 from cocas.error import CdmLinkException
-from cocas.object_module import CodeLocation, ExternalEntry, ObjectModule, ObjectSectionRecord
+from cocas.object_module import CodeLocation, ObjectModule, ObjectSectionRecord
 
 
 def init_bins(asects: list[ObjectSectionRecord]):
@@ -119,7 +119,7 @@ def link(objects: list[tuple[Any, ObjectModule]]):
         image_end = image_begin + len(rsect.data)
         image[image_begin:image_end] = rsect.data
         entry_bytes: range
-        for offset, entry_bytes, sign in map(ExternalEntry.as_tuple, rsect.relative):
+        for offset, entry_bytes, sign in map(lambda x: x.as_tuple(), rsect.relative):
             pos = image_begin + offset
             lower_limit = 1 << 8 * entry_bytes.start
             val = int.from_bytes(image[pos:pos + len(entry_bytes)], 'little', signed=False) * lower_limit
@@ -134,7 +134,7 @@ def link(objects: list[tuple[Any, ObjectModule]]):
 
     for sect in asects + rsects:
         for ext_name in sect.external:
-            for offset, entry_bytes, sign in map(ExternalEntry.as_tuple, sect.external[ext_name]):
+            for offset, entry_bytes, sign in map(lambda x: x.as_tuple(), sect.external[ext_name]):
                 pos = sect_addresses[sect.name] + offset
                 lower_limit = 1 << 8 * entry_bytes.start
                 val = int.from_bytes(image[pos:pos + len(entry_bytes)], 'little', signed=False) * lower_limit