correct cname of generic type parameters

2007-03-10  Jürg Billeter  <j@bitron.ch>

	* vala/valatypereference.vala: correct cname of generic type parameters

svn path=/trunk/; revision=230

diff --git a/vala/ChangeLog b/vala/ChangeLog
index c1b4f1a..fdfd7ba 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,5 +1,9 @@
 2007-03-10  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valatypereference.vala: correct cname of generic type parameters
+
+2007-03-10  Jürg Billeter  <j@bitron.ch>
+
        * vala/valacreationmethod.vala, vala/valamethod.vala: fix overriding
          cname of creation methods
 

diff --git a/vala/vala/valatypereference.vala b/vala/vala/valatypereference.vala
index 8264f2b..2db60e5 100644 (file)
--- a/vala/vala/valatypereference.vala
+++ b/vala/vala/valatypereference.vala
@@ -199,9 +199,9 @@ public class Vala.TypeReference : CodeNode {
                
                string ptr;
                string arr;
-               if (type_parameter == null && !data_type.is_reference_type () && !reference_to_value_type) {
+               if (type_parameter != null || (!data_type.is_reference_type () && !reference_to_value_type)) {
                        ptr = "";
-               } else if (((type_parameter != null || data_type.is_reference_type ()) && !is_out) || reference_to_value_type) {
+               } else if ((data_type.is_reference_type () && !is_out) || reference_to_value_type) {
                        ptr = "*";
                } else {
                        ptr = "**";