Scripts: Rename l variables and other clean-up

Rename `l` variables, rewrite two `lambda`-assigned helpers
as `def`, and clean up two `not X in Y` checks to `X not in Y`
to satisfy ruff E713, E731, E741 rules.

Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>

Author: mkannwischer

ruff.toml

@@ -15,7 +15,4 @@ extend-include = [
 select = ["E", "F", "W"]
 ignore = [
     "E501", # line too long
-    "E713", # `not in` rather than `not X in Y`
-    "E731", # lambda assignment
-    "E741", # ambiguous variable name
 ]

scripts/autogen

@@ -556,23 +556,23 @@ def adjust_preprocessor_comments_for_filename(
     # - `force_print` indicates if a comment should be omitted
     if_stack = []
 
-    def merge_escaped_lines(l, i):
-        while l.endswith("\\"):
-            l = l.removesuffix("\\").rstrip() + content[i + 1].lstrip()
+    def merge_escaped_lines(line, i):
+        while line.endswith("\\"):
+            line = line.removesuffix("\\").rstrip() + content[i + 1].lstrip()
             i = i + 1
-        return (l, i)
+        return (line, i)
 
-    def merge_commented_lines(l, i):
+    def merge_commented_lines(line, i):
         # Not very robust, but good enough
-        if not "/*" in l or "*/" in l:
-            return (l, i)
+        if "/*" not in line or "*/" in line:
+            return (line, i)
         i += 1
         while "*/" not in content[i]:
-            l += content[i]
+            line += content[i]
             i += 1
 
-        l += content[i]
-        return (l, i)
+        line += content[i]
+        return (line, i)
 
     def should_print(cur_line_no, conds, line_no, force_print):
         line_threshold = 5
@@ -631,26 +631,26 @@ def adjust_preprocessor_comments_for_filename(
 
     i = 0
     while i < len(content):
-        l = content[i].strip()
+        line = content[i].strip()
         # Replace #ifdef by #if defined(...)
-        if l.startswith("#ifdef "):
-            l = "#if defined(" + l.removeprefix("#ifdef").strip() + ")"
-        if l.startswith("#ifndef "):
-            l = "#if !defined(" + l.removeprefix("#ifndef").strip() + ")"
-        if l.startswith("#if"):
-            l, _ = merge_escaped_lines(l, i)
-            cond = l.removeprefix("#if")
+        if line.startswith("#ifdef "):
+            line = "#if defined(" + line.removeprefix("#ifdef").strip() + ")"
+        if line.startswith("#ifndef "):
+            line = "#if !defined(" + line.removeprefix("#ifndef").strip() + ")"
+        if line.startswith("#if"):
+            line, _ = merge_escaped_lines(line, i)
+            cond = line.removeprefix("#if")
             if_stack.append(([cond], i, True, False))
             new_content.append(content[i])
-        elif l.startswith("#elif"):
+        elif line.startswith("#elif"):
             conds, _, _, force_print = if_stack.pop()
-            l, _ = merge_escaped_lines(l, i)
-            conds.append(l.removeprefix("#elif"))
+            line, _ = merge_escaped_lines(line, i)
+            conds.append(line.removeprefix("#elif"))
             if_stack.append((conds, i, True, force_print))
             new_content.append(content[i])
-        elif l.startswith("#else"):
-            l, i = merge_escaped_lines(l, i)
-            _, i = merge_commented_lines(l, i)
+        elif line.startswith("#else"):
+            line, i = merge_escaped_lines(line, i)
+            _, i = merge_commented_lines(line, i)
             conds, j, branch, force_print = if_stack.pop()
             assert branch is True
             print_else = should_print(i, cond, j, force_print)
@@ -660,9 +660,9 @@ def adjust_preprocessor_comments_for_filename(
                 new_content.append(adhoc_format("#else", cond))
             else:
                 new_content.append("#else")
-        elif l.startswith("#endif"):
-            l, i = merge_escaped_lines(l, i)
-            _, i = merge_commented_lines(l, i)
+        elif line.startswith("#endif"):
+            line, i = merge_escaped_lines(line, i)
+            _, i = merge_commented_lines(line, i)
             conds, j, branch, force_print = if_stack.pop()
             print_endif = should_print(i, conds, j, force_print)
             if print_endif is False:
@@ -675,7 +675,7 @@ def adjust_preprocessor_comments_for_filename(
             # handle `#if ...` inside documentation as this would
             # lead to nested `/* ... */`.
             i_old = i
-            _, i = merge_commented_lines(l, i_old)
+            _, i = merge_commented_lines(line, i_old)
             new_content += content[i_old : i + 1]
         i += 1
 
@@ -944,12 +944,12 @@ def print_hol_light_array(g, as_int=True, entries_per_line=8, pad=0):
         c = "&" if as_int is True else ""
         return f"{prefix}{c}{n:>{pad}};"
 
-    l = list(map(format_hol_light_int, g))
+    items = list(map(format_hol_light_int, g))
     # Remove `;` from end of last entry
-    l[-1] = l[-1][:-1]
+    items[-1] = items[-1][:-1]
 
-    for i in range(0, len(l), entries_per_line):
-        yield "  " + " ".join(l[i : i + entries_per_line])
+    for i in range(0, len(items), entries_per_line):
+        yield "  " + " ".join(items[i : i + entries_per_line])
 
 
 def gen_aarch64_hol_light_zeta_file():
@@ -1200,8 +1200,8 @@ def gen_avx2_fwd_ntt_zetas():
         root_pairs = list(
             map(lambda x: gen_twiddles(layer, block_base + x, repeat), block_offsets)
         )
-        yield from (r for l in root_pairs for r in l[1])
-        yield from (r for l in root_pairs for r in l[0])
+        yield from (r for pair in root_pairs for r in pair[1])
+        yield from (r for pair in root_pairs for r in pair[0])
 
     # Layers 1 twiddle
     yield from gen_twiddles_many(0, 0, range(1), 4)
@@ -1710,11 +1710,11 @@ def print_hol_light_word64_list(g, entries_per_line=4):
     Analogous to print_hol_light_array but for int64 word lists.
     Yields lines with leading indent, semicolon-separated.
     """
-    l = [f"word 0x{v:016X}" for v in g]
+    items = [f"word 0x{v:016X}" for v in g]
 
-    for i in range(0, len(l), entries_per_line):
-        row = l[i : i + entries_per_line]
-        is_last = i + entries_per_line >= len(l)
+    for i in range(0, len(items), entries_per_line):
+        row = items[i : i + entries_per_line]
+        is_last = i + entries_per_line >= len(items)
         line = "; ".join(row)
         if not is_last:
             line += ";"
@@ -2105,8 +2105,8 @@ def get_all_files():
 
 
 def get_defines_from_file(c):
-    for l in read_file(c).split("\n"):
-        m = _RE_DEFINE.match(l)
+    for line in read_file(c).split("\n"):
+        m = _RE_DEFINE.match(line)
         if m:
             yield (c, m.group(1))
 
@@ -2143,7 +2143,9 @@ def get_checked_defines():
 
 def gen_monolithic_undef_all_core(filt=None, desc=""):
     if filt is None:
-        filt = lambda c: True
+
+        def filt(c):
+            return True
 
     if desc != "":
         yield "/*"
@@ -2655,22 +2657,22 @@ def check_macro_typos():
 def check_asm_register_aliases_for_file(filename):
     """Checks that `filename` has no mismatching or dangling register aliases"""
 
-    def get_alias_def(l):
-        s = list(filter(lambda s: s != "", l.strip().split(" ")))
+    def get_alias_def(line):
+        s = list(filter(lambda s: s != "", line.strip().split(" ")))
         if len(s) < 3 or s[1] != ".req":
             return None
         return s[0]
 
-    def get_alias_undef(l):
-        if l.strip().startswith(".unreq") is False:
+    def get_alias_undef(line):
+        if line.strip().startswith(".unreq") is False:
             return None
-        return list(filter(lambda s: s != "", l.strip().split(" ")))[1]
+        return list(filter(lambda s: s != "", line.strip().split(" ")))[1]
 
     content = read_file(filename)
     aliases = {}
-    for i, l in enumerate(content.split("\n")):
-        alias_def = get_alias_def(l)
-        alias_undef = get_alias_undef(l)
+    for i, line in enumerate(content.split("\n")):
+        alias_def = get_alias_def(line)
+        alias_undef = get_alias_undef(line)
         if alias_def is not None:
             if alias_def in aliases.keys():
                 raise Exception(
@@ -3225,7 +3227,9 @@ def synchronize_file(f, in_dir, out_dir, delete=False, no_simplify=False, **kwar
         # don't do it here, the dry-run would fail because of a
         # mismatching intermediate file
         if f.endswith(".h"):
-            transform = lambda c: adjust_header_guard_for_filename(c, outfile_full)
+
+            def transform(c):
+                return adjust_header_guard_for_filename(c, outfile_full)
         else:
             transform = None
         update_via_copy(f, outfile_full, transform=transform)
@@ -3410,8 +3414,8 @@ def adjust_header_guard_for_filename(content, header_file):
 
     # Skip over initial commentary
     insert_at = None
-    for i, l in enumerate(content):
-        if l.strip() == "" or l.startswith(("/*", " *")):
+    for i, line in enumerate(content):
+        if line.strip() == "" or line.startswith(("/*", " *")):
             continue
         insert_at = i
         break
@@ -3623,8 +3627,8 @@ def gen_markdown_citations_for(filename, bibliography):
 
     # Lookup all citations in style `[^ID]`
     citations = {}
-    for i, l in enumerate(content):
-        for m in _RE_MARKDOWN_CITE.finditer(l):
+    for i, line in enumerate(content):
+        for m in _RE_MARKDOWN_CITE.finditer(line):
             cite_id = m.group("id")
             uses = citations.get(cite_id, [])
             uses.append((filename, i))
@@ -3641,8 +3645,8 @@ def gen_markdown_citations_for(filename, bibliography):
     # Find explicit footnote definitions outside the bibliography block
     # These are lines matching `[^ID]: ...` and should be excluded from autogeneration
     explicit_footnotes = set()
-    for l in content:
-        m = re.match(r"^\[\^(\w+)\]:", l)
+    for line in content:
+        m = re.match(r"^\[\^(\w+)\]:", line)
         if m:
             explicit_footnotes.add(m.group(1))
 
@@ -3691,8 +3695,8 @@ def gen_c_citations_for(filename, bibliography):
 
     # Lookup all citations in style `@[ID]`
     citations = {}
-    for i, l in enumerate(content):
-        for m in _RE_C_CITE.finditer(l):
+    for i, line in enumerate(content):
+        for m in _RE_C_CITE.finditer(line):
             cite_id = m.group("id")
             uses = citations.get(cite_id, [])
             # Remember usage. +1 because line counting starts at 1
@@ -3742,8 +3746,8 @@ def gen_c_citations_for(filename, bibliography):
         # Add references to file after initial header section
         # Skip over copyright
         insert_at = None
-        for i, l in enumerate(content):
-            if l.startswith(("/*", " *")):
+        for i, line in enumerate(content):
+            if line.startswith(("/*", " *")):
                 continue
             insert_at = i
             break

scripts/simpasm

@@ -29,41 +29,46 @@ def patchup_disasm(asm, cfify=False):
         return lbl + ":"
 
     # Find first label
-    for i, l in enumerate(asm):
-        if decode_label(l) is not None:
+    for i, line in enumerate(asm):
+        if decode_label(line) is not None:
             break
 
     asm = asm[i + 1 :]
 
     def gen(asm):
-        for l in asm:
-            if l.strip() == "":
+        for line in asm:
+            if line.strip() == "":
                 yield ""
                 continue
-            lbl = decode_label(l)
+            lbl = decode_label(line)
             # Re-format labels as assembly labels
             if lbl is not None:
                 yield make_label(lbl)
                 continue
             # Drop comments
-            l = l.split(";")[0]
+            line = line.split(";")[0]
             # Re-format references to labels
             # Those are assumed to have the form `0xDEADBEEF <label>`
             if cfify:
-                l = re.sub(
-                    r"(0x)?[0-9a-fA-F]+\s+<(?P<label>[a-zA-Z0-9_]+)>", r"L\g<label>", l
+                line = re.sub(
+                    r"(0x)?[0-9a-fA-F]+\s+<(?P<label>[a-zA-Z0-9_]+)>",
+                    r"L\g<label>",
+                    line,
                 )
             else:
-                l = re.sub(
-                    r"(0x)?[0-9a-fA-F]+\s+<(?P<label>[a-zA-Z0-9_]+)>", r"\g<label>", l
+                line = re.sub(
+                    r"(0x)?[0-9a-fA-F]+\s+<(?P<label>[a-zA-Z0-9_]+)>",
+                    r"\g<label>",
+                    line,
                 )
             # Drop address and byte code from line
             d = re.search(
-                r"^\s*[0-9a-fA-F]+:\s+([0-9a-fA-F][0-9a-fA-F][ ]*)+\s+(?P<inst>.*)$", l
+                r"^\s*[0-9a-fA-F]+:\s+([0-9a-fA-F][0-9a-fA-F][ ]*)+\s+(?P<inst>.*)$",
+                line,
             )
             if d is None:
                 raise Exception(
-                    f'The following does not seem to be an assembly line of the expected format `ADDRESS: BYTECODE INSTRUCTION`:\n"{l}"'
+                    f'The following does not seem to be an assembly line of the expected format `ADDRESS: BYTECODE INSTRUCTION`:\n"{line}"'
                 )
             yield " " * indentation + d.group("inst").expandtabs(1)
 
@@ -76,8 +81,8 @@ def find_header_footer(asm, filename):
 
     # Extract header
     header_end = None
-    for i, l in enumerate(asm):
-        if header_end_marker in l:
+    for i, line in enumerate(asm):
+        if header_end_marker in line:
             header_end = i
             break
     if header_end is None:
@@ -88,8 +93,8 @@ def find_header_footer(asm, filename):
 
     # Extract footer
     footer_start = None
-    for i, l in enumerate(asm):
-        if footer_start_marker in l:
+    for i, line in enumerate(asm):
+        if footer_start_marker in line:
             footer_start = i
             break
     if footer_start is None:
@@ -105,8 +110,8 @@ def find_header_footer(asm, filename):
 
 def find_globals(asm):
     global_symbols = []
-    for l in asm:
-        r = re.search(r"^\s*\.global\s+(.*)$", l)
+    for line in asm:
+        r = re.search(r"^\s*\.global\s+(.*)$", line)
         if r is None:
             continue
         global_symbols.append(r.group(1))
@@ -121,9 +126,9 @@ def drop_if_from_header(header):
     header_new = []
     i = 0
     while i < len(header):
-        l = header[i]
-        if not l.strip().startswith("#if"):
-            header_new.append(l)
+        line = header[i]
+        if not line.strip().startswith("#if"):
+            header_new.append(line)
             i += 1
             continue
         header_new.append("#if 1")
@@ -138,9 +143,9 @@ def drop_preprocessor_directives(header):
     header_new = []
     i = 0
     while i < len(header):
-        l = header[i]
-        if not l.strip().startswith("#"):
-            header_new.append(l)
+        line = header[i]
+        if not line.strip().startswith("#"):
+            header_new.append(line)
             i += 1
             continue
         while i < len(header) and header[i].endswith("\\"):