From: Juerg Billeter <j@bitron.ch>
Date: Mon, 14 Apr 2008 20:28:36 +0000 (+0000)
Subject: mark pointers as nullable
X-Git-Tag: VALA_0_3_1~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d15f6abcfe06aaba8a9b215a7667962b8d09004b;p=thirdparty%2Fvala.git

mark pointers as nullable

2008-04-14  Juerg Billeter  <j@bitron.ch>

	* vala/valaparser.vala, vala/valapointertype.vala,
	  vala/valasymbolresolver.vala: mark pointers as nullable

svn path=/trunk/; revision=1231
---

diff --git a/ChangeLog b/ChangeLog
index d5701521c..cd462e991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valaparser.vala, vala/valapointertype.vala,
+	  vala/valasymbolresolver.vala: mark pointers as nullable
+
 2008-04-14  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valaparser.vala: improve error handling, fixes bug 528073
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 2ede5bbb8..7bf0c4be3 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -354,7 +354,7 @@ public class Vala.Parser : CodeVisitor {
 			stars++;
 		}
 
-		bool nullable = accept (TokenType.INTERR);
+		bool nullable = stars > 0 || accept (TokenType.INTERR);
 
 		int array_rank = 0;
 		if (accept (TokenType.OPEN_BRACKET)) {
diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index b81f4be94..def7264ac 100644
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -34,6 +34,7 @@ public class Vala.PointerType : DataType {
 
 	public PointerType (DataType base_type) {
 		this.base_type = base_type;
+		nullable = true;
 	}
 
 	public override string to_string () {
diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala
index 082d89d3d..3984186f8 100644
--- a/vala/valasymbolresolver.vala
+++ b/vala/valasymbolresolver.vala
@@ -280,6 +280,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 			base_type.transfers_ownership = false;
 			base_type.is_ref = false;
 			base_type.is_out = false;
+			base_type.nullable = false;
 
 			type = new PointerType (base_type);
 		}