// Author:
// Miguel de Icaza (miguel@gnu.org)
//
-// Licensed under the terms of the GNU GPL
-//
-// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+// Dual licensed under the terms of the MIT X11 or GNU GPL
//
+// Copyright 2001, 2002 Ximian, Inc (http://www.ximian.com)
+// Copyright 2003-2008 Novell, Inc.
//
using System;
// of methods above.
public Type [][] args;
+ //This is used to store the modifiers of arguments
+ public Parameter.Modifier [][] mods;
+
//
// This flag on the method says `We found a match, but
// because it was private, we could not use the match
//
- public bool [] found;
+ public MethodData [] found;
// If a method is defined here, then we always need to
// create a proxy for it. This is used when implementing
// an interface's indexer with a different IndexerName.
public MethodInfo [] need_proxy;
-
- //
- // The name of the indexer (if it exists), precompute set/get, because
- // they would be recomputed many times inside a loop later on.
- //
- public string set_indexer_name;
- public string get_indexer_name;
}
public class PendingImplementation {
mi = TypeContainer.FindMembers (
current_type, MemberTypes.Method,
- BindingFlags.Public | BindingFlags.Instance |
- BindingFlags.DeclaredOnly,
+ BindingFlags.Public | BindingFlags.NonPublic |
+ BindingFlags.Instance | BindingFlags.DeclaredOnly,
virtual_method_filter, null);
if (current_type == TypeManager.object_type)
pending_implementations = new TypeAndMethods [total];
int i = 0;
- foreach (MissingInterfacesInfo missing in missing_ifaces){
+ if (abstract_methods != null) {
+ int count = abstract_methods.Count;
+ pending_implementations [i].methods = new MethodInfo [count];
+ pending_implementations [i].need_proxy = new MethodInfo [count];
+
+ abstract_methods.CopyTo (pending_implementations [i].methods, 0);
+ pending_implementations [i].found = new MethodData [count];
+ pending_implementations [i].args = new Type [count][];
+ pending_implementations [i].mods = new Parameter.Modifier [count][];
+ pending_implementations [i].type = type_builder;
+
+ int j = 0;
+ foreach (MemberInfo m in abstract_methods) {
+ MethodInfo mi = (MethodInfo) m;
+
+ AParametersCollection pd = TypeManager.GetParameterData (mi);
+ Type [] types = pd.Types;
+
+ pending_implementations [i].args [j] = types;
+ pending_implementations [i].mods [j] = null;
+ if (pd.Count > 0) {
+ Parameter.Modifier [] pm = new Parameter.Modifier [pd.Count];
+ for (int k = 0; k < pd.Count; k++)
+ pm [k] = pd.FixedParameters[k].ModFlags;
+ pending_implementations [i].mods [j] = pm;
+ }
+
+ j++;
+ }
+ ++i;
+ }
+
+ foreach (MissingInterfacesInfo missing in missing_ifaces) {
MethodInfo [] mi;
Type t = missing.Type;
-
+
if (!t.IsInterface)
continue;
TypeContainer iface;
iface = TypeManager.LookupInterface (t);
-
+
mi = iface.GetMethods ();
} else
mi = t.GetMethods ();
-
+
int count = mi.Length;
pending_implementations [i].type = t;
pending_implementations [i].optional = missing.Optional;
pending_implementations [i].methods = mi;
pending_implementations [i].args = new Type [count][];
- pending_implementations [i].found = new bool [count];
+ pending_implementations [i].mods = new Parameter.Modifier [count][];
+ pending_implementations [i].found = new MethodData [count];
pending_implementations [i].need_proxy = new MethodInfo [count];
- string indexer_name = TypeManager.IndexerPropertyName (t);
-
- pending_implementations [i].set_indexer_name = "set_" + indexer_name;
- pending_implementations [i].get_indexer_name = "get_" + indexer_name;
int j = 0;
foreach (MethodInfo m in mi){
- Type [] types = TypeManager.GetArgumentTypes (m);
-
- pending_implementations [i].args [j] = types;
- j++;
- }
- i++;
- }
+ pending_implementations [i].args [j] = Type.EmptyTypes;
+ pending_implementations [i].mods [j] = null;
- if (abstract_methods != null){
- int count = abstract_methods.Count;
- pending_implementations [i].methods = new MethodInfo [count];
- pending_implementations [i].need_proxy = new MethodInfo [count];
-
- abstract_methods.CopyTo (pending_implementations [i].methods, 0);
- pending_implementations [i].found = new bool [count];
- pending_implementations [i].args = new Type [count][];
- pending_implementations [i].type = type_builder;
+ // If there is a previous error, just ignore
+ if (m == null)
+ continue;
- string indexer_name = TypeManager.IndexerPropertyName (type_builder);
- pending_implementations [i].set_indexer_name = "set_" + indexer_name;
- pending_implementations [i].get_indexer_name = "get_" + indexer_name;
-
- int j = 0;
- foreach (MemberInfo m in abstract_methods){
- MethodInfo mi = (MethodInfo) m;
-
- Type [] types = TypeManager.GetArgumentTypes (mi);
-
- pending_implementations [i].args [j] = types;
+ AParametersCollection pd = TypeManager.GetParameterData (m);
+ pending_implementations [i].args [j] = pd.Types;
+
+ if (pd.Count > 0){
+ Parameter.Modifier [] pm = new Parameter.Modifier [pd.Count];
+ for (int k = 0; k < pd.Count; k++)
+ pm [k] = pd.FixedParameters [k].ModFlags;
+ pending_implementations [i].mods [j] = pm;
+ }
+
j++;
}
+ i++;
}
}
for (int i = 0; i < impl.Length; i++)
ret [i] = new MissingInterfacesInfo (impl [i]);
-
+
// we really should not get here because Object doesnt implement any
// interfaces. But it could implement something internal, so we have
// to handle that case.
/// <summary>
/// Whether the specified method is an interface method implementation
/// </summary>
- public MethodInfo IsInterfaceMethod (Type t, string name, Type ret_type, Type [] args)
- {
- return InterfaceMethod (t, name, ret_type, args, Operation.Lookup, null);
- }
-
- public MethodInfo IsInterfaceIndexer (Type t, Type ret_type, Type [] args)
+ public MethodInfo IsInterfaceMethod (string name, Type ifaceType, MethodData method)
{
- return InterfaceMethod (t, null, ret_type, args, Operation.Lookup, null);
+ return InterfaceMethod (name, ifaceType, method, Operation.Lookup);
}
- public void ImplementMethod (Type t, string name, Type ret_type, Type [] args, bool clear_one)
+ public void ImplementMethod (string name, Type ifaceType, MethodData method, bool clear_one)
{
- InterfaceMethod (t, name, ret_type, args,
- clear_one ? Operation.ClearOne : Operation.ClearAll, null);
+ InterfaceMethod (name, ifaceType, method, clear_one ? Operation.ClearOne : Operation.ClearAll);
}
- public void ImplementIndexer (Type t, MethodInfo mi, Type ret_type, Type [] args, bool clear_one)
- {
- InterfaceMethod (t, null, ret_type, args,
- clear_one ? Operation.ClearOne : Operation.ClearAll, mi);
- }
-
/// <remarks>
/// If a method in Type `t' (or null to look in all interfaces
/// and the base abstract class) with name `Name', return type `ret_type' and
/// that was used in the interface, then we always need to create a proxy for it.
///
/// </remarks>
- public MethodInfo InterfaceMethod (Type t, string name, Type ret_type, Type [] args,
- Operation op, MethodInfo need_proxy)
+ public MethodInfo InterfaceMethod (string name, Type iType, MethodData method, Operation op)
{
- int arg_len = args.Length;
-
if (pending_implementations == null)
return null;
+ Type ret_type = method.method.ReturnType;
+ Parameters args = method.method.ParameterInfo;
+ int arg_len = args.Count;
+ bool is_indexer = method.method is Indexer.SetIndexerMethod || method.method is Indexer.GetIndexerMethod;
+
foreach (TypeAndMethods tm in pending_implementations){
- if (!(t == null || tm.type == t))
+ if (!(iType == null || tm.type == iType))
continue;
int method_count = tm.methods.Length;
if (m == null)
continue;
+ //
+ // Check if we have the same parameters
+ //
+
+ if (tm.args [i] == null && arg_len != 0)
+ continue;
+ if (tm.args [i] != null && tm.args [i].Length != arg_len)
+ continue;
+
+ string mname = TypeManager.GetMethodName (m);
+
//
// `need_proxy' is not null when we're implementing an
// interface indexer and this is Clear(One/All) operation.
// signature and not on the name (this is done in the Lookup
// for an interface indexer).
//
- if (name == null){
- if (m.Name != tm.get_indexer_name && m.Name != tm.set_indexer_name)
- continue;
- } else if ((need_proxy == null) && (name != m.Name))
- continue;
- if (ret_type != m.ReturnType){
- if (!((ret_type == null && m.ReturnType == TypeManager.void_type) ||
- (m.ReturnType == null && ret_type == TypeManager.void_type)))
- continue;
+ if (is_indexer) {
+ IMethodData md = TypeManager.GetMethod (m);
+ if (md != null) {
+ if (!(md is Indexer.SetIndexerMethod || md is Indexer.GetIndexerMethod))
+ continue;
+ } else {
+ if (TypeManager.GetPropertyFromAccessor (m) == null)
+ continue;
+ }
+ } else if (name != mname) {
+ continue;
}
- //
- // Check if we have the same parameters
- //
- if (tm.args [i].Length != arg_len)
- continue;
+ int j;
- int j, top = args.Length;
- bool fail = false;
-
- for (j = 0; j < top; j++){
- if (tm.args [i][j] != args[j]){
- fail = true;
+ for (j = 0; j < arg_len; j++) {
+ if (!TypeManager.IsEqual (tm.args [i][j], args.Types [j]))
+ break;
+ if (tm.mods [i][j] == args.FixedParameters [j].ModFlags)
+ continue;
+ // The modifiers are different, but if one of them
+ // is a PARAMS modifier, and the other isn't, ignore
+ // the difference.
+ if (tm.mods [i][j] != Parameter.Modifier.PARAMS &&
+ args.FixedParameters [j].ModFlags != Parameter.Modifier.PARAMS)
break;
- }
}
- if (fail)
+ if (j != arg_len)
continue;
- if (op != Operation.Lookup){
+ if (op != Operation.Lookup) {
// If `t != null', then this is an explicitly interface
// implementation and we can always clear the method.
// `need_proxy' is not null if we're implementing an
// interface indexer. In this case, we need to create
// a proxy if the implementation's IndexerName doesn't
// match the IndexerName in the interface.
- bool name_matches = false;
- if (name == m.Name || m.Name == tm.get_indexer_name || m.Name == tm.set_indexer_name)
- name_matches = true;
-
- if ((t == null) && (need_proxy != null) && !name_matches)
- tm.need_proxy [i] = need_proxy;
- else
+ if (iType == null && name != mname)
+ tm.need_proxy [i] = method.MethodBuilder;
+ else
tm.methods [i] = null;
+ } else {
+ tm.found [i] = method;
}
- tm.found [i] = true;
+
+ Type rt = TypeManager.TypeToCoreType (m.ReturnType);
+ if (!TypeManager.IsEqual (ret_type, rt) &&
+ !(ret_type == null && rt == TypeManager.void_type) &&
+ !(rt == null && ret_type == TypeManager.void_type))
+ continue;
//
// Lookups and ClearOne return
}
// If a specific type was requested, we can stop now.
- if (tm.type == t)
+ if (tm.type == iType)
return null;
}
return null;
/// I.M in Y.
/// </summary>
void DefineProxy (Type iface, MethodInfo base_method, MethodInfo iface_method,
- Type [] args)
+ AParametersCollection param)
{
MethodBuilder proxy;
- string proxy_name = iface.Name + "." + iface_method.Name;
+ string proxy_name = SimpleName.RemoveGenericArity (iface.Name) + '.' + iface_method.Name;
proxy = container.TypeBuilder.DefineMethod (
proxy_name,
MethodAttributes.NewSlot |
MethodAttributes.Virtual,
CallingConventions.Standard | CallingConventions.HasThis,
- base_method.ReturnType, args);
+ base_method.ReturnType, param.GetEmitTypes ());
+
+ AParametersCollection pd = TypeManager.GetParameterData (iface_method);
+ proxy.DefineParameter (0, ParameterAttributes.None, "");
+ for (int i = 0; i < pd.Count; i++) {
+ string name = pd.FixedParameters [i].Name;
+ ParameterAttributes attr = Parameters.GetParameterAttribute (pd.FixedParameters [i].ModFlags);
+ proxy.DefineParameter (i + 1, attr, name);
+ }
- int top = args.Length;
+ int top = param.Count;
ILGenerator ig = proxy.GetILGenerator ();
- ig.Emit (OpCodes.Ldarg_0);
- for (int i = 0; i < top; i++){
- switch (i){
- case 0:
- ig.Emit (OpCodes.Ldarg_1); break;
- case 1:
- ig.Emit (OpCodes.Ldarg_2); break;
- case 2:
- ig.Emit (OpCodes.Ldarg_3); break;
- default:
- ig.Emit (OpCodes.Ldarg, i - 1); break;
- }
- }
+ for (int i = 0; i <= top; i++)
+ ParameterReference.EmitLdArg (ig, i);
+
ig.Emit (OpCodes.Call, base_method);
ig.Emit (OpCodes.Ret);
/// the given method (which turns out, it is valid to have an interface
/// implementation in a base
/// </summary>
- bool BaseImplements (Type iface_type, MethodInfo mi)
+ bool BaseImplements (Type iface_type, MethodInfo mi, out MethodInfo base_method)
{
MethodSignature ms;
- Type [] args = TypeManager.GetArgumentTypes (mi);
- ms = new MethodSignature (mi.Name, mi.ReturnType, args);
+ AParametersCollection param = TypeManager.GetParameterData (mi);
+ ms = new MethodSignature (mi.Name, TypeManager.TypeToCoreType (mi.ReturnType), param.Types);
MemberList list = TypeContainer.FindMembers (
container.TypeBuilder.BaseType, MemberTypes.Method | MemberTypes.Property,
BindingFlags.Public | BindingFlags.Instance,
MethodSignature.method_signature_filter, ms);
- if (list.Count == 0)
+ if (list.Count == 0) {
+ base_method = null;
return false;
+ }
+
+ if (TypeManager.ImplementsInterface (container.TypeBuilder.BaseType, iface_type)) {
+ base_method = null;
+ return true;
+ }
+
+ base_method = (MethodInfo) list [0];
+
+ if (base_method.DeclaringType.IsInterface)
+ return false;
+
+ if (!base_method.IsPublic)
+ return false;
+
+ if (!base_method.IsAbstract && !base_method.IsVirtual)
+ // FIXME: We can avoid creating a proxy if base_method can be marked 'final virtual' instead.
+ // However, it's too late now, the MethodBuilder has already been created (see bug 377519)
+ DefineProxy (iface_type, base_method, mi, param);
- MethodInfo base_method = (MethodInfo) list [0];
- if (!base_method.IsAbstract)
- DefineProxy (iface_type, base_method, mi, args);
return true;
}
Type type = pending_implementations [i].type;
int j = 0;
+ bool base_implements_type = type.IsInterface &&
+ container.TypeBuilder.BaseType != null &&
+ TypeManager.ImplementsInterface (container.TypeBuilder.BaseType, type);
+
foreach (MethodInfo mi in pending_implementations [i].methods){
if (mi == null)
continue;
pending_implementations [i].need_proxy [j];
if (need_proxy != null) {
- Type [] args = TypeManager.GetArgumentTypes (mi);
- DefineProxy (type, need_proxy, mi, args);
+ DefineProxy (type, need_proxy, mi, TypeManager.GetParameterData (mi));
continue;
}
- if (BaseImplements (type, mi))
+ if (pending_implementations [i].optional)
continue;
- if (pending_implementations [i].optional)
+ MethodInfo candidate = null;
+ if (base_implements_type || BaseImplements (type, mi, out candidate))
continue;
-
- if (pending_implementations [i].found [j]) {
- string[] methodLabel = TypeManager.CSharpSignature (mi).Split ('.');
- Report.Error (536, container.Location,
- "'{0}' does not implement interface member '{1}'. '{2}.{3}' " +
- "is either static, not public, or has the wrong return type",
- container.Name, TypeManager.CSharpSignature (mi),
- container.Name, methodLabel[methodLabel.Length - 1]);
+
+ if (candidate == null) {
+ MethodData md = pending_implementations [i].found [j];
+ if (md != null)
+ candidate = md.MethodBuilder;
}
- else {
- Report.Error (535, container.Location, "'{0}' does not implement interface member '{1}'",
- container.Name, TypeManager.CSharpSignature (mi));
+
+ Report.SymbolRelatedToPreviousError (mi);
+ if (candidate != null) {
+ Report.SymbolRelatedToPreviousError (candidate);
+ 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 (), TypeManager.CSharpSignature (mi, true), TypeManager.CSharpSignature (candidate));
+ } else if (!candidate.IsPublic) {
+ Report.Error (737, container.Location,
+ "`{0}' does not implement interface member `{1}' and the best implementing candidate `{2}' in not public",
+ container.GetSignatureForError (), TypeManager.CSharpSignature (mi, true), TypeManager.CSharpSignature (candidate));
+ } 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 (), TypeManager.CSharpSignature (mi, true), TypeManager.CSharpSignature (candidate),
+ TypeManager.CSharpName (candidate.ReturnType), TypeManager.CSharpName (mi.ReturnType));
+ }
+ } else {
+ Report.Error (535, container.Location, "`{0}' does not implement interface member `{1}'",
+ container.GetSignatureForError (), TypeManager.CSharpSignature (mi, true));
}
} else {
- Report.Error (534, container.Location, "'{0}' does not implement inherited abstract member '{1}'",
- container.Name, TypeManager.CSharpSignature (mi));
+ Report.Error (534, container.Location, "`{0}' does not implement inherited abstract member `{1}'",
+ container.GetSignatureForError (), TypeManager.CSharpSignature (mi, true));
}
errors = true;
j++;
projects / mono.git / blobdiff