vala: Accept NullType as generic type argument

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f77a696f5f7fea9d3830753970062a7258bcd04c..cb1ac9fe81e9f850f3797c341cf3a636be1b3d87 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -709,6 +709,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 016f2ef0264dcdd028819eb8e97936ac01526948..7f2e56c0394032b545cc2252368616c0e9a6c3a2 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1311,6 +1311,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)