Fix typing in scripts/extension_api_parser

Author: touilleMan

scripts/extension_api_parser/api.py

@@ -101,7 +101,7 @@ class NativeStructureSpec:
     format: str
 
     @classmethod
-    def parse(cls, item: dict) -> "GlobalEnumSpec":
+    def parse(cls, item: dict) -> "NativeStructureSpec":
         item.setdefault("original_name", item["name"])
         assert_api_consistency(cls, item)
         return cls(

scripts/extension_api_parser/builtins.py

@@ -154,7 +154,7 @@ def parse(cls, item: dict) -> "BuiltinOperatorSpec":
             # used to represent the absence of a value (typically in a return type),
             # but here we want to compare a builtin value with the constant representing
             # emptiness.
-            right_type=TypeInUse(item["right_type"]) if item["right_type"] is not None else None,
+            right_type=TypeInUse(item["right_type"]),
             return_type=TypeInUse(item["return_type"]),
         )
 
@@ -253,7 +253,7 @@ class BuiltinSpec:
     c_struct_name: str
     original_name: str
     is_scalar: bool
-    size: Optional[int]
+    size: int
     indexing_return_type: Optional[str]
     is_keyed: bool
     constructors: List[BuiltinConstructorSpec]
@@ -266,7 +266,7 @@ class BuiltinSpec:
     enums: List[BuiltinEnumSpec]
 
     @property
-    def c_struct_members(self) -> List[Tuple[str, TypeInUse]]:
+    def c_struct_members(self) -> List[BuiltinMemberSpec]:
         struct_members = [m for m in self.members if m.offset is not None]
         if struct_members:
             # Sanity check

scripts/extension_api_parser/type.py

@@ -193,7 +193,8 @@ def register_builtins_in_types_db(builtins: Iterable["BuiltinSpec"]) -> None:
             # `BuiltinOperatorSpec.right_type` and in `ValueInUse`.
             # So better skip it and use ad-hoc workaround instead.
             continue
-        elif spec.name == "bool":
+        assert spec.size is not None
+        if spec.name == "bool":
             ts = TypeSpec(
                 size=spec.size,
                 gdapi_type=spec.original_name,
@@ -282,7 +283,7 @@ class TypeInUse:
 
     def __repr__(self) -> str:
         try:
-            resolved = self.resolve()
+            resolved = TYPES_DB[self.type_name]
         except KeyError:
             resolved = "<not resolved yet>"
         return f"{self.__class__.__name__}({self.type_name}, {resolved})"
@@ -293,7 +294,7 @@ def resolve(self) -> TypeSpec:
         try:
             return TYPES_DB[self.type_name]
         except KeyError:
-            return
+            raise RuntimeError(f"Type {self.type_name} is not resolvable yet !")
 
     def __getattr__(self, name: str):
         try: