Merge pull request boriel-basic#660 from boriel/refact/refact_code

Refact/refact code

src/api/global_.py

@@ -8,11 +8,12 @@
 # This program is Free Software and is released under the terms of
 #                    the GNU General License
 # ----------------------------------------------------------------------
-from typing import Dict, List, NamedTuple, Optional, Set
+from typing import Dict, List, NamedTuple, Optional, Set, Final
 
 from src.api.constants import TYPE, LoopType
 from src.api.opcodestemps import OpcodesTemps
 
+
 # ----------------------------------------------------------------------
 # Simple global container for internal constants.
 # Internal constants might be architecture dependant. They're set
@@ -117,34 +118,34 @@ class LoopInfo(NamedTuple):
 # ----------------------------------------------------------------------
 # Data type used for elements size. Must be an integral
 # ----------------------------------------------------------------------
-SIZE_TYPE: TYPE = TYPE.ubyte
+SIZE_TYPE: Final[TYPE] = TYPE.ubyte
 
 # ----------------------------------------------------------------------
 # CORE namespace (for core runtime library, like FP Calc)
 # ----------------------------------------------------------------------
-CORE_NAMESPACE = ".core"
+CORE_NAMESPACE: Final[str] = ".core"
 
 # ----------------------------------------------------------------------
 # DATA Labels namespace
 # ----------------------------------------------------------------------
-DATAS_NAMESPACE = ".DATA"
+DATAS_NAMESPACE: Final[str] = ".DATA"
 
 # ----------------------------------------------------------------------
 # LABEL Labels namespace
 # ----------------------------------------------------------------------
-LABELS_NAMESPACE = ".LABEL"  # *MUST* start with a DOT (.)
+LABELS_NAMESPACE: Final[str] = ".LABEL"  # *MUST* start with a DOT (.)
 
 # ----------------------------------------------------------------------
 # USER DATA LABELS
 # ----------------------------------------------------------------------
-ZXBASIC_USER_DATA = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA"
-ZXBASIC_USER_DATA_LEN = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA_LEN"
+ZXBASIC_USER_DATA: Final[str] = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA"
+ZXBASIC_USER_DATA_LEN: Final[str] = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA_LEN"
 
 
 # ----------------------------------------------------------------------
 # Data Type used for string chars index. Must be an integral
 # ----------------------------------------------------------------------
-STR_INDEX_TYPE: TYPE = TYPE.uinteger
+STR_INDEX_TYPE: Final[TYPE] = TYPE.uinteger
 
 # ----------------------------------------------------------------------
 # MIN and MAX str slice index
@@ -160,18 +161,18 @@ class LoopInfo(NamedTuple):
 # ----------------------------------------------------------------------
 # Character used for name mangling. Usually '_' or '.'
 # ----------------------------------------------------------------------
-MANGLE_CHR = "_"
-NAMESPACE_SEPARATOR = "."
+MANGLE_CHR: Final[str] = "_"
+NAMESPACE_SEPARATOR: Final[str] = "."
 
 # ----------------------------------------------------------------------
 # Prefix used in labels to mark the beginning of array data
 # ----------------------------------------------------------------------
-ARRAY_DATA_PREFIX = "__DATA__"
+ARRAY_DATA_PREFIX: Final[str] = "__DATA__"
 
 # ----------------------------------------------------------------------
 # Default optimization level
 # ----------------------------------------------------------------------
-DEFAULT_OPTIMIZATION_LEVEL = 2  # Optimization level. Higher -> more optimized
+DEFAULT_OPTIMIZATION_LEVEL: Final[int] = 2  # Optimization level. Higher -> more optimized
 
 # ----------------------------------------------------------------------
 # DATA blocks

src/arch/z80/optimizer/__init__.py

@@ -1 +1,3 @@
 from .main import init, optimize
+
+__all__ = "init", "optimize"

src/arch/z80/optimizer/helpers.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from typing import Optional, TypeVar
+from typing import TypeVar, Any, Iterable
 
 from . import common, patterns
 
@@ -60,7 +60,7 @@ def new_tmp_val16_from_label(label: str) -> str:
     return f"{UNKNOWN_PREFIX}H_{label}{HL_SEP}{UNKNOWN_PREFIX}L_{label}"
 
 
-def is_unknown(x) -> bool:
+def is_unknown(x: int | str | None) -> bool:
     if x is None:
         return True
 
@@ -75,7 +75,7 @@ def is_unknown(x) -> bool:
     return any(x.startswith(UNKNOWN_PREFIX) for x in xx)
 
 
-def is_unknown8(x) -> bool:
+def is_unknown8(x: Any) -> bool:
     if x is None:
         return True
 
@@ -85,7 +85,7 @@ def is_unknown8(x) -> bool:
     return len(x.split(HL_SEP)) == 1
 
 
-def is_unknown16(x) -> bool:
+def is_unknown16(x: Any) -> bool:
     if x is None:
         return True
 
@@ -95,7 +95,7 @@ def is_unknown16(x) -> bool:
     return len(x.split(HL_SEP)) == 2
 
 
-def get_orig_label_from_unknown16(x: str) -> Optional[str]:
+def get_orig_label_from_unknown16(x: str) -> str | None:
     if not is_unknown16(x):
         return None
 
@@ -114,33 +114,33 @@ def get_orig_label_from_unknown16(x: str) -> Optional[str]:
     return None if hi != lo else hi
 
 
-def get_L_from_unknown_value(tmp_val):
+def get_L_from_unknown_value(tmp_val: str) -> str:
     """Given a 16bit *UNKNOWN value, returns it's lower part, which is the same 2nd part,
     after splitting by HL_SEP. If the parameter is None, a new tmp_value will be generated.
     If the value is a composed one (xxxH | yyyL) returns yyyL.
     """
-    assert is_unknown(tmp_val), "Malformed unknown value '{}'".format(tmp_val)
+    assert is_unknown(tmp_val), f"Malformed unknown value '{tmp_val}'"
 
     if tmp_val is None:
         tmp_val = new_tmp_val16()
 
     return tmp_val.split(HL_SEP)[-1]
 
 
-def get_H_from_unknown_value(tmp_val):
+def get_H_from_unknown_value(tmp_val: str) -> str:
     """Given a 16bit *UNKNOWN value, returns it's higher part, which is the same 1st part,
     after splitting by HL_SEP. If the parameter is None, a new tmp_value will be generated.
     If the value is a composed one (xxxH | yyyL) returns yyyH.
     """
-    assert is_unknown(tmp_val), "Malformed unknown value '{}'".format(tmp_val)
+    assert is_unknown(tmp_val), f"Malformed unknown value '{tmp_val}'"
 
     if tmp_val is None:
         tmp_val = new_tmp_val16()
 
     return tmp_val.split(HL_SEP)[0]
 
 
-def is_mem_access(arg):
+def is_mem_access(arg: str) -> bool:
     """Returns if a given string is a memory access, that is
     if it matches the form (...)
     """
@@ -149,7 +149,7 @@ def is_mem_access(arg):
 
 
 # TODO: to be rewritten
-def is_number(x) -> bool:
+def is_number(x: Any) -> bool:
     """Returns whether X is a numeric representation"""
     if x is None or x == "":
         return False
@@ -167,21 +167,17 @@ def is_number(x) -> bool:
         tmp = eval(x, {}, {})
         if isinstance(tmp, (int, float)):
             return True
-    except NameError:
-        pass
-    except SyntaxError:
-        pass
-    except ValueError:
+    except (Exception,):
         pass
 
     return patterns.RE_NUMBER.match(str(x)) is not None
 
 
-def is_label(x) -> bool:
+def is_label(x: Any) -> bool:
     return str(x)[:1] in "._"
 
 
-def valnum(x):
+def valnum(x: Any) -> int | None:
     """If x is a numeric value (int, float) or it's a string
     representation of a number (hexa, binary), returns it numeric value.
     Otherwise returns None
@@ -206,7 +202,7 @@ def valnum(x):
     return int(eval(x, {}, {}))
 
 
-def simplify_arg(arg):
+def simplify_arg(arg: str) -> str:
     """Given an asm operand (str), if it can be evaluated to a single 16 bit integer number it will be done so.
     Memory addresses will preserve their parenthesis. If the string can not be simplified, it will be
     returned as is.
@@ -240,10 +236,10 @@ def simplify_arg(arg):
     if not is_mem_access(arg):
         return result
 
-    return "({})".format(result)
+    return f"({result})"
 
 
-def simplify_asm_args(asm):
+def simplify_asm_args(asm: str) -> str:
     """Given an asm instruction try to simplify its args."""
     chunks = [x for x in asm.split(" ", 1)]
     if len(chunks) != 2:
@@ -253,36 +249,36 @@ def simplify_asm_args(asm):
     return "{} {}".format(chunks[0], ", ".join(args))
 
 
-def is_register(x):
-    """True if x is a register."""
+def is_register(x: Any) -> bool:
+    """True if x is a register in a str."""
     if not isinstance(x, str):
         return False
 
     return x.lower() in REGS_OPER_SET
 
 
-def is_8bit_normal_register(x):
+def is_8bit_normal_register(x: str) -> bool:
     """Returns whether the given string x is a "normal" 8 bit register. Those are 8 bit registers
     which belongs to the normal (documented) Z80 instruction set as operands (so a', f', ixh, etc
     are excluded).
     """
     return x.lower() in {"a", "b", "c", "d", "e", "i", "h", "l"}
 
 
-def is_8bit_idx_register(x):
+def is_8bit_idx_register(x: str) -> bool:
     """Returns whether the given string x one of the undocumented IX, IY 8 bit registers."""
     return x.lower() in {"ixh", "ixl", "iyh", "iyl"}
 
 
-def is_8bit_oper_register(x):
+def is_8bit_oper_register(x: str) -> bool:
     """Returns whether the given string x is an 8 bit register that can be used as an
     instruction operand. This included those of the undocumented Z80 instruction set as
     operands (ixh, ixl, etc) but not h', f'.
     """
     return x.lower() in {"a", "b", "c", "d", "e", "i", "h", "l", "ixh", "ixl", "iyh", "iyl"}
 
 
-def is_16bit_normal_register(x):
+def is_16bit_normal_register(x: str) -> bool:
     """Returns whether the given string x is a "normal" 16 bit register. Those are 16 bit registers
     which belongs to the normal (documented) Z80 instruction set as operands which can be operated
     directly (i.e. load a value directly), and not for indexation (IX + n, for example).
@@ -291,24 +287,24 @@ def is_16bit_normal_register(x):
     return x.lower() in {"bc", "de", "hl"}
 
 
-def is_16bit_idx_register(x):
+def is_16bit_idx_register(x: str) -> bool:
     """Returns whether the given string x is a indexable (i.e. IX + n) 16 bit register."""
     return x.lower() in {"ix", "iy"}
 
 
-def is_16bit_composed_register(x):
+def is_16bit_composed_register(x: str) -> bool:
     """A 16bit register that can be decomposed into a high H16 and low L16 part"""
     return x.lower() in {"af", "af'", "bc", "de", "hl", "ix", "iy"}
 
 
-def is_16bit_oper_register(x):
+def is_16bit_oper_register(x: str) -> bool:
     """Returns whether the given string x is a 16 bit register. These are any 16 bit register
     which belongs to the normal (documented) Z80 instruction set as operands.
     """
     return x.lower() in {"af", "af'", "bc", "de", "hl", "ix", "iy", "sp"}
 
 
-def LO16(x):
+def LO16(x: str) -> str:
     """Given a 16-bit register (lowercase string), returns the low 8 bit register of it.
     The string *must* be a 16 bit lowercase register. SP register is not "decomposable" as
     two 8-bit registers and this is considered an error.
@@ -323,7 +319,7 @@ def LO16(x):
     return x[1] + ("'" if "'" in x else "")
 
 
-def HI16(x):
+def HI16(x: str) -> str:
     """Given a 16-bit register (lowercase string), returns the high 8 bit register of it.
     The string *must* be a 16 bit lowercase register. SP register is not "decomposable" as
     two 8-bit registers and this is considered an error.
@@ -338,7 +334,7 @@ def HI16(x):
     return x[0] + ("'" if "'" in x else "")
 
 
-def single_registers(op):
+def single_registers(op: str | Iterable[str]) -> list[str]:
     """Given an iterable (set, list) of registers like ['a', 'bc', "af'", 'h', 'hl'] returns
     a list of single registers: ['a', "a'", "f'", 'b', 'c', 'h', 'l'].
     Non register parameters (like numbers) will be ignored.
@@ -348,7 +344,7 @@ def single_registers(op):
         - IX and IY will be returned as {'ixh', 'ixl'} and {'iyh', 'iyl'} respectively
     """
     result = set()
-    if not isinstance(op, (list, set)):
+    if isinstance(op, str):
         op = [op]
 
     for x in op:
@@ -362,7 +358,7 @@ def single_registers(op):
     return sorted(result)
 
 
-def idx_args(x):
+def idx_args(x: str) -> tuple[str, str, str] | None:
     """Given an argument x (string), returns None if it's not an index operation "ix/iy + n"
     Otherwise return a tuple (reg, oper, offset). It's case insensitive and the register is always returned
     in lowercase.
@@ -381,7 +377,7 @@ def idx_args(x):
     return reg.lower(), sign, args
 
 
-def LO16_val(x):
+def LO16_val(x: int | str | None) -> str:
     """Given an x value, it must be None, unknown, or an integer.
     Then returns it lower part. If it's none, a new tmp will be returned.
     """
@@ -397,7 +393,7 @@ def LO16_val(x):
     return x.split(HL_SEP)[-1]
 
 
-def HI16_val(x):
+def HI16_val(x: int | str | None) -> str:
     """Given an x value, it must be None, unknown, or an integer.
     Then returns it upper part. If it's None, a new tmp will be returned.
     It it's an unknown8, return 0, because it's considered an 8 bit value.

src/arch/z80/translator.py

@@ -26,7 +26,7 @@
 from src.symbols.id_ import ref
 from src.symbols.type_ import Type
 
-__all__ = ["Translator", "VarTranslator", "FunctionTranslator"]
+__all__ = "Translator", "VarTranslator", "FunctionTranslator"
 
 LabelledData = namedtuple("LabelledData", ("label", "data"))
 

src/arch/zx48k/backend/__init__.py

@@ -18,7 +18,7 @@
     emit_start,
 )
 
-__all__ = [
+__all__ = (
     "_fpop",
     "HI16",
     "INITS",
@@ -32,7 +32,7 @@
     "emit",
     "emit_end",
     "emit_start",
-]
+)
 
 
 # ZXNext asm enabled by default for this arch

tests/arch/zx48k/optimizer/test_helpers.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import src.arch.z80.optimizer.helpers as helpers
+from src.arch.z80.optimizer import helpers
 
 
 def test_new_tmp_val():