Tweak formatting of code directly after C macros

Author: markshannon

Python/executor_cases.c.h

@@ -29,8 +29,12 @@ class Properties:
     needs_prev: bool = False
 
     def dump(self, indent: str) -> None:
-        print(indent, end="")
-        text = ", ".join([f"{key}: {value}" for (key, value) in self.__dict__.items()])
+        simple_properties = self.__dict__.copy()
+        del simple_properties["escaping_calls"]
+        text = "escaping_calls:\n"
+        for tkns in self.escaping_calls.values():
+            text += f"{indent}    {tkns}\n"
+        text += ", ".join([f"{key}: {value}" for (key, value) in simple_properties.items()])
         print(indent, text, sep="")
 
     @staticmethod
@@ -605,6 +609,10 @@ def has_error_without_pop(op: parser.InstDef) -> bool:
     "_Py_DECREF_NO_DEALLOC",
     "assert",
     "backoff_counter_triggers",
+    "initial_temperature_backoff_counter",
+    "advance_backoff_counter",
+    "restart_backoff_counter",
+    "_PyCode_CODE",
 )
 
 def find_stmt_start(node: parser.InstDef, idx: int) -> lexer.Token:

Python/generated_cases.c.h

@@ -18,8 +18,9 @@ def __init__(self, out: TextIO, indent: int, line_directives: bool):
 
     def set_position(self, tkn: Token) -> None:
         if self.last_token is not None:
-            if self.last_token.line < tkn.line:
+            if self.last_token.end_line < tkn.line:
                 self.out.write("\n")
+            if self.last_token.line < tkn.line:
                 if self.line_directives:
                     self.out.write(f'#line {tkn.line} "{tkn.filename}"\n')
                 self.out.write(" " * self.indents[-1])
@@ -91,6 +92,8 @@ def emit_token(self, tkn: Token) -> None:
         self.maybe_dedent(tkn.text)
         self.set_position(tkn)
         self.emit_text(tkn.text)
+        if tkn.kind == "CMACRO":
+            self.newline = True
         self.maybe_indent(tkn.text)
 
     def emit_str(self, txt: str) -> None:

Tools/cases_generator/analyzer.py

@@ -312,8 +312,6 @@ def tokenize(src: str, line: int = 1, filename: str = "") -> Iterator[Token]:
             kind = CHARACTER
         elif text[0] == "#":
             kind = CMACRO
-            linestart = start
-            line += 1
         elif text[0] == "/" and text[1] in "/*":
             kind = COMMENT
         else:
@@ -335,6 +333,9 @@ def tokenize(src: str, line: int = 1, filename: str = "") -> Iterator[Token]:
                 line += newlines
         else:
             begin = line, start - linestart
+            if kind == CMACRO:
+                linestart = end
+                line += 1
         if kind != "\n":
             yield Token(
                 filename, kind, text, begin, (line, start - linestart + len(text))