From d15f6abcfe06aaba8a9b215a7667962b8d09004b Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Mon, 14 Apr 2008 20:28:36 +0000 Subject: [PATCH] mark pointers as nullable 2008-04-14 Juerg Billeter * vala/valaparser.vala, vala/valapointertype.vala, vala/valasymbolresolver.vala: mark pointers as nullable svn path=/trunk/; revision=1231 --- ChangeLog | 5 +++++ vala/valaparser.vala | 2 +- vala/valapointertype.vala | 1 + vala/valasymbolresolver.vala | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d570152..cd462e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-04-14 Jürg Billeter + * vala/valaparser.vala, vala/valapointertype.vala, + vala/valasymbolresolver.vala: mark pointers as nullable + +2008-04-14 Jürg Billeter + * vala/valaparser.vala: improve error handling, fixes bug 528073 2008-04-14 Jürg Billeter diff --git a/vala/valaparser.vala b/vala/valaparser.vala index 2ede5bb..7bf0c4b 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 b81f4be..def7264 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 082d89d..3984186 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); } -- 2.7.4