X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fpending.cs;h=af15bf6e1c932ff3be8f3c3fd19f32a3f008bef0;hb=3f9310e59b924a8ef63dfef6c7f3c72935ac8f21;hp=0852b0f826a40a536b9c0c46bb4569ded3ad6102;hpb=fcdafff83d2e00a048377a94bd59d4cdac4d1d0e;p=mono.git

diff --git a/mcs/mcs/pending.cs b/mcs/mcs/pending.cs
index 0852b0f826a..af15bf6e1c9 100644
--- a/mcs/mcs/pending.cs
+++ b/mcs/mcs/pending.cs
@@ -9,6 +9,7 @@
 //
 // Copyright 2001, 2002 Ximian, Inc (http://www.ximian.com)
 // Copyright 2003-2008 Novell, Inc.
+// Copyright 2011 Xamarin Inc
 //
 
 using System;
@@ -66,7 +67,7 @@ namespace Mono.CSharp {
 			}
 		}
 
-		public TypeParameter[] CurrentTypeParameters {
+		public TypeParameters CurrentTypeParameters {
 			get {
 				throw new NotImplementedException ();
 			}
@@ -128,7 +129,7 @@ namespace Mono.CSharp {
 		/// <summary>
 		///   The container for this PendingImplementation
 		/// </summary>
-		readonly TypeContainer container;
+		readonly TypeDefinition container;
 		
 		/// <summary>
 		///   This is the array of TypeAndMethods that describes the pending implementations
@@ -136,7 +137,7 @@ namespace Mono.CSharp {
 		/// </summary>
 		TypeAndMethods [] pending_implementations;
 
-		PendingImplementation (TypeContainer container, MissingInterfacesInfo[] missing_ifaces, MethodSpec[] abstract_methods, int total)
+		PendingImplementation (TypeDefinition container, MissingInterfacesInfo[] missing_ifaces, MethodSpec[] abstract_methods, int total)
 		{
 			var type_builder = container.Definition;
 			
@@ -188,20 +189,20 @@ namespace Mono.CSharp {
 
 		static readonly MissingInterfacesInfo [] EmptyMissingInterfacesInfo = new MissingInterfacesInfo [0];
 		
-		static MissingInterfacesInfo [] GetMissingInterfaces (TypeContainer container)
+		static MissingInterfacesInfo [] GetMissingInterfaces (TypeDefinition container)
 		{
 			//
-			// Notice that Interfaces will only return the interfaces that the Type
-			// is supposed to implement, not all the interfaces that the type implements.
+			// Interfaces will return all interfaces that the container
+			// implements including any inherited interfaces
 			//
 			var impl = container.Definition.Interfaces;
 
 			if (impl == null || impl.Count == 0)
 				return EmptyMissingInterfacesInfo;
 
-			MissingInterfacesInfo[] ret = new MissingInterfacesInfo[impl.Count];
+			var ret = new MissingInterfacesInfo[impl.Count];
 
-			for (int i = 0; i < impl.Count; i++)
+			for (int i = 0; i < ret.Length; i++)
 				ret [i] = new MissingInterfacesInfo (impl [i]);
 
 			// we really should not get here because Object doesnt implement any
@@ -232,7 +233,7 @@ namespace Mono.CSharp {
 		// Register method implementations are either abstract methods
 		// flagged as such on the base class or interface methods
 		//
-		static public PendingImplementation GetPendingImplementations (TypeContainer container)
+		static public PendingImplementation GetPendingImplementations (TypeDefinition container)
 		{
 			TypeSpec b = container.BaseType;
 
@@ -304,11 +305,10 @@ namespace Mono.CSharp {
 							//
 							// First check exact modifiers match
 							//
-							const Parameter.Modifier ref_out = Parameter.Modifier.REF | Parameter.Modifier.OUT;
-							if ((cp[pi].ModFlags & ref_out) == (tp[pi].ModFlags & ref_out))
+							if ((cp[pi].ModFlags & Parameter.Modifier.RefOutMask) == (tp[pi].ModFlags & Parameter.Modifier.RefOutMask))
 								continue;
 
-							if ((cp[pi].ModFlags & tp[pi].ModFlags & Parameter.Modifier.ISBYREF) != 0) {
+							if (((cp[pi].ModFlags | tp[pi].ModFlags) & Parameter.Modifier.RefOutMask) == Parameter.Modifier.RefOutMask) {
 								ref_only_difference = true;
 								continue;
 							}
@@ -442,7 +442,7 @@ namespace Mono.CSharp {
 						optional = tm.optional;
 					}
 
-					if (op == Operation.Lookup && name.Left != null && ambiguousCandidate == null) {
+					if (op == Operation.Lookup && name.ExplicitInterface != null && ambiguousCandidate == null) {
 						ambiguousCandidate = m;
 						continue;
 					}
@@ -507,7 +507,7 @@ namespace Mono.CSharp {
 			}
 
 			int top = param.Count;
-			var ec = new EmitContext (new ProxyMethodContext (container), proxy.GetILGenerator (), null);
+			var ec = new EmitContext (new ProxyMethodContext (container), proxy.GetILGenerator (), null, null);
 			ec.EmitThis ();
 			// TODO: GetAllParametersArguments
 			for (int i = 0; i < top; i++)
@@ -534,10 +534,14 @@ namespace Mono.CSharp {
 			// about mismatch at return type when the check bellow rejects them
 			//
 			var parameters = mi.Parameters;
+			MethodSpec close_match = null;
+
 			while (true) {
 				var candidates = MemberCache.FindMembers (base_type, mi.Name, false);
-				if (candidates == null)
+				if (candidates == null) {
+					base_method = close_match;
 					return false;
+				}
 
 				MethodSpec similar_candidate = null;
 				foreach (var candidate in candidates) {
@@ -548,7 +552,7 @@ namespace Mono.CSharp {
 						continue;
 
 					var candidate_param = ((MethodSpec) candidate).Parameters;
-					if (!TypeSpecComparer.Override.IsSame (parameters.Types, candidate_param.Types))
+					if (!TypeSpecComparer.Override.IsEqual (parameters.Types, candidate_param.Types))
 						continue;
 
 					bool modifiers_match = true;
@@ -556,8 +560,7 @@ namespace Mono.CSharp {
 						//
 						// First check exact ref/out match
 						//
-						const Parameter.Modifier ref_out = Parameter.Modifier.REF | Parameter.Modifier.OUT;
-						if ((parameters.FixedParameters[i].ModFlags & ref_out) == (candidate_param.FixedParameters[i].ModFlags & ref_out))
+						if ((parameters.FixedParameters[i].ModFlags & Parameter.Modifier.RefOutMask) == (candidate_param.FixedParameters[i].ModFlags & Parameter.Modifier.RefOutMask))
 							continue;
 
 						modifiers_match = false;
@@ -565,7 +568,7 @@ namespace Mono.CSharp {
 						//
 						// Different in ref/out only
 						//
-						if ((parameters.FixedParameters[i].ModFlags & candidate_param.FixedParameters[i].ModFlags & Parameter.Modifier.ISBYREF) != 0) {
+						if ((parameters.FixedParameters[i].ModFlags & Parameter.Modifier.RefOutMask) != (candidate_param.FixedParameters[i].ModFlags & Parameter.Modifier.RefOutMask)) {
 							if (similar_candidate == null) {
 								if (!candidate.IsPublic)
 									break;
@@ -588,18 +591,32 @@ namespace Mono.CSharp {
 						continue;
 
 					//
-					// From this point on the candidate is used for detailed error reporting
+					// From this point the candidate is used for detailed error reporting
 					// because it's very close match to what we are looking for
 					//
-					base_method = (MethodSpec) candidate;
+					var m = (MethodSpec) candidate;
 
-					if (!candidate.IsPublic)
-						return false;
+					if (!m.IsPublic) {
+						if (close_match == null)
+							close_match = m;
 
-					if (!TypeSpecComparer.Override.IsEqual (mi.ReturnType, base_method.ReturnType))
-						return false;
-				}
+						continue;
+					}
 
+					if (!TypeSpecComparer.Override.IsEqual (mi.ReturnType, m.ReturnType)) {
+						if (close_match == null)
+							close_match = m;
+
+						continue;
+					}
+						
+					base_method = m;
+
+					if (mi.IsGeneric && !Method.CheckImplementingMethodConstraints (container, m, mi)) {
+						return true;
+					}
+				}
+				
 				if (base_method != null) {
 					if (similar_candidate != null) {
 						Report.SymbolRelatedToPreviousError (similar_candidate);
@@ -614,8 +631,10 @@ namespace Mono.CSharp {
 				}
 
 				base_type = candidates[0].DeclaringType.BaseType;
-				if (base_type == null)
+				if (base_type == null) {
+					base_method = close_match;
 					return false;
+				}
 			}
 
 			if (!base_method.IsVirtual) {
@@ -686,16 +705,16 @@ namespace Mono.CSharp {
 							if (candidate.IsStatic) {
 								Report.Error (736, container.Location,
 									"`{0}' does not implement interface member `{1}' and the best implementing candidate `{2}' is static",
-									container.GetSignatureForError (), mi.GetSignatureForError (), TypeManager.CSharpSignature (candidate));
+									container.GetSignatureForError (), mi.GetSignatureForError (), candidate.GetSignatureForError ());
 							} else if ((candidate.Modifiers & Modifiers.PUBLIC) == 0) {
 								Report.Error (737, container.Location,
-									"`{0}' does not implement interface member `{1}' and the best implementing candidate `{2}' in not public",
+									"`{0}' does not implement interface member `{1}' and the best implementing candidate `{2}' is not public",
 									container.GetSignatureForError (), mi.GetSignatureForError (), candidate.GetSignatureForError ());
 							} else {
 								Report.Error (738, container.Location,
 									"`{0}' does not implement interface member `{1}' and the best implementing candidate `{2}' return type `{3}' does not match interface member return type `{4}'",
-									container.GetSignatureForError (), mi.GetSignatureForError (), TypeManager.CSharpSignature (candidate),
-									TypeManager.CSharpName (candidate.ReturnType), TypeManager.CSharpName (mi.ReturnType));
+									container.GetSignatureForError (), mi.GetSignatureForError (), candidate.GetSignatureForError (),
+									candidate.ReturnType.GetSignatureForError (), mi.ReturnType.GetSignatureForError ());
 							}
 						} else {
 							Report.Error (535, container.Location, "`{0}' does not implement interface member `{1}'",