foreach (MemberInfo m in abstract_methods) {
MethodInfo mi = (MethodInfo) m;
- ParameterData pd = TypeManager.GetParameterData (mi);
+ AParametersCollection pd = TypeManager.GetParameterData (mi);
Type [] types = pd.Types;
pending_implementations [i].args [j] = types;
if (pd.Count > 0) {
Parameter.Modifier [] pm = new Parameter.Modifier [pd.Count];
for (int k = 0; k < pd.Count; k++)
- pm [k] = pd.ParameterModifier (k);
+ pm [k] = pd.FixedParameters[k].ModFlags;
pending_implementations [i].mods [j] = pm;
}
if (m == null)
continue;
- ParameterData pd = TypeManager.GetParameterData (m);
+ 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.ParameterModifier (k);
+ pm [k] = pd.FixedParameters [k].ModFlags;
pending_implementations [i].mods [j] = pm;
}
int j;
for (j = 0; j < arg_len; j++) {
- if (!TypeManager.IsEqual (tm.args [i][j], args.ParameterType (j)))
+ if (!TypeManager.IsEqual (tm.args [i][j], args.Types [j]))
break;
- if (tm.mods [i][j] == args.ParameterModifier (j))
+ 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.ParameterModifier (j) != Parameter.Modifier.PARAMS)
+ args.FixedParameters [j].ModFlags != Parameter.Modifier.PARAMS)
break;
}
if (j != arg_len)
/// I.M in Y.
/// </summary>
void DefineProxy (Type iface, MethodInfo base_method, MethodInfo iface_method,
- Type [] args)
+ AParametersCollection param)
{
MethodBuilder proxy;
MethodAttributes.NewSlot |
MethodAttributes.Virtual,
CallingConventions.Standard | CallingConventions.HasThis,
- base_method.ReturnType, args);
+ base_method.ReturnType, param.GetEmitTypes ());
- ParameterData pd = TypeManager.GetParameterData (iface_method);
+ AParametersCollection pd = TypeManager.GetParameterData (iface_method);
proxy.DefineParameter (0, ParameterAttributes.None, "");
for (int i = 0; i < pd.Count; i++) {
- string name = pd.ParameterName (i);
- ParameterAttributes attr = Parameter.GetParameterAttributes (pd.ParameterModifier (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 ();
for (int i = 0; i <= top; i++)
{
MethodSignature ms;
- Type [] args = TypeManager.GetParameterData (mi).Types;
- ms = new MethodSignature (mi.Name, TypeManager.TypeToCoreType (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,
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, args);
+ DefineProxy (iface_type, base_method, mi, param);
return true;
}
pending_implementations [i].need_proxy [j];
if (need_proxy != null) {
- Type [] args = TypeManager.GetParameterData (mi).Types;
- DefineProxy (type, need_proxy, mi, args);
+ DefineProxy (type, need_proxy, mi, TypeManager.GetParameterData (mi));
continue;
}
Report.SymbolRelatedToPreviousError (mi);
if (candidate != null) {
- if (mi.IsSpecialName) {
- string name = TypeManager.CSharpName (mi.DeclaringType) + '.' + mi.Name.Substring (4);
- Report.Error (551, container.Location, "Explicit interface implementation `{0}.{1}' is missing accessor `{2}'",
- container.GetSignatureForError (), name, TypeManager.CSharpSignature (mi, true));
+ 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.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));
- }
+ 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 {
+ } else {
Report.Error (535, container.Location, "`{0}' does not implement interface member `{1}'",
container.GetSignatureForError (), TypeManager.CSharpSignature (mi, true));
}
projects / mono.git / blobdiff