public MemberList FindMembers (MemberTypes mt, BindingFlags bf,
MemberFilter filter, object criteria)
{
- if (constraints == null)
+ if (gc == null)
return MemberList.Empty;
ArrayList members = new ArrayList ();
if (te is TypeParameterExpr)
has_type_args = true;
+#if !MS_COMPATIBLE
if (te.Type.IsSealed && te.Type.IsAbstract) {
Report.Error (718, Location, "`{0}': static classes cannot be used as generic arguments",
te.GetSignatureForError ());
return false;
}
+#endif
if (te.Type.IsPointer) {
Report.Error (306, Location, "The type `{0}' may not be used " +
"as a type argument", TypeManager.CSharpName (te.Type));
public override bool AsAccessible (DeclSpace ds, int flags)
{
+ foreach (Type t in atypes) {
+ if (!ds.AsAccessible (t, flags))
+ return false;
+ }
+
return ds.AsAccessible (gt, flags);
}
if (agc != null) {
if (agc is Constraints)
((Constraints) agc).Resolve (ec);
- is_class = agc.HasReferenceTypeConstraint;
- is_struct = agc.HasValueTypeConstraint;
+ is_class = agc.IsReferenceType;
+ is_struct = agc.IsValueType;
} else {
is_class = is_struct = false;
}
/// Check whether `a' and `b' may become equal generic types.
/// The algorithm to do that is a little bit complicated.
/// </summary>
- public static bool MayBecomeEqualGenericTypes (Type a, Type b, Type[] class_infered,
- Type[] method_infered)
+ public static bool MayBecomeEqualGenericTypes (Type a, Type b, Type[] class_inferred,
+ Type[] method_inferred)
{
if (a.IsGenericParameter) {
//
//
if (b.IsGenericParameter || !b.IsGenericType) {
int pos = a.GenericParameterPosition;
- Type[] args = a.DeclaringMethod != null ? method_infered : class_infered;
+ Type[] args = a.DeclaringMethod != null ? method_inferred : class_inferred;
if (args [pos] == null) {
args [pos] = b;
return true;
}
if (b.IsGenericParameter)
- return MayBecomeEqualGenericTypes (b, a, class_infered, method_infered);
+ return MayBecomeEqualGenericTypes (b, a, class_inferred, method_inferred);
//
// At this point, neither a nor b are a type parameter.
//
if (a.IsGenericType || b.IsGenericType)
- return MayBecomeEqualGenericInstances (a, b, class_infered, method_infered);
+ return MayBecomeEqualGenericInstances (a, b, class_inferred, method_inferred);
//
// If both of them are arrays.
a = a.GetElementType ();
b = b.GetElementType ();
- return MayBecomeEqualGenericTypes (a, b, class_infered, method_infered);
+ return MayBecomeEqualGenericTypes (a, b, class_inferred, method_inferred);
}
//
// particular instantiation (26.3.1).
//
public static bool MayBecomeEqualGenericInstances (Type a, Type b,
- Type[] class_infered,
- Type[] method_infered)
+ Type[] class_inferred,
+ Type[] method_inferred)
{
if (!a.IsGenericType || !b.IsGenericType)
return false;
return false;
return MayBecomeEqualGenericInstances (
- GetTypeArguments (a), GetTypeArguments (b), class_infered, method_infered);
+ GetTypeArguments (a), GetTypeArguments (b), class_inferred, method_inferred);
}
public static bool MayBecomeEqualGenericInstances (Type[] aargs, Type[] bargs,
- Type[] class_infered,
- Type[] method_infered)
+ Type[] class_inferred,
+ Type[] method_inferred)
{
if (aargs.Length != bargs.Length)
return false;
for (int i = 0; i < aargs.Length; i++) {
- if (!MayBecomeEqualGenericTypes (aargs [i], bargs [i], class_infered, method_infered))
+ if (!MayBecomeEqualGenericTypes (aargs [i], bargs [i], class_inferred, method_inferred))
return false;
}
return true;
}
- //
- // Type inference.
- //
-
- static bool InferType (Type pt, Type at, Type[] infered)
+ static bool UnifyType (Type pt, Type at, Type[] inferred)
{
if (pt.IsGenericParameter) {
if (pt.DeclaringMethod == null)
int pos = pt.GenericParameterPosition;
- if (infered [pos] == null) {
- infered [pos] = at;
- return true;
- }
-
- if (infered [pos] != at)
- return false;
+ if (inferred [pos] == null)
+ inferred [pos] = at;
- return true;
+ return inferred [pos] == at;
}
if (!pt.ContainsGenericParameters) {
if (at.ContainsGenericParameters)
- return InferType (at, pt, infered);
+ return UnifyType (at, pt, inferred);
else
return true;
}
if (at.GetArrayRank () != pt.GetArrayRank ())
return false;
- return InferType (pt.GetElementType (), at.GetElementType (), infered);
+ return UnifyType (pt.GetElementType (), at.GetElementType (), inferred);
}
if (!pt.IsGenericType)
return false;
Type[] args = GetTypeArguments (pt);
- return InferType (args [0], at.GetElementType (), infered);
+ return UnifyType (args [0], at.GetElementType (), inferred);
}
if (pt.IsArray) {
(pt.GetArrayRank () != at.GetArrayRank ()))
return false;
- return InferType (pt.GetElementType (), at.GetElementType (), infered);
+ return UnifyType (pt.GetElementType (), at.GetElementType (), inferred);
}
if (pt.IsByRef && at.IsByRef)
- return InferType (pt.GetElementType (), at.GetElementType (), infered);
+ return UnifyType (pt.GetElementType (), at.GetElementType (), inferred);
ArrayList list = new ArrayList ();
if (at.IsGenericType)
list.Add (at);
list.AddRange (TypeManager.GetInterfaces (at));
- bool found_one = false;
-
foreach (Type type in list) {
if (!type.IsGenericType)
continue;
- Type[] infered_types = new Type [infered.Length];
-
- if (!InferGenericInstance (pt, type, infered_types))
+ if (DropGenericTypeArguments (pt) != DropGenericTypeArguments (type))
continue;
- for (int i = 0; i < infered_types.Length; i++) {
- if (infered [i] == null) {
- infered [i] = infered_types [i];
- continue;
- }
-
- if (infered [i] != infered_types [i])
- return false;
- }
-
- found_one = true;
+ if (!UnifyTypes (pt.GetGenericArguments (), type.GetGenericArguments (), inferred))
+ return false;
}
- return found_one;
+ return true;
}
- static bool InferGenericInstance (Type pt, Type at, Type[] infered_types)
+ static bool UnifyTypes (Type[] pts, Type [] ats, Type [] inferred)
{
- Type[] at_args = at.GetGenericArguments ();
- Type[] pt_args = pt.GetGenericArguments ();
-
- if (at_args.Length != pt_args.Length)
- return false;
-
- for (int i = 0; i < at_args.Length; i++) {
- if (!InferType (pt_args [i], at_args [i], infered_types))
- return false;
- }
-
- for (int i = 0; i < infered_types.Length; i++) {
- if (infered_types [i] == null)
+ for (int i = 0; i < ats.Length; i++) {
+ if (!UnifyType (pts [i], ats [i], inferred))
return false;
}
-
return true;
}
return false;
Type[] method_args = method.GetGenericArguments ();
- Type[] infered_types = new Type [method_args.Length];
+ Type[] inferred_types = new Type [method_args.Length];
//
// If we have come this far, the case which
Type pt = pd.ParameterType (i);
Type at = a.Type;
- if (!InferType (pt, at, infered_types))
+ if (!UnifyType (pt, at, inferred_types))
return false;
}
if ((a.Expr is NullLiteral) || (a.Expr is MethodGroupExpr))
continue;
- if (!InferType (element_type, a.Type, infered_types))
+ if (!UnifyType (element_type, a.Type, inferred_types))
return false;
}
- for (int i = 0; i < infered_types.Length; i++)
- if (infered_types [i] == null)
+ for (int i = 0; i < inferred_types.Length; i++)
+ if (inferred_types [i] == null)
return false;
- method = ((MethodInfo)method).MakeGenericMethod (infered_types);
+ method = ((MethodInfo)method).MakeGenericMethod (inferred_types);
return true;
}
static bool InferTypeArguments (Type[] param_types, Type[] arg_types,
- Type[] infered_types)
+ Type[] inferred_types)
{
- if (infered_types == null)
- return false;
-
for (int i = 0; i < arg_types.Length; i++) {
if (arg_types [i] == null)
continue;
- if (!InferType (param_types [i], arg_types [i], infered_types))
+ if (!UnifyType (param_types [i], arg_types [i], inferred_types))
return false;
}
- for (int i = 0; i < infered_types.Length; i++)
- if (infered_types [i] == null)
+ for (int i = 0; i < inferred_types.Length; i++)
+ if (inferred_types [i] == null)
return false;
return true;
if (!is_open)
return !TypeManager.IsGenericMethodDefinition (method);
- Type[] infered_types = new Type [method_args.Length];
+ Type[] inferred_types = new Type [method_args.Length];
Type[] param_types = new Type [pd.Count];
Type[] arg_types = new Type [pd.Count];
arg_types [i] = a.Type;
}
- if (!InferTypeArguments (param_types, arg_types, infered_types))
+ if (!InferTypeArguments (param_types, arg_types, inferred_types))
return false;
- method = ((MethodInfo)method).MakeGenericMethod (infered_types);
+ method = ((MethodInfo)method).MakeGenericMethod (inferred_types);
return true;
}
return false;
Type[] method_args = method.GetGenericArguments ();
- Type[] infered_types = new Type [method_args.Length];
+ Type[] inferred_types = new Type [method_args.Length];
Type[] param_types = new Type [pd.Count];
Type[] arg_types = new Type [pd.Count];
arg_types [i] = apd.ParameterType (i);
}
- if (!InferTypeArguments (param_types, arg_types, infered_types))
+ if (!InferTypeArguments (param_types, arg_types, inferred_types))
return false;
- method = ((MethodInfo)method).MakeGenericMethod (infered_types);
+ method = ((MethodInfo)method).MakeGenericMethod (inferred_types);
return true;
}
}
return this;
}
- if (unwrap != null) {
- expr = Convert.ImplicitConversion (ec, unwrap, rtype, loc);
- if (expr != null) {
- left = expr;
- expr = right;
- type = expr.Type;
- return this;
- }
+ Expression left_null = unwrap != null ? unwrap : left;
+ expr = Convert.ImplicitConversion (ec, left_null, rtype, loc);
+ if (expr != null) {
+ left = expr;
+ expr = right;
+ type = rtype;
+ return this;
}
Binary.Error_OperatorCannotBeApplied (loc, "??", ltype, rtype);
projects / mono.git / blobdiff