vala r1785 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Fri Sep 26 19:57:55 2008
New Revision: 1785
URL: http://svn.gnome.org/viewvc/vala?rev=1785&view=rev

Log:
2008-09-26  JÃrg Billeter  <j bitron ch>

	* vala/valaarraytype.vala:
	* vala/valadatatype.vala:

	Fix qualified string of nullable array types,
	patch by Anthony Taylor, fixes bug 544932


Modified:
   trunk/ChangeLog
   trunk/vala/valaarraytype.vala
   trunk/vala/valadatatype.vala

Modified: trunk/vala/valaarraytype.vala
==============================================================================
--- trunk/vala/valaarraytype.vala	(original)
+++ trunk/vala/valaarraytype.vala	Fri Sep 26 19:57:55 2008
@@ -141,7 +141,7 @@
 	}
 
 	public override string to_qualified_string (Scope? scope) {
-		return "%s[%s]".printf (element_type.to_qualified_string (scope), string.nfill (rank - 1, ','));
+		return "%s[%s]%s".printf (element_type.to_qualified_string (scope), string.nfill (rank - 1, ','), nullable ? "?" : "");
 	}
 
 	public override bool compatible (DataType target_type) {

Modified: trunk/vala/valadatatype.vala
==============================================================================
--- trunk/vala/valadatatype.vala	(original)
+++ trunk/vala/valadatatype.vala	Fri Sep 26 19:57:55 2008
@@ -191,7 +191,7 @@
 		}
 
 		var type_args = get_type_arguments ();
-		if (!(this is ArrayType) && type_args.size > 0) {
+		if (type_args.size > 0) {
 			s += "<";
 			bool first = true;
 			foreach (DataType type_arg in type_args) {