vala: Accept NullType as generic type argument

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d823ca11a31b2459988208ca8b0796891f6f875..d8b353fedce9c091fd26fe723550acb6e3b94323 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -680,6 +680,7 @@ TESTS = \
        generics/parameter-invalid-initializer.test \
        generics/parameter-sizeof-initializer.vala \
        generics/member-dup-destroy.vala \
+       generics/null-type.vala \
        generics/property-int-cast.vala \
        generics/reference-transfer.vala \
        generics/string-literal-comparison.vala \

diff --git a/tests/generics/null-type.vala b/tests/generics/null-type.vala
new file mode 100644 (file)
index 0000000..a427ee8
--- /dev/null
+++ b/tests/generics/null-type.vala
@@ -0,0 +1,10 @@
+void foo<T> (T t) {
+       assert (t == null);
+       assert (typeof (T) == Type.INVALID);
+       assert (T.dup == null);
+       assert (T.destroy == null);
+}
+
+void main () {
+       foo (null);
+}

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index de9096775bab8d93132dbadcbac1b1018d4d85f5..abc0a4b5604411692a761d6137f3d56b97b6f4b7 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1354,6 +1354,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 
        void check_type_argument (DataType type_arg) {
                if (type_arg is GenericType
+                   || type_arg is NullType
                    || type_arg is PointerType
                    || type_arg is VoidType
                    || is_reference_type_argument (type_arg)