[vala/staging: 2/3] Forbid var declaration with null initializer

[Jürg Billeter <juergbi src gnome org>]

commit 97646cf463c15cc4fe61f159f11e9d0c2b518528
Author: Luca Bruno <lucabru src gnome org>
Date:   Fri May 27 15:11:35 2011 +0200

    Forbid var declaration with null initializer
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639990

 tests/Makefile.am                |    1 +
 tests/basic-types/bug639990.test |    5 +++++
 vala/valalocalvariable.vala      |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0832a41..976cee0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,6 +28,7 @@ TESTS = \
        basic-types/bug596637.vala \
        basic-types/bug596785.vala \
        basic-types/bug632322.vala \
+       basic-types/bug639990.test \
        basic-types/bug643612.vala \
        basic-types/bug644046.vala \
        basic-types/bug647222.vala \
diff --git a/tests/basic-types/bug639990.test b/tests/basic-types/bug639990.test
new file mode 100644
index 0000000..38a59ae
--- /dev/null
+++ b/tests/basic-types/bug639990.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       var foo = null;
+}
diff --git a/vala/valalocalvariable.vala b/vala/valalocalvariable.vala
index a7979f7..14eec0c 100644
--- a/vala/valalocalvariable.vala
+++ b/vala/valalocalvariable.vala
@@ -112,7 +112,7 @@ public class Vala.LocalVariable : Variable {
                                Report.error (source_reference, "var declaration not allowed without 
initializer");
                                return false;
                        }
-                       if (initializer.value_type == null) {
+                       if (initializer.value_type == null || initializer.value_type is NullType) {
                                error = true;
                                Report.error (source_reference, "var declaration not allowed with non-typed 
initializer");
                                return false;