feat: allow multiple archs include paths

Author: boriel

src/arch/z80/optimizer/cpustate.py

@@ -417,9 +417,9 @@ def set(self, r: str, val: int | str | None) -> None:
 
         if is_unknown8(val):
             val = f"{new_tmp_val()}{HL_SEP}{val}"
-        assert is_num or is_unknown16(val) or is_label(val), (
-            f"val '{val}' is neither a number, nor a label nor an unknown16"
-        )
+        assert (
+            is_num or is_unknown16(val) or is_label(val)
+        ), f"val '{val}' is neither a number, nor a label nor an unknown16"
 
         self.regs[r] = val
         if is_16bit_composed_register(r):  # sp register is not included. Special case

src/zxbasm/memory.py

@@ -229,9 +229,9 @@ def declare_label(
 
         fname = gl.FILENAME
         if label.isdecimal():  # Temporary label?
-            assert not self._tmp_labels_lines[fname] or self._tmp_labels_lines[fname][-1] <= lineno, (
-                "Temporary label out of order"
-            )
+            assert (
+                not self._tmp_labels_lines[fname] or self._tmp_labels_lines[fname][-1] <= lineno
+            ), "Temporary label out of order"
             if not self._tmp_labels_lines[fname] or self._tmp_labels_lines[fname][-1] != lineno:
                 self._tmp_labels_lines[fname].append(lineno)
 

src/zxbc/args_config.py

@@ -184,3 +184,5 @@ def set_option_defines() -> None:
 
     if OPTIONS.enable_break:
         OPTIONS.__DEFINES["__ENABLE_BREAK__"] = ""
+
+    OPTIONS.__DEFINES["__OPT_STRATEGY__"] = OPTIONS.opt_strategy

src/zxbpp/zxbpp.py

@@ -13,10 +13,11 @@
 import sys
 from dataclasses import dataclass
 from enum import Enum, unique
-from typing import Any, NamedTuple
+from typing import Any, Final, NamedTuple
 
 from src import arch
 from src.api import config, global_, utils
+from src.arch import AVAILABLE_ARCHITECTURES
 from src.ply import yacc
 from src.zxbpp import zxbasmpplex, zxbpplex
 from src.zxbpp.base_pplex import STDIN
@@ -51,6 +52,9 @@ class PreprocMode(str, Enum):
 # Default include path
 INCLUDEPATH: list[str] = ["stdlib", "runtime"]
 
+# Include paths for every arch
+INCLUDE_MAP: Final[dict[str, list[str]]] = {}
+
 # Enabled to FALSE if IFDEF failed
 ENABLED: bool = True
 
@@ -71,12 +75,12 @@ class ParentIncludingFile(NamedTuple):
 
 @dataclass
 class IncludedFileInfo:
-    once: bool  # whether this file is
+    once: bool  # whether this file is to be included only once (e.g. #pragma once)
     parents: list[ParentIncludingFile]
 
 
-# Files already includes, with a list of file, line where they were
-# included sinc a file can be included more than once.
+# Files already included, with a list of (file, line) tuples where they were
+# included, since a file can be included more than once.
 INCLUDED: dict[str, IncludedFileInfo] = {}
 
 # IFDEFS array
@@ -135,17 +139,29 @@ def init():
     reset_id_table()
 
 
-def get_include_path() -> str:
-    """Default include path using a tricky sys calls."""
+def get_include_path(arch: str = "") -> str:
+    """Default include path using a tricky sys call."""
     return os.path.realpath(
-        os.path.join(os.path.dirname(__file__), os.path.pardir, "lib", "arch", config.OPTIONS.architecture or "")
+        os.path.join(
+            os.path.dirname(__file__),
+            os.path.pardir,
+            "lib",
+            "arch",
+            arch or config.OPTIONS.architecture or "",
+        )
     )
 
 
 def set_include_path():
     global INCLUDEPATH
-    pwd = get_include_path()
-    INCLUDEPATH = [os.path.join(pwd, "stdlib"), os.path.join(pwd, "runtime")]
+
+    INCLUDE_MAP.clear()
+
+    for arch_ in AVAILABLE_ARCHITECTURES:
+        pwd = get_include_path(arch_)
+        INCLUDE_MAP[arch_] = [os.path.join(pwd, "stdlib"), os.path.join(pwd, "runtime")]
+
+    INCLUDEPATH = INCLUDE_MAP.get(config.OPTIONS.architecture, [])
 
 
 def setMode(mode: PreprocMode) -> None:
@@ -163,15 +179,17 @@ def setMode(mode: PreprocMode) -> None:
     LEXER = lexers[PreprocMode(mode)]
 
 
-def search_filename(fname: str, lineno: int, local_first: bool) -> str:
+def search_filename(fname: str, lineno: int, local_first: bool, arch: str = "") -> str:
     """Search a filename into the list of the include path.
     If local_first is true, it will try first in the current directory of
     the file being analyzed.
     """
     fname = utils.sanitize_filename(fname)
 
     assert CURRENT_DIR is not None
-    i_path: list[str] = [CURRENT_DIR] + INCLUDEPATH if local_first else list(INCLUDEPATH)
+    include_path = INCLUDE_MAP.get(arch, INCLUDEPATH)
+
+    i_path: list[str] = [CURRENT_DIR] + include_path if local_first else list(include_path)
     i_path.extend(config.OPTIONS.include_path.split(":") if config.OPTIONS.include_path else [])
 
     if os.path.isabs(fname):
@@ -187,7 +205,7 @@ def search_filename(fname: str, lineno: int, local_first: bool) -> str:
     return ""
 
 
-def include_file(filename: str, lineno: int, local_first: bool) -> str:
+def include_file(filename: str, lineno: int, local_first: bool, arch: str = "") -> str:
     """Performs a file inclusion (#include) in the preprocessor.
     Writes down that "filename" was included at the current file,
     at line <lineno>.
@@ -216,7 +234,7 @@ def include_file(filename: str, lineno: int, local_first: bool) -> str:
     return LEXER.include(filename)
 
 
-def include_once(filename: str, lineno: int, local_first: bool) -> str:
+def include_once(filename: str, lineno: int, local_first: bool, arch: str = "") -> str:
     """Performs a file inclusion (#include) in the preprocessor.
     Writes down that "filename" was included at the current file,
     at line <lineno>.
@@ -231,15 +249,12 @@ def include_once(filename: str, lineno: int, local_first: bool) -> str:
     abs_filename = search_filename(filename, lineno, local_first)
 
     if abs_filename not in INCLUDED:  # If not already included
-        return include_file(filename, lineno, local_first)  # include it and return
+        return include_file(filename, lineno, local_first, arch)  # include it and return
 
     # Now checks if the file has been included more than once
     if len(INCLUDED[abs_filename].parents) > 1:
         parent_file, lineno = INCLUDED[abs_filename].parents[0]
-        warning(
-            lineno,
-            "file '%s' already included more than once, in file '%s' at line %i" % (filename, parent_file, lineno),
-        )
+        warning(lineno, f"file '{filename}' already included more than once, in file '{parent_file}' at line {lineno}")
 
     # Empty file (already included)
     LEXER.next_token = "_ENDFILE_"
@@ -875,6 +890,7 @@ def main(argv):
         output.CURRENT_FILE.append(argv[0])
     else:
         output.CURRENT_FILE.append(global_.FILENAME)
+
     CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
     if config.OPTIONS.sinclair: