Merge branch 'lukeshu/qa'

1 files changed, 53 insertions, 45 deletions

diff --git a/build-aux/stack.c.gen b/build-aux/stack.c.gen
index a8a971e..5a983cb 100755
--- a/build-aux/stack.c.gen
+++ b/build-aux/stack.c.gen
@@ -89,6 +89,10 @@ def parse_vcg(reader: typing.TextIO) -> typing.Iterator[VCGElem]:
             elem.attrs[k] = v
             pos = m.end()
 
+        del _raise
+        del pos
+        del line
+        del lineno
         yield elem
 
 
@@ -130,7 +134,9 @@ class QName:
         return self._content
 
     def __eq__(self, other: typing.Any) -> bool:
-        assert isinstance(other, QName)
+        assert isinstance(
+            other, QName
+        ), f"comparing QName with {other.__class__.__name__}"
         return self._content == other._content
 
     def __lt__(self, other: "QName") -> bool:
@@ -160,7 +166,7 @@ class Node:
 
 
 def synthetic_node(
-    name: str, nstatic: int, calls: typing.Collection[str] = set()
+    name: str, nstatic: int, calls: typing.Collection[str] = frozenset()
 ) -> Node:
     n = Node()
 
@@ -198,7 +204,7 @@ class Application(typing.Protocol):
     def indirect_callees(
         self, elem: VCGElem
     ) -> tuple[typing.Collection[QName], bool]: ...
-    def skip_call(self, chain: list[QName], funcname: QName) -> bool: ...
+    def skip_call(self, chain: typing.Sequence[QName], funcname: QName) -> bool: ...
 
 
 def analyze(
@@ -217,8 +223,8 @@ def analyze(
         flags=re.MULTILINE,
     )
 
-    graph: dict[QName, Node] = dict()
-    qualified: dict[BaseName, set[QName]] = dict()
+    graph: dict[QName, Node] = {}
+    qualified: dict[BaseName, set[QName]] = {}
 
     def handle_elem(elem: VCGElem) -> None:
         match elem.typ:
@@ -286,7 +292,7 @@ def analyze(
                 raise ValueError(f"unknown elem type {repr(elem.typ)}")
 
     for ci_fname in ci_fnames:
-        with open(ci_fname, "r") as fh:
+        with open(ci_fname, "r", encoding="utf-8") as fh:
             for elem in parse_vcg(fh):
                 handle_elem(elem)
 
@@ -327,7 +333,9 @@ def analyze(
     track_inclusion: bool = True
 
     def nstatic(
-        orig_funcname: QName, chain: list[QName] = [], missing_ok: bool = False
+        orig_funcname: QName,
+        chain: typing.Sequence[QName] = (),
+        missing_ok: bool = False,
     ) -> int:
         nonlocal dbg
         nonlocal track_inclusion
@@ -348,7 +356,7 @@ def analyze(
             return 0
 
         if len(chain) == cfg_max_call_depth:
-            raise ValueError(f"max call depth exceeded: {chain+[funcname]}")
+            raise ValueError(f"max call depth exceeded: {[*chain, funcname]}")
 
         node = graph[funcname]
         if dbg:
@@ -361,13 +369,13 @@ def analyze(
             [
                 0,
                 *[
-                    nstatic(call, chain + [funcname], missing_ok)
+                    nstatic(call, [*chain, funcname], missing_ok)
                     for call, missing_ok in node.calls.items()
                 ],
             ]
         )
 
-    groups: dict[str, AnalyzeResultGroup] = dict()
+    groups: dict[str, AnalyzeResultGroup] = {}
     for grp_name, grp_filter in app_func_filters.items():
         rows: dict[QName, AnalyzeResultVal] = {}
         for funcname in graph:
@@ -393,7 +401,7 @@ def read_source(location: str) -> str:
     filename = m.group("filename")
     row = int(m.group("row")) - 1
     col = int(m.group("col")) - 1
-    with open(m.group("filename"), "r") as fh:
+    with open(filename, "r", encoding="utf-8") as fh:
         return fh.readlines()[row][col:].rstrip()
 
 
@@ -428,7 +436,7 @@ class Plugin(typing.Protocol):
     def indirect_callees(
         self, loc: str, line: str
     ) -> tuple[typing.Collection[QName], bool] | None: ...
-    def skip_call(self, chain: list[QName], call: QName) -> bool: ...
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool: ...
 
 
 class PluginApplication:
@@ -462,7 +470,7 @@ class PluginApplication:
         placeholder += " at " + self._location_xform(elem.attrs.get("label", ""))
         return [QName(placeholder)], False
 
-    def skip_call(self, chain: list[QName], funcname: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], funcname: QName) -> bool:
         for plugin in self._plugins:
             if plugin.skip_call(chain, funcname):
                 return True
@@ -497,7 +505,7 @@ class CmdPlugin:
             return [QName("get_root")], False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -511,7 +519,7 @@ class LibObjPlugin:
         re_lo_iface = re.compile(r"^\s*#\s*define\s+(?P<name>\S+)_LO_IFACE")
         re_lo_func = re.compile(r"LO_FUNC *\([^,]*, *(?P<name>[^,) ]+) *[,)]")
         for fname in arg_c_fnames:
-            with open(fname, "r") as fh:
+            with open(fname, "r", encoding="utf-8") as fh:
                 while line := fh.readline():
                     if m := re_lo_iface.match(line):
                         iface_name = m.group("name")
@@ -532,16 +540,16 @@ class LibObjPlugin:
             r"^LO_IMPLEMENTATION_[HC]\s*\(\s*(?P<iface>[^, ]+)\s*,\s*(?P<impl_typ>[^,]+)\s*,\s*(?P<impl_name>[^, ]+)\s*[,)].*"
         )
         for fname in arg_c_fnames:
-            with open(fname, "r") as fh:
+            with open(fname, "r", encoding="utf-8") as fh:
                 for line in fh:
                     line = line.strip()
                     if m := re_lo_implementation.match(line):
                         implementations[m.group("iface")].add(m.group("impl_name"))
 
         objcalls: dict[str, set[QName]] = {}  # method_name => {method_impls}
-        for iface_name in ifaces:
-            for method_name in ifaces[iface_name]:
-                if QName(method_name) not in objcalls:
+        for iface_name, iface in ifaces.items():
+            for method_name in iface:
+                if method_name not in objcalls:
                     objcalls[method_name] = set()
                 for impl_name in implementations[iface_name]:
                     objcalls[method_name].add(QName(impl_name + "_" + method_name))
@@ -574,7 +582,7 @@ class LibObjPlugin:
             ], False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -643,7 +651,7 @@ class LibHWPlugin:
             ], False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -665,7 +673,7 @@ class LibCRPlugin:
     ) -> tuple[typing.Collection[QName], bool] | None:
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -694,7 +702,7 @@ class LibCRIPCPlugin:
             ], False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -730,7 +738,7 @@ class Lib9PPlugin:
 
         def config_h_get(varname: str) -> int | None:
             if config_h_fname:
-                with open(config_h_fname, "r") as fh:
+                with open(config_h_fname, "r", encoding="utf-8") as fh:
                     for line in fh:
                         line = line.rstrip()
                         if line.startswith("#define"):
@@ -751,7 +759,7 @@ class Lib9PPlugin:
                 r"^\s*\[LIB9P_TYP_T[^]]+\]\s*=\s*\(tmessage_handler\)\s*(?P<handler>\S+),\s*$"
             )
             tmessage_handlers = set()
-            with open(lib9p_srv_c_fname, "r") as fh:
+            with open(lib9p_srv_c_fname, "r", encoding="utf-8") as fh:
                 for line in fh:
                     line = line.rstrip()
                     if m := re_tmessage_handler.fullmatch(line):
@@ -761,7 +769,7 @@ class Lib9PPlugin:
         lib9p_msgs: set[str] = set()
         if lib9p_generated_c_fname:
             re_lib9p_msg_entry = re.compile(r"^\s*_MSG_(?:[A-Z]+)\((?P<typ>\S+)\),$")
-            with open(lib9p_generated_c_fname, "r") as fh:
+            with open(lib9p_generated_c_fname, "r", encoding="utf-8") as fh:
                 for line in fh:
                     line = line.rstrip()
                     if m := re_lib9p_msg_entry.fullmatch(line):
@@ -774,7 +782,7 @@ class Lib9PPlugin:
         assert self.CONFIG_9P_SRV_MAX_REQS
         if "read" in str(name.base()):
             return self._CONFIG_9P_NUM_SOCKS
-        elif "write" in str(name.base()):
+        if "write" in str(name.base()):
             return self._CONFIG_9P_NUM_SOCKS * self.CONFIG_9P_SRV_MAX_REQS
         return 1
 
@@ -809,7 +817,7 @@ class Lib9PPlugin:
                     return [QName(f"{meth}_{msg}") for msg in self.lib9p_msgs], True
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         if "lib9p/srv.c:srv_util_pathfree" in str(call):
             assert isinstance(self.CONFIG_9P_SRV_MAX_DEPTH, int)
             if len(chain) >= self.CONFIG_9P_SRV_MAX_DEPTH and all(
@@ -848,7 +856,7 @@ class LibMiscPlugin:
     ) -> tuple[typing.Collection[QName], bool] | None:
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         if (
             len(chain) > 1
             and str(chain[-1].base()) == "__assert_msg_fail"
@@ -902,7 +910,7 @@ class PicoFmtPlugin:
                 return [QName(x) for x in self.known_fct.values()], False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         if str(call.base()) in self.known_out.values():
             out = ""
             for pcall in chain:
@@ -1028,7 +1036,7 @@ class PicoSDKPlugin:
             return self.app_preinit_array, False
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
     def extra_nodes(self) -> typing.Collection[Node]:
@@ -1182,7 +1190,7 @@ class TinyUSBDevicePlugin:
             r"^\s*#\s*define\s+(?P<k>CFG_TUD_(?:\S{3}|AUDIO|VIDEO|MIDI|VENDOR|USBTMC|DFU_RUNTIME|ECM_RNDIS))\s+(?P<v>\S+).*"
         )
         tusb_config: dict[str, bool] = {}
-        with open(tusb_config_h_fname, "r") as fh:
+        with open(tusb_config_h_fname, "r", encoding="utf-8") as fh:
             in_table = False
             for line in fh:
                 line = line.rstrip()
@@ -1198,7 +1206,7 @@ class TinyUSBDevicePlugin:
         re_tud_if1 = re.compile(r"^\s*#\s*if (\S+)\s*")
         re_tud_if2 = re.compile(r"^\s*#\s*if (\S+)\s*\|\|\s*(\S+)\s*")
         re_tud_endif = re.compile(r"^\s*#\s*endif\s*")
-        with open(usbd_c_fname, "r") as fh:
+        with open(usbd_c_fname, "r", encoding="utf-8") as fh:
             in_table = False
             enabled = True
             for line in fh:
@@ -1251,15 +1259,15 @@ class TinyUSBDevicePlugin:
                 QName("tud_vendor_control_xfer_cb"),
                 *sorted(self.tud_drivers["control_xfer_cb"]),
             ], False
-        elif call.startswith("driver->"):
+        if call.startswith("driver->"):
             return sorted(self.tud_drivers[call[len("driver->") :]]), False
-        elif call == "event.func_call.func":
+        if call == "event.func_call.func":
             # callback from usb_defer_func()
             return [], False
 
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -1326,7 +1334,7 @@ class NewlibPlugin:
     ) -> tuple[typing.Collection[QName], bool] | None:
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -1356,7 +1364,7 @@ class LibGCCPlugin:
     ) -> tuple[typing.Collection[QName], bool] | None:
         return None
 
-    def skip_call(self, chain: list[QName], call: QName) -> bool:
+    def skip_call(self, chain: typing.Sequence[QName], call: QName) -> bool:
         return False
 
 
@@ -1514,20 +1522,20 @@ def main(
         size: int
 
     rows: list[CrRow] = []
-    main: CrRow | None = None
+    mainrow: CrRow | None = None
     for funcname, val in result.groups["Threads"].rows.items():
         name = str(funcname.base())
         base = val.nstatic
         size = base + intrstack
         if name in ("main", "_entry_point"):
-            main = CrRow(name=name, cnt=1, base=base, size=size)
+            mainrow = CrRow(name=name, cnt=1, base=base, size=size)
         else:
             size = next_power_of_2(size + stack_guard_size) - stack_guard_size
             rows.append(CrRow(name=name, cnt=val.cnt, base=base, size=size))
     namelen = max(len(r.name) for r in rows)
     baselen = max(len(str(r.base)) for r in rows)
     sizesum = sum(r.cnt * (r.size + stack_guard_size) for r in rows)
-    sizelen = len(str(max(sizesum, main.size if main else 0)))
+    sizelen = len(str(max(sizesum, mainrow.size if mainrow else 0)))
 
     def print_row(comment: bool, name: str, size: int, eqn: str | None = None) -> None:
         prefix = "const size_t CONFIG_COROUTINE_STACK_SIZE_"
@@ -1552,12 +1560,12 @@ def main(
             f"LM_NEXT_POWER_OF_2({str(row.base).rjust(baselen)}+{intrstack}+{stack_guard_size})-{stack_guard_size}",
         )
     print_row(True, "TOTAL (inc. stack guard)", sizesum)
-    if main:
+    if mainrow:
         print_row(
             True,
             "MAIN/KERNEL",
-            main.size,
-            f"                   {str(main.base).rjust(baselen)}+{intrstack}",
+            mainrow.size,
+            f"                   {str(mainrow.base).rjust(baselen)}+{intrstack}",
         )
     print()
     print("/*")
@@ -1592,7 +1600,7 @@ if __name__ == "__main__":
         for obj_fname in obj_fnames:
             if re_c_obj_suffix.search(obj_fname):
                 ci_fnames.add(re_c_obj_suffix.sub(".c.ci", obj_fname))
-                with open(obj_fname + ".d", "r") as fh:
+                with open(obj_fname + ".d", "r", encoding="utf-8") as fh:
                     c_fnames.update(
                         fh.read().replace("\\\n", " ").split(":")[-1].split()
                     )