for (int current = 0; current < count; current++)
{
- int level = GetDerivedLevel (match[current].DeclaringType);
+ MethodBase m = match [current];
+ int level = GetDerivedLevel (m.DeclaringType);
if (level == highLevel)
throw new AmbiguousMatchException ();
+ // If the argument types differ we
+ // have an ambigous match, as well
+ if (matchId >= 0) {
+ ParameterInfo[] p1 = m.GetParameters ();
+ ParameterInfo[] p2 = match [matchId].GetParameters ();
+ bool equal = true;
+
+ if (p1.Length != p2.Length)
+ equal = false;
+ else {
+ int i;
+
+ for (i = 0; i < p1.Length; ++i) {
+ if (p1 [i].ParameterType != p2 [i].ParameterType) {
+ equal = false;
+ break;
+ }
+ }
+ }
+
+ if (!equal)
+ throw new AmbiguousMatchException ();
+ }
if (level > highLevel)
{
return null;
}
- [MonoTODO]
+ //
+ // FIXME: There was a MonoTODO, but it does not explain what the problem is
+ //
public override MethodBase BindToMethod (BindingFlags bindingAttr, MethodBase[] match, ref object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] names, out object state)
{
Type[] types;
}
MethodBase selected = SelectMethod (bindingAttr, match, types, modifiers);
state = null;
+ if (names != null)
+ ReorderParameters (names, ref args, selected);
return selected;
}
+ void ReorderParameters (string [] names, ref object [] args, MethodBase selected)
+ {
+ object [] newArgs = new object [args.Length];
+ Array.Copy (args, newArgs, args.Length);
+ ParameterInfo [] plist = selected.GetParameters ();
+ for (int n = 0; n < names.Length; n++)
+ for (int p = 0; p < plist.Length; p++) {
+ if (names [n] == plist [p].Name) {
+ newArgs [p] = args [n];
+ break;
+ }
+ }
+ Array.Copy (newArgs, args, args.Length);
+ }
+
static bool IsArrayAssignable (Type object_type, Type target_type)
{
if (object_type.IsArray && target_type.IsArray)
return value;
}
- if (check_type (vtype, type))
+ if (check_type (vtype, type)) {
+ // These are not supported by Convert
+ if (type.IsEnum)
+ return Enum.ToObject (type, value);
+ if (vtype == typeof (Char)) {
+ if (type == typeof (double))
+ return (double)(char)value;
+ if (type == typeof (float))
+ return (float)(char)value;
+ }
return Convert.ChangeType (value, type);
+ }
return null;
}
- [MonoTODO]
+ [MonoTODO ("This method does not do anything in Mono")]
public override void ReorderArgumentArray (ref object[] args, object state)
{
//do nothing until we support named arguments
if (from == null)
return true;
- TypeCode fromt = Type.GetTypeCode (from);
- TypeCode tot = Type.GetTypeCode (to);
-
if (to.IsByRef != from.IsByRef)
return false;
if (to.IsInterface)
return to.IsAssignableFrom (from);
+ if (to.IsEnum) {
+ to = Enum.GetUnderlyingType (to);
+ if (from == to)
+ return true;
+ }
+
+ TypeCode fromt = Type.GetTypeCode (from);
+ TypeCode tot = Type.GetTypeCode (to);
+
switch (fromt) {
case TypeCode.Char:
switch (tot) {
return m;
}
+ /* Try methods with ParamArray attribute */
+ bool isdefParamArray = false;
+ Type elementType = null;
+ for (i = 0; i < match.Length; ++i) {
+ m = match [i];
+ ParameterInfo[] args = m.GetParameters ();
+ if (args.Length > types.Length)
+ continue;
+ else if (args.Length == 0)
+ continue;
+ isdefParamArray = Attribute.IsDefined (args [args.Length - 1], typeof (ParamArrayAttribute));
+ if (!isdefParamArray)
+ continue;
+ elementType = args [args.Length - 1].ParameterType.GetElementType ();
+ for (j = 0; j < types.Length; ++j) {
+ if (j < (args.Length - 1) && types [j] != args [j].ParameterType)
+ break;
+ else if (j >= (args.Length - 1) && types [j] != elementType)
+ break;
+ }
+ if (j == types.Length)
+ return m;
+ }
+
+ if ((int)(bindingAttr & BindingFlags.ExactBinding) != 0)
+ return null;
+
MethodBase result = null;
for (i = 0; i < match.Length; ++i) {
m = match [i];
continue;
if (result != null)
- throw new AmbiguousMatchException ();
-
- result = m;
+ result = GetBetterMethod (result, m, types);
+ else
+ result = m;
}
return result;
}
+ MethodBase GetBetterMethod (MethodBase m1, MethodBase m2, Type [] types)
+ {
+#if NET_2_0
+ if (m1.IsGenericMethodDefinition &&
+ !m2.IsGenericMethodDefinition)
+ return m2;
+ if (m2.IsGenericMethodDefinition &&
+ !m1.IsGenericMethodDefinition)
+ return m1;
+#endif
+
+ ParameterInfo [] pl1 = m1.GetParameters ();
+ ParameterInfo [] pl2 = m2.GetParameters ();
+ int prev = 0;
+ for (int i = 0; i < pl1.Length; i++) {
+ int cmp = CompareCloserType (pl1 [i].ParameterType, pl2 [i].ParameterType);
+ if (cmp != 0 && prev != 0 && prev != cmp)
+ throw new AmbiguousMatchException ();
+ if (cmp != 0)
+ prev = cmp;
+ }
+ if (prev != 0)
+ return prev > 0 ? m2 : m1;
+
+ Type dt1 = m1.DeclaringType;
+ Type dt2 = m2.DeclaringType;
+ if (dt1 != dt2) {
+ if (dt1.IsSubclassOf(dt2))
+ return m1;
+ if (dt2.IsSubclassOf(dt1))
+ return m2;
+ }
+
+ bool va1 = (m1.CallingConvention & CallingConventions.VarArgs) != 0;
+ bool va2 = (m2.CallingConvention & CallingConventions.VarArgs) != 0;
+ if (va1 && !va2)
+ return m2;
+ if (va2 && !va1)
+ return m1;
+
+ throw new AmbiguousMatchException ();
+ }
+
+ int CompareCloserType (Type t1, Type t2)
+ {
+ if (t1 == t2)
+ return 0;
+#if NET_2_0
+ if (t1.IsGenericParameter && !t2.IsGenericParameter)
+ return 1; // t2
+ if (!t1.IsGenericParameter && t2.IsGenericParameter)
+ return -1; // t1
+#endif
+ if (t1.HasElementType && t2.HasElementType)
+ return CompareCloserType (
+ t1.GetElementType (),
+ t2.GetElementType ());
+
+ if (t1.IsSubclassOf (t2))
+ return -1; // t1
+ if (t2.IsSubclassOf (t1))
+ return 1; // t2
+
+ if (t1.IsInterface && Array.IndexOf (t2.GetInterfaces (), t1) >= 0)
+ return 1; // t2
+ if (t2.IsInterface && Array.IndexOf (t1.GetInterfaces (), t2) >= 0)
+ return -1; // t1
+
+ // What kind of cases could reach here?
+ return 0;
+ }
+
public override PropertyInfo SelectProperty (BindingFlags bindingAttr, PropertyInfo[] match, Type returnType, Type[] indexes, ParameterModifier[] modifiers)
{
if (match == null || match.Length == 0)
if (idxlen >= 0 && idxlen != args.Length)
continue;
- if (haveRet && !check_type (p.PropertyType, returnType))
+ if (haveRet && p.PropertyType != returnType)
continue;
int score = Int32.MaxValue - 1;
projects / mono.git / blobdiff