typelib: Fix crash when handling array types

blueprintcompiler/gir.py

@@ -126,6 +126,22 @@ class UncheckedType(GirType):
         return self._name
 
 
+class ArrayType(GirType):
+    def __init__(self, inner: GirType) -> None:
+        self._inner = inner
+
+    def assignable_to(self, other: GirType) -> bool:
+        return isinstance(other, ArrayType) and self._inner.assignable_to(other._inner)
+
+    @property
+    def name(self) -> str:
+        return self._inner.name + "[]"
+
+    @property
+    def full_name(self) -> str:
+        return self._inner.full_name + "[]"
+
+
 class BasicType(GirType):
     name: str = "unknown type"
 
@@ -714,9 +730,15 @@ class Repository(GirNode):
             else:
                 raise CompilerBugError("Unknown type ID", type_id)
         else:
+            blob = self.tl.header[type_id]
+            if blob.TYPE_BLOB_TAG == typelib.TYPE_INTERFACE:
                 return self._resolve_dir_entry(
-                self.tl.header[type_id].INTERFACE_TYPE_INTERFACE
+                    self.tl.header[type_id].TYPE_BLOB_INTERFACE
                 )
+            elif blob.TYPE_BLOB_TAG == typelib.TYPE_ARRAY:
+                return ArrayType(self._resolve_type_id(blob.TYPE_BLOB_ARRAY_INNER))
+            else:
+                raise CompilerBugError(f"{blob.TYPE_BLOB_TAG}")
 
 
 class GirContext:

blueprintcompiler/typelib.py

@@ -136,7 +136,9 @@ class Typelib:
     ATTR_NAME = Field(0x0, "string")
     ATTR_VALUE = Field(0x0, "string")
 
-    INTERFACE_TYPE_INTERFACE = Field(0x2, "dir_entry")
+    TYPE_BLOB_TAG = Field(0x0, "u8", 3, 5)
+    TYPE_BLOB_INTERFACE = Field(0x2, "dir_entry")
+    TYPE_BLOB_ARRAY_INNER = Field(0x4, "u32")
 
     BLOB_NAME = Field(0x4, "string")
 

tests/sample_errors/strv.blp

@@ -0,0 +1,6 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.AboutWindow {
+  developers: Gtk.StringList {};
+}

tests/sample_errors/strv.err

@@ -0,0 +1 @@
+5,15,17,Cannot assign Gtk.StringList to string[]

tests/test_samples.py

@@ -231,6 +231,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("signal_object_dne")
         self.assert_sample_error("size_group_non_widget")
         self.assert_sample_error("size_group_obj_dne")
+        self.assert_sample_error("strv")
         self.assert_sample_error("styles_in_non_widget")
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")