vala: Multi-dimensional params-array not allowed

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1230

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fbc25c3bc9f40e23fdc4b8b066950d7072c7826f..24f060f2a7fb10c1e821f236a0e0363f4b2e6f69 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -231,6 +231,7 @@ TESTS = \
        methods/nowrapper-no-vfunc.test \
        methods/params-array.vala \
        methods/params-array-abstract.test \
+       methods/params-array-multi-dimensional.test \
        methods/params-array-preceding.test \
        methods/params-array-with-throws.vala \
        methods/print-attribute.vala \

diff --git a/tests/methods/params-array-multi-dimensional.test b/tests/methods/params-array-multi-dimensional.test
new file mode 100644 (file)
index 0000000..d66d5ab
--- /dev/null
+++ b/tests/methods/params-array-multi-dimensional.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+void foo (params string[,] strvv) {
+}
+
+void main () {
+}

diff --git a/vala/valaparameter.vala b/vala/valaparameter.vala
index 41a59da6105a80a12ff9363eefbaa9f23d21456d..7bbb2cedbd787c367da0b56015c9cdc63300b3d0 100644 (file)
--- a/vala/valaparameter.vala
+++ b/vala/valaparameter.vala
@@ -152,10 +152,16 @@ public class Vala.Parameter : Variable {
                if (!ellipsis) {
                        variable_type.check (context);
 
-                       if (params_array && !(variable_type is ArrayType)) {
-                               error = true;
-                               Report.error (source_reference, "parameter array expected");
-                               return false;
+                       if (params_array) {
+                               if (!(variable_type is ArrayType)) {
+                                       error = true;
+                                       Report.error (source_reference, "parameter array expected");
+                                       return false;
+                               } else if (((ArrayType) variable_type).rank != 1) {
+                                       error = true;
+                                       Report.error (source_reference, "multi-dimensional parameter array not allowed");
+                                       return false;
+                               }
                        }
 
                        if (has_attribute_argument ("CCode", "scope") && variable_type is DelegateType) {