vala: Parameter following ellipsis parameter is not allowed

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9114ea972f5357cb4b0dd2c26fec391368d1ad27..52a3661f6a7737a878d5cb1f54abb3724efe9947 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -168,6 +168,7 @@ TESTS = \
        methods/lambda.vala \
        methods/closures.vala \
        methods/contains.vala \
+       methods/ellipsis-preceding.test \
        methods/extern.vala \
        methods/iterator.vala \
        methods/parameter-fixed-array-initializer.vala \

diff --git a/tests/methods/ellipsis-preceding.test b/tests/methods/ellipsis-preceding.test
new file mode 100644 (file)
index 0000000..b687a33
--- /dev/null
+++ b/tests/methods/ellipsis-preceding.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+void foo (int i, ..., int j) {
+}
+
+void main () {
+}

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index daef9789f6b21e0cb5d3bfb13f978a3692b6a182..d12cbcc1320b646628ebef4013d25ebe6295bef3 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -849,6 +849,7 @@ public class Vala.Method : Subroutine, Callable {
 
                var optional_param = false;
                var params_array_param = false;
+               var ellipsis_param = false;
                foreach (Parameter param in parameters) {
                        if (!param.check (context)) {
                                error = true;
@@ -873,11 +874,18 @@ public class Vala.Method : Subroutine, Callable {
                                optional_param = true;
                        }
 
+                       // Disallow parameter after params array or ellipsis
                        if (params_array_param) {
                                Report.error (param.source_reference, "parameter follows params-array parameter");
                        } else if (param.params_array) {
                                params_array_param = true;
                        }
+                       if (ellipsis_param) {
+                               Report.error (param.source_reference, "parameter follows ellipsis parameter");
+                       } else if (param.ellipsis) {
+                               ellipsis_param = true;
+                       }
+
                        // Add local variable to provide access to params arrays which will be constructed out of the given va-args
                        if (param.params_array && body != null) {
                                if (params_array_var != null) {