Review (part 1)

Author: AA-Turner

Modules/clinic/_testclinic_kwds.c.h

@@ -84,6 +84,7 @@
         "argsbuf",
         "fastargs",
         "kwargs",
+        "kwds",
         "kwnames",
         "nargs",
         "noptargs",

Tools/clinic/libclinic/__init__.py

@@ -1304,5 +1304,11 @@ def cleanup(self) -> str:
     def parse_var_keyword(self) -> str:
         param_name = self.parser_name
         return f"""
-            {param_name} = (kwargs != NULL) ? Py_NewRef(kwargs) : PyDict_New();
+            if (kwargs == NULL) {{{{
+                {param_name} = PyDict_New();
+                if ({param_name} == NULL) goto exit;
+            }}}}
+            else {{{{
+                {param_name} = Py_NewRef(kwargs);
+            }}}}
             """

Tools/clinic/libclinic/converters.py

@@ -246,6 +246,7 @@ def dedent(self, line: str) -> str:
 class DSLParser:
     function: Function | None
     state: StateKeeper
+    expecting_parameters: bool
     keyword_only: bool
     positional_only: bool
     deprecated_positional: VersionTuple | None
@@ -285,6 +286,7 @@ def __init__(self, clinic: Clinic) -> None:
     def reset(self) -> None:
         self.function = None
         self.state = self.state_dsl_start
+        self.expecting_parameters = True
         self.keyword_only = False
         self.positional_only = False
         self.deprecated_positional = None
@@ -848,6 +850,10 @@ def state_parameter(self, line: str) -> None:
             # we indented, must be to new parameter docstring column
             return self.next(self.state_parameter_docstring_start, line)
 
+        if not self.expecting_parameters:
+            fail('Encountered parameter line when not expecting '
+                 f'parameters: {line}')
+
         line = line.rstrip()
         if line.endswith('\\'):
             self.parameter_continuation = line[:-1]
@@ -1128,8 +1134,10 @@ def bad_node(self, node: ast.AST) -> None:
         key = f"{parameter_name}_as_{c_name}" if c_name else parameter_name
         self.function.parameters[key] = p
 
-        if is_vararg or is_var_keyword:
+        if is_vararg:
             self.keyword_only = True
+        if is_var_keyword:
+            self.expecting_parameters = False
 
     @staticmethod
     def parse_converter(