vala r2114 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Tue Dec  2 21:23:34 2008
New Revision: 2114
URL: http://svn.gnome.org/viewvc/vala?rev=2114&view=rev

Log:
2008-12-02  JÃrg Billeter  <j bitron ch>

	* vala/valadatatype.vala:

	Fix type resolving with nested generic types, fixes bug 562956


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

Modified: trunk/vala/valadatatype.vala
==============================================================================
--- trunk/vala/valadatatype.vala	(original)
+++ trunk/vala/valadatatype.vala	Tue Dec  2 21:23:34 2008
@@ -484,9 +484,9 @@
 
 		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++) {