Tidy up

Author: markshannon

Tools/cases_generator/generators_common.py

@@ -285,7 +285,9 @@ def kill(
                 var.defined = False
                 break
         else:
-            raise analysis_error(f"'{name}' is not a live input-only variable", name_tkn)
+            raise analysis_error(
+                f"'{name}' is not a live input-only variable", name_tkn
+            )
         return True
 
     def stackref_kill(
@@ -328,7 +330,7 @@ def stackref_close_specialized(
         self.out.emit(comma)
         dealloc = next(tkn_iter)
         if dealloc.kind != "IDENTIFIER":
-             raise analysis_error("Expected identifier", dealloc)
+            raise analysis_error("Expected identifier", dealloc)
         self.out.emit(dealloc)
         if name.kind == "IDENTIFIER":
             escapes = dealloc.text not in NON_ESCAPING_DEALLOCS
@@ -391,7 +393,6 @@ def goto_label(self, goto: Token, label: Token, storage: Storage) -> None:
             print(self.labels.keys())
             raise analysis_error(f"Label '{label.text}' does not exist", label)
         label_node = self.labels[label.text]
-        saved = False
         if label_node.spilled:
             if not storage.spilled:
                 self.emit_save(storage)
@@ -503,7 +504,7 @@ def _emit_if(
                 self.emit(next(tkn_iter))
                 maybe_if = tkn_iter.peek()
                 if maybe_if and maybe_if.kind == "IF":
-                    #Emit extra braces around the if to get scoping right
+                    # Emit extra braces around the if to get scoping right
                     self.emit(" {\n")
                     self.emit(next(tkn_iter))
                     else_reachable, rbrace, else_storage = self._emit_if(tkn_iter, uop, storage, inst)
@@ -617,7 +618,7 @@ def _emit_block(
                 else:
                     self.out.emit(tkn)
         except StackError as ex:
-            raise analysis_error(ex.args[0], tkn) # from None
+            raise analysis_error(ex.args[0], tkn) from None
         raise analysis_error("Expecting closing brace. Reached end of file", tkn)
 
     def emit_tokens(

Tools/cases_generator/stack.py

@@ -520,7 +520,6 @@ def save(self, out: CWriter) -> None:
             out.emit_spill()
         self.spilled += 1
 
-
     def save_inputs(self, out: CWriter) -> None:
         assert self.spilled >= 0
         if self.spilled == 0:
@@ -647,10 +646,9 @@ def as_comment(self) -> str:
         peeks = ", ".join([var.name for var in self.peeks])
         return f"{stack_comment[:-2]}{next_line}inputs: {inputs}{next_line}outputs: {outputs}{next_line}peeks: {peeks} */"
 
-
     def close_inputs(self, out: CWriter) -> None:
         tmp_defined = False
-        def close_var(close: str, name: str, overwrite: str) -> None:
+        def close_named(close: str, name: str, overwrite: str) -> None:
             nonlocal tmp_defined
             if overwrite:
                 if not tmp_defined:
@@ -672,18 +670,18 @@ def close_variable(var: Local, overwrite: str) -> None:
                 close = "PyStackRef_XCLOSE"
             if var.size:
                 if var.size == "1":
-                    close_var(close, f"{var.name}[0]", overwrite)
+                    close_named(close, f"{var.name}[0]", overwrite)
                 else:
                     if overwrite and not tmp_defined:
                         out.emit("_PyStackRef tmp;\n")
                         tmp_defined = True
                     out.emit(f"for (int _i = {var.size}; --_i >= 0;) {{\n")
-                    close_var(close, f"{var.name}[_i]", overwrite)
+                    close_named(close, f"{var.name}[_i]", overwrite)
                     out.emit("}\n")
             else:
                 if var.condition and var.condition == "0":
                     return
-                close_var(close, var.name, overwrite)
+                close_named(close, var.name, overwrite)
 
         self.clear_dead_inputs()
         if not self.inputs: