refact: fix typing issue

Author: boriel

src/arch/z80/backend/common.py

@@ -7,6 +7,7 @@
 from src.api import global_, tmp_labels
 from src.api.config import OPTIONS, OptimizationStrategy
 from src.api.exception import TempAlreadyFreedError
+
 from .runtime import LABEL_REQUIRED_MODULES, NAMESPACE, RUNTIME_LABELS
 from .runtime import Labels as RuntimeLabel
 

src/arch/z80/backend/generic.py

@@ -7,10 +7,11 @@
 from src.api.config import OPTIONS
 from src.api.fp import immediate_float
 from src.api.tmp_labels import tmp_label
+
 from . import common, exception
+from ._8bit import Bits8
 from ._16bit import Bits16
 from ._32bit import Bits32
-from ._8bit import Bits8
 from ._f16 import Fixed16
 from ._float import Float
 from .common import (

src/arch/z80/visitor/translator_inst_visitor.py

@@ -2,7 +2,7 @@
 from src.api.debug import __DEBUG__
 from src.arch.interface.quad import Quad
 from src.arch.z80.backend import Backend
-from src.arch.z80.backend.common import BOOL_t, F16_t, F_t, I8_t, I16_t, I32_t, U8_t, U16_t, U32_t, STR_t
+from src.arch.z80.backend.common import BOOL_t, F16_t, F_t, I8_t, I16_t, I32_t, STR_t, U8_t, U16_t, U32_t
 from src.ast import NodeVisitor
 from src.symbols import sym as symbols
 

src/zxbpp/base_pplex.py

@@ -9,7 +9,7 @@
 
 import os
 import sys
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from enum import Enum, unique
 
@@ -88,6 +88,10 @@ def __init__(
         for macro_name, macro_func in self.builtin_macros.items():
             self.defines_table[macro_name] = BuiltinMacro(macro_name=macro_name, func=macro_func)
 
+    def set_macro(self, macro_name: str, func: Callable[[str], str]) -> None:
+        assert self.defines_table is not None
+        self.defines_table[macro_name] = func
+
     def put_current_line(self, prefix: str = "", suffix: str = "") -> str:
         """Returns line and file for include / end of include sequences."""
         assert self.lex is not None

src/zxbpp/prepro/builtinmacro.py

@@ -1,3 +1,5 @@
+from collections.abc import Callable
+
 from src.zxbpp import prepro
 
 from .id_ import ID
@@ -7,12 +9,12 @@
 class BuiltinMacro(ID):
     """A call to a builtin macro like __FILE__ or __LINE__
     Every time the macro() is called, the macro returns
-    it value.
+    its value.
     """
 
-    def __init__(self, macro_name: str, func):
+    def __init__(self, macro_name: str, func: Callable[[MacroCall | None], str]):
         super().__init__(fname="", lineno=0, id_=macro_name)
         self.func = func
 
-    def __call__(self, symbolTable: "prepro.DefinesTable" = None, macro: MacroCall = None) -> str:
+    def __call__(self, symbolTable: prepro.DefinesTable | None = None, macro: MacroCall | None = None) -> str:
         return self.func(macro)

src/zxbpp/zxbpp.py

@@ -112,8 +112,7 @@ def reset_id_table():
         ID_TABLE.define(name, value=val, lineno=0)
 
     for macro_name, macro_func in LEXER.builtin_macros.items():
-        # FIXME
-        LEXER.defines_table[macro_name] = BuiltinMacro(macro_name=macro_name, func=macro_func)  # type: ignore[index]
+        LEXER.set_macro(macro_name, BuiltinMacro(macro_name=macro_name, func=macro_func))
 
 
 def init():