diff options
| author | Juerg Billeter <j@bitron.ch> | 2008-04-14 15:54:19 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2008-04-14 15:54:19 +0000 |
| commit | 6bab2a017d8946b707c30f3be8d4255a8b3544ad (patch) | |
| tree | 660e78387b0a61cbda9c4644733c2426a978d1b9 /vala/valanulltype.vala | |
| parent | 8bd540e589f4e21461b46ebf802ef673af1fb3e4 (diff) | |
| download | vala-6bab2a017d8946b707c30f3be8d4255a8b3544ad.tar.gz | |
move experimental null reference checking to separate visitor
2008-04-14 Juerg Billeter <j@bitron.ch>
* vala/Makefile.am, vala/valaarraytype.vala,
vala/valaclasstype.vala, vala/valacodenode.vala,
vala/valadatatype.vala, vala/valaerrortype.vala,
vala/valaintegertype.vala, vala/valainterfacetype.vala,
vala/valamethodtype.vala, vala/valanullchecker.vala,
vala/valanulltype.vala, vala/valaparser.vala,
vala/valapointertype.vala, vala/valasemanticanalyzer.vala,
vala/valasymbolresolver.vala, vala/valatypeparametertype.vala,
vala/valaunresolvedtype.vala, vala/valavaluetype.vala,
gobject/valaccodegenerator.vala, compiler/valacompiler.vala,
vapigen/valagidlparser.vala: move experimental null reference
checking to separate visitor
svn path=/trunk/; revision=1221
Diffstat (limited to 'vala/valanulltype.vala')
| -rw-r--r-- | vala/valanulltype.vala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vala/valanulltype.vala b/vala/valanulltype.vala index 47655aa84..8c7a15782 100644 --- a/vala/valanulltype.vala +++ b/vala/valanulltype.vala @@ -30,7 +30,7 @@ public class Vala.NullType : ReferenceType { this.source_reference = source_reference; } - public override bool compatible (DataType target_type, bool enable_non_null = true) { + public override bool compatible (DataType target_type) { if (!(target_type is PointerType) && (target_type is NullType || (target_type.data_type == null && target_type.type_parameter == null))) { return true; } @@ -47,8 +47,7 @@ public class Vala.NullType : ReferenceType { if (target_type.data_type.is_reference_type () || target_type is ArrayType || target_type is DelegateType) { - // incompatibility between null and non-null types - return !enable_non_null; + return true; } /* null is not compatible with any other type (i.e. value types) */ |