]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
vala: Check type-arguments in base-types/prerequisites of class/interface
authorRico Tzschichholz <ricotz@ubuntu.com>
Sat, 13 Feb 2021 13:47:03 +0000 (14:47 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sat, 13 Feb 2021 13:57:20 +0000 (14:57 +0100)
Fixes https://gitlab.gnome.org/GNOME/vala/issues/404

tests/Makefile.am
tests/generics/arrays-not-supported-2.test [new file with mode: 0644]
tests/generics/arrays-not-supported-3.test [new file with mode: 0644]
vala/valaclass.vala
vala/valainterface.vala

index 15d82e08690fb3de889715e6c809b34988f00001..16820e66dd6ee285bc36b02eff3d0956900c0966 100644 (file)
@@ -653,6 +653,8 @@ TESTS = \
        asynchronous/variadic-invalid-2.test \
        asynchronous/yield.vala \
        generics/arrays-not-supported.test \
+       generics/arrays-not-supported-2.test \
+       generics/arrays-not-supported-3.test \
        generics/constructor-chain-up.vala \
        generics/floating-type-cast.vala \
        generics/inference-argument-may-fail.vala \
diff --git a/tests/generics/arrays-not-supported-2.test b/tests/generics/arrays-not-supported-2.test
new file mode 100644 (file)
index 0000000..3682da6
--- /dev/null
@@ -0,0 +1,10 @@
+Invalid Code
+
+interface Foo<T> : Object {
+}
+
+interface Bar : Object, Foo<int[]> {
+}
+
+void main () {
+}
diff --git a/tests/generics/arrays-not-supported-3.test b/tests/generics/arrays-not-supported-3.test
new file mode 100644 (file)
index 0000000..6ef20d3
--- /dev/null
@@ -0,0 +1,10 @@
+Invalid Code
+
+class Foo<T> : Object {
+}
+
+class Bar : Foo<int[]> {
+}
+
+void main () {
+}
index 3bf845847f28150ae9dc52fc66ddf29532774362..ee2e7593d1b4b33c8b61a728f5ffb76e4a5726d9 100644 (file)
@@ -572,6 +572,7 @@ public class Vala.Class : ObjectTypeSymbol {
 
                foreach (DataType type in base_types) {
                        type.check (context);
+                       context.analyzer.check_type (type);
                }
 
                foreach (TypeParameter p in get_type_parameters ()) {
index 1e0cbdaa86e27b25bd8af22c1365963ebf683a22..b48d5b8b0ec67b52b11dd9005e7e76b6860b6aaa 100644 (file)
@@ -202,6 +202,7 @@ public class Vala.Interface : ObjectTypeSymbol {
 
                foreach (DataType type in prerequisites) {
                        type.check (context);
+                       context.analyzer.check_type (type);
                }
 
                foreach (TypeParameter p in get_type_parameters ()) {