diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-03-07 13:42:16 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-03-13 21:33:12 +0100 |
| commit | 51249ecb88c9bb96097686438b651061900678dc (patch) | |
| tree | 438027ad013026dc648f8f017afe93e4c34f85af | |
| parent | 7084b2b378f1e5af5e07a88b1ae0cf748a274903 (diff) | |
| download | vala-51249ecb88c9bb96097686438b651061900678dc.tar.gz | |
vala: Check (optional) type-arguments of array creation expression
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/semantic/array-too-few-type-arguments.test | 8 | ||||
| -rw-r--r-- | tests/semantic/array-too-many-type-arguments.test | 8 | ||||
| -rw-r--r-- | vala/valaarraycreationexpression.vala | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2180375e5..a1a6ccba2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -876,6 +876,8 @@ TESTS = \ semantic/array-incompatible-initializer.test \ semantic/array-incompatible-initializer2.test \ semantic/array-invalid-type-argument.test \ + semantic/array-too-few-type-arguments.test \ + semantic/array-too-many-type-arguments.test \ semantic/assignment-element-incompatible-ownership.test \ semantic/assignment-element-incompatible-type.test \ semantic/assignment-fixed-array-length.test \ diff --git a/tests/semantic/array-too-few-type-arguments.test b/tests/semantic/array-too-few-type-arguments.test new file mode 100644 index 000000000..3161b5b3e --- /dev/null +++ b/tests/semantic/array-too-few-type-arguments.test @@ -0,0 +1,8 @@ +Invalid Code + +class Foo<G,T> { +} + +void main () { + var foo = new Foo<string>[] {}; +} diff --git a/tests/semantic/array-too-many-type-arguments.test b/tests/semantic/array-too-many-type-arguments.test new file mode 100644 index 000000000..84d64e83f --- /dev/null +++ b/tests/semantic/array-too-many-type-arguments.test @@ -0,0 +1,8 @@ +Invalid Code + +class Foo<G> { +} + +void main () { + var foo = new Foo<string,int>[] {}; +} diff --git a/vala/valaarraycreationexpression.vala b/vala/valaarraycreationexpression.vala index 8af8fa8fe..c3a20adf9 100644 --- a/vala/valaarraycreationexpression.vala +++ b/vala/valaarraycreationexpression.vala @@ -245,6 +245,12 @@ public class Vala.ArrayCreationExpression : Expression { if (element_type != null) { element_type.check (context); + + // check whether there is the expected amount of type-arguments + if (!element_type.check_type_arguments (context, true)) { + error = true; + return false; + } } if (length_type == null) { |