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

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

svn path=/trunk/; revision=1785

diff --git a/ChangeLog b/ChangeLog
index d6985f1..1413940 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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
+
+2008-09-26  Jürg Billeter  <j@bitron.ch>
+
        * vapi/glib-2.0.vapi:
 
        Fix GSequenceIter binding, it should be treated as a value-type,

diff --git a/vala/valaarraytype.vala b/vala/valaarraytype.vala
index 1b12a89..946c282 100644 (file)
--- a/vala/valaarraytype.vala
+++ b/vala/valaarraytype.vala
@@ -141,7 +141,7 @@ public class Vala.ArrayType : ReferenceType {
        }
 
        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) {

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index ff6f076..9d35659 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -191,7 +191,7 @@ public abstract class Vala.DataType : CodeNode {
                }
 
                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) {