Fix type resolving with nested generic types, fixes bug 562956

2008-12-02  Jürg Billeter  <j@bitron.ch>

	* vala/valadatatype.vala:

	Fix type resolving with nested generic types, fixes bug 562956

svn path=/trunk/; revision=2114

diff --git a/ChangeLog b/ChangeLog
index d1e31b664ca50bb1606103ee77330ed369a39d6d..3bd4f8422d857bfda5be00490cc9bf03c5c0db35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-02  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valadatatype.vala:
+
+       Fix type resolving with nested generic types, fixes bug 562956
+
 2008-12-01  Jürg Billeter  <j@bitron.ch>
 
        * configure.ac: Post-release version bump

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 10f3aa1f493b1a57daf4255dc08d91b9a48cde2d..afe16dac92d56136df3b37d169280dc5bc677d77 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -484,9 +484,9 @@ public abstract class Vala.DataType : CodeNode {
 
                if (result is GenericType) {
                        result = SemanticAnalyzer.get_actual_type (derived_instance_type, (GenericType) result, node_reference);
-               }
-
-               if (result.type_argument_list != null) {
+                       // don't try to resolve type arguments of returned actual type
+                       // they can never be resolved and are not related to the instance type
+               } else if (result.type_argument_list != null) {
                        // recursely get actual types for type arguments
                        result = result.copy ();
                        for (int i = 0; i < result.type_argument_list.size; i++) {