Fix type of implicit `this' parameter when using generics

2009-01-24  Jürg Billeter  <j@bitron.ch>

	* vala/valaclass.vala:

	Fix type of implicit `this' parameter when using generics

svn path=/trunk/; revision=2399

diff --git a/ChangeLog b/ChangeLog
index 8a7ff1568b828a7c479b12fb1422c79aad81bb97..e352d4aac1e7b8fb7187c2931eb4e918f103580d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-24  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaclass.vala:
+
+       Fix type of implicit `this' parameter when using generics
+
 2009-01-23  Jürg Billeter  <j@bitron.ch>
 
        * ccode/valaccodefunction.vala:

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 6c06a4e1f04e57cb7c09d21b73d2ee768660fc1b..52690f95df087dbf8c56271a9f40d61c6af3ac46 100644 (file)
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -191,7 +191,7 @@ public class Vala.Class : ObjectTypeSymbol {
                                if (_destructor.this_parameter != null) {
                                        _destructor.scope.remove (_destructor.this_parameter.name);
                                }
-                               _destructor.this_parameter = new FormalParameter ("this", new ObjectType (this));
+                               _destructor.this_parameter = new FormalParameter ("this", get_this_type ());
                                _destructor.scope.add (_destructor.this_parameter.name, _destructor.this_parameter);
                        }
                }
@@ -292,6 +292,16 @@ public class Vala.Class : ObjectTypeSymbol {
                return new ReadOnlyList<Constant> (constants);
        }
 
+       ObjectType get_this_type () {
+               var result = new ObjectType (this);
+               foreach (var type_parameter in get_type_parameters ()) {
+                       var type_arg = new GenericType (type_parameter);
+                       type_arg.value_owned = true;
+                       result.add_type_argument (type_arg);
+               }
+               return result;
+       }
+
        /**
         * Adds the specified method as a member to this class.
         *
@@ -302,7 +312,7 @@ public class Vala.Class : ObjectTypeSymbol {
                        if (m.this_parameter != null) {
                                m.scope.remove (m.this_parameter.name);
                        }
-                       m.this_parameter = new FormalParameter ("this", new ObjectType (this));
+                       m.this_parameter = new FormalParameter ("this", get_this_type ());
                        m.scope.add (m.this_parameter.name, m.this_parameter);
                }
                if (!(m.return_type is VoidType) && m.get_postconditions ().size > 0) {
@@ -348,7 +358,7 @@ public class Vala.Class : ObjectTypeSymbol {
                properties.add (prop);
                scope.add (prop.name, prop);
 
-               prop.this_parameter = new FormalParameter ("this", new ObjectType (this));
+               prop.this_parameter = new FormalParameter ("this", get_this_type ());
                prop.scope.add (prop.this_parameter.name, prop.this_parameter);
 
                if (prop.field != null) {