From: Jürg Billeter <j@bitron.ch>
Date: Wed, 3 Jun 2009 09:05:29 +0000 (+0200)
Subject: Check compatibility of generic type arguments
X-Git-Tag: 0.7.4~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf411029c40fc4b298733decdf5d1da034037e77;p=thirdparty%2Fvala.git

Check compatibility of generic type arguments

Fixes bug 520952.
---

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 8150fb9c4..97d681f9d 100644
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -328,6 +328,23 @@ public abstract class Vala.DataType : CodeNode {
 		}
 
 		if (data_type == target_type.data_type) {
+			// check compatibility of generic type arguments
+			if (type_argument_list != null
+			    && type_argument_list.size > 0
+			    && type_argument_list.size == target_type.get_type_arguments ().size) {
+				for (int i = 0; i < type_argument_list.size; i++) {
+					var type_arg = type_argument_list[i];
+					var target_type_arg = target_type.get_type_arguments ()[i];
+					// mutable generic types require type argument equality,
+					// not just one way compatibility
+					// as we do not currently have immutable generic container types,
+					// the additional check would be very inconvenient, so we
+					// skip the additional check for now
+					if (!type_arg.compatible (target_type_arg)) {
+						return false;
+					}
+				}
+			}
 			return true;
 		}
 
diff --git a/vapigen/valavapicheck.vala b/vapigen/valavapicheck.vala
index 50ecd9252..6122a0121 100644
--- a/vapigen/valavapicheck.vala
+++ b/vapigen/valavapicheck.vala
@@ -84,7 +84,7 @@ class Vala.VAPICheck : Object {
 
 				case IdlNodeTypeId.FUNCTION:
 					parse_members (((IdlNodeFunction) node).symbol,
-								   ((IdlNodeFunction) node).parameters);
+								   (List<IdlNode>) ((IdlNodeFunction) node).parameters);
 					break;
 
 				case IdlNodeTypeId.BOXED: