Refactor to fix coverage

Author: AlexWaygood

Tools/clinic/clinic.py

@@ -4618,7 +4618,7 @@ def parse(self, block: Block) -> None:
                 fail(f'Tab characters are illegal in the Clinic DSL: {line!r}',
                      line_number=block_start)
             try:
-                function = self.handle_line(function, line)
+                function = self.handle_line(function=function, line=line)
             except ClinicError as exc:
                 exc.lineno = line_number
                 raise
@@ -4631,7 +4631,16 @@ def parse(self, block: Block) -> None:
                 fail("'preserve' only works for blocks that don't produce any output!")
             block.output = self.saved_output
 
-    def handle_line(self, function: Function | None, line: str) -> Function | None:
+    def handle_line(
+        self,
+        /,
+        *,
+        function: Function | None,
+        line: str,
+        new_state: DSLParserState | None = None
+    ) -> Function | None:
+        if new_state:
+            self.state = new_state
         match function:
             case None:
                 match self.state:
@@ -4697,10 +4706,13 @@ def handle_dsl_start(self, line: str) -> Function | None:
                 fail(str(e))
             return None
 
-        self.state = DSLParserState.MODULENAME_NAME
-        return self.handle_modulename_name(line)
+        return self.handle_line(
+            function=None,
+            line=line,
+            new_state=DSLParserState.MODULENAME_NAME
+        )
 
-    def handle_modulename_name(self, line: str) -> Function | None:
+    def handle_modulename_name(self, line: str) -> Function:
         # looking for declaration, which establishes the leftmost column
         # line should be
         #     modulename.fnname [as c_basename] [-> return annotation]
@@ -4717,9 +4729,6 @@ def handle_modulename_name(self, line: str) -> Function | None:
         # this line is permitted to start with whitespace.
         # we'll call this number of spaces F (for "function").
 
-        if not self.valid_line(line):
-            return None
-
         self.indent.infer(line)
 
         # are we cloning?
@@ -4900,13 +4909,16 @@ def handle_parameters_start(self, function: Function, line: str) -> Function:
         if self.valid_line(line):
             # if this line is not indented, we have no parameters
             if not self.indent.infer(line):
-                self.state = DSLParserState.FUNCTION_DOCSTRING
-                self.handle_function_docstring(function=function, line=line)
+                self.handle_line(
+                    function=function,
+                    line=line,
+                    new_state=DSLParserState.FUNCTION_DOCSTRING
+                )
             else:
                 self.parameter_continuation = ''
-                self.state = DSLParserState.PARAMETER
-                self.handle_parameter(function=function, line=line)
-
+                self.handle_line(
+                    function=function, line=line, new_state=DSLParserState.PARAMETER
+                )
         return function
 
     def to_required(self, function: Function) -> None:
@@ -4930,13 +4942,19 @@ def handle_parameter(self, function: Function, line: str) -> Function:
         indent = self.indent.infer(line)
         if indent == -1:
             # we outdented, must be to definition column
-            self.state = DSLParserState.FUNCTION_DOCSTRING
-            return self.handle_function_docstring(function=function, line=line)
+            self.handle_line(
+                function=function, line=line, new_state=DSLParserState.FUNCTION_DOCSTRING
+            )
+            return function
 
         if indent == 1:
             # we indented, must be to new parameter docstring column
-            self.state = DSLParserState.PARAMETER_DOCSTRING_START
-            return self.handle_parameter_docstring_start(function=function, line=line)
+            self.handle_line(
+                function=function,
+                line=line,
+                new_state=DSLParserState.PARAMETER_DOCSTRING_START
+            )
+            return function
 
         line = line.rstrip()
         if line.endswith('\\'):
@@ -5332,8 +5350,10 @@ def handle_parameter_docstring_start(
         assert self.indent.margin is not None, "self.margin.infer() has not yet been called to set the margin"
         self.parameter_docstring_indent = len(self.indent.margin)
         assert self.indent.depth == 3
-        self.state = DSLParserState.PARAMETER_DOCSTRING
-        return self.handle_parameter_docstring(function=function, line=line)
+        self.handle_line(
+            function=function, line=line, new_state=DSLParserState.PARAMETER_DOCSTRING
+        )
+        return function
 
     def docstring_append(self, obj: Function | Parameter, line: str) -> None:
         """Add a rstripped line to the current docstring."""
@@ -5364,11 +5384,15 @@ def handle_parameter_docstring(
             assert self.indent.depth < 3
             if self.indent.depth == 2:
                 # back to a parameter
-                self.state = DSLParserState.PARAMETER
-                return self.handle_parameter(function=function, line=line)
-            assert self.indent.depth == 1
-            self.state = DSLParserState.FUNCTION_DOCSTRING
-            return self.handle_function_docstring(function=function, line=line)
+                self.handle_line(
+                    function=function, line=line, new_state=DSLParserState.PARAMETER
+                )
+            else:
+                assert self.indent.depth == 1
+                self.handle_line(
+                    function=function, line=line, new_state=DSLParserState.FUNCTION_DOCSTRING
+                )
+            return function
 
         assert function.parameters
         last_param = next(reversed(function.parameters.values()))