Move to dataclass for vc args

Author: cmaloney

Tools/clinic/libclinic/dsl_parser.py

@@ -16,7 +16,7 @@
     fail, warn, unspecified, unknown, NULL)
 from libclinic.function import (
     Module, Class, Function, Parameter,
-    FunctionKind,
+    FunctionKind, VectorcallOptions,
     CALLABLE, STATIC_METHOD, CLASS_METHOD, METHOD_INIT, METHOD_NEW,
     GETTER, SETTER)
 from libclinic.converter import (
@@ -302,8 +302,7 @@ def reset(self) -> None:
         self.critical_section = False
         self.target_critical_section = []
         self.disable_fastcall = False
-        self.vectorcall = False
-        self.vectorcall_exact_only = False
+        self.vectorcall: VectorcallOptions | None = None
         self.permit_long_summary = False
         self.permit_long_docstring_body = False
 
@@ -469,18 +468,19 @@ def at_staticmethod(self) -> None:
         self.kind = STATIC_METHOD
 
     def at_vectorcall(self, *args: str) -> None:
-        if self.vectorcall:
+        if self.vectorcall is not None:
             fail("Called @vectorcall twice!")
-        self.vectorcall = True
+        exact_only = False
         for arg in args:
             if '=' in arg:
                 key = arg.split('=', 1)[0]
             else:
                 key = arg
             if key == 'exact_only':
-                self.vectorcall_exact_only = True
+                exact_only = True
             else:
                 fail(f"@vectorcall: unknown argument {key!r}")
+        self.vectorcall = VectorcallOptions(exact_only=exact_only)
 
     def at_coexist(self) -> None:
         if self.coexist:
@@ -745,7 +745,6 @@ def state_modulename_name(self, line: str) -> None:
             target_critical_section=self.target_critical_section,
             forced_text_signature=self.forced_text_signature,
             vectorcall=self.vectorcall,
-            vectorcall_exact_only=self.vectorcall_exact_only,
         )
         self.add_function(func)
 

Tools/clinic/libclinic/function.py

@@ -78,6 +78,11 @@ def __repr__(self) -> str:
 SETTER: Final = FunctionKind.SETTER
 
 
+@dc.dataclass
+class VectorcallOptions:
+    exact_only: bool = False
+
+
 @dc.dataclass(repr=False)
 class Function:
     """
@@ -111,8 +116,7 @@ class Function:
     critical_section: bool = False
     disable_fastcall: bool = False
     target_critical_section: list[str] = dc.field(default_factory=list)
-    vectorcall: bool = False
-    vectorcall_exact_only: bool = False
+    vectorcall: VectorcallOptions | None = None
 
     def __post_init__(self) -> None:
         self.parent = self.cls or self.module

Tools/clinic/libclinic/parse_args.py

@@ -1229,7 +1229,7 @@ def generate_vectorcall(self) -> str:
 
         # Exact type check (if vectorcall_exact_only)
         exact_check = ""
-        if func.vectorcall_exact_only and func.cls:
+        if func.vectorcall and func.vectorcall.exact_only and func.cls:
             type_obj = func.cls.type_object
             self.codegen.add_include('pycore_call.h',
                                      '_PyObject_MakeTpCall()')