}
int errors = Report.Errors;
- FullNamedExpression fn = ((Expression) obj).ResolveAsTypeStep (ec);
+ FullNamedExpression fn = ((Expression) obj).ResolveAsTypeStep (ec, false);
if (fn == null) {
if (errors != Report.Errors)
return false;
- Report.Error (246, loc, "Cannot find type '{0}'", obj);
+ Report.Error (246, loc, "Cannot find type '{0}'", ((Expression) obj).GetSignatureForError ());
return false;
}
expr = cexpr;
} else
- expr = fn.ResolveAsTypeTerminal (ec);
+ expr = fn.ResolveAsTypeTerminal (ec, false);
if ((expr == null) || (expr.Type == null))
return false;
Report.Error (405, loc,
"Duplicate constraint `{0}' for type " +
- "parameter `{1}'.", iface_constraint.Type,
+ "parameter `{1}'.", iface_constraint.GetSignatureForError (),
name);
return false;
}
Report.Error (405, loc,
"Duplicate constraint `{0}' for type " +
- "parameter `{1}'.", expr.Type, name);
+ "parameter `{1}'.", expr.GetSignatureForError (), name);
return false;
}
Report.Error (701, loc,
"`{0}' is not a valid bound. Bounds " +
"must be interfaces or non sealed " +
- "classes", class_constraint_type);
+ "classes", TypeManager.CSharpName (class_constraint_type));
return false;
}
(class_constraint_type == TypeManager.object_type)) {
Report.Error (702, loc,
"Bound cannot be special class `{0}'",
- class_constraint_type);
+ TypeManager.CSharpName (class_constraint_type));
return false;
}
}
if (HasValueTypeConstraint && constraints.HasClassConstraint) {
Report.Error (455, loc, "Type parameter `{0}' inherits " +
"conflicting constraints `{1}' and `{2}'",
- name, constraints.ClassConstraint,
+ name, TypeManager.CSharpName (constraints.ClassConstraint),
"System.ValueType");
return false;
}
Report.Error (455, loc,
"Type parameter `{0}' inherits " +
"conflicting constraints `{1}' and `{2}'",
- name, t1, t2);
+ name, TypeManager.CSharpName (t1), TypeManager.CSharpName (t2));
return false;
}
}
return true;
}
- /// <summary>
- /// Set the attributes on the GenericTypeParameterBuilder.
- /// </summary>
- /// <remarks>
- /// This is not done in Resolve() since Resolve() may be called before
- /// the GenericTypeParameterBuilder is created (partial generic classes).
- /// </remarks>
- public void Define (GenericTypeParameterBuilder type)
- {
- type.SetGenericParameterAttributes (attrs);
- }
-
public override GenericParameterAttributes Attributes {
get { return attrs; }
}
Location loc;
GenericTypeParameterBuilder type;
- public TypeParameter (TypeContainer parent, DeclSpace decl, string name,
- Constraints constraints, Location loc)
- : base (parent, new MemberName (name, loc), null)
+ public TypeParameter (DeclSpace parent, DeclSpace decl, string name,
+ Constraints constraints, Attributes attrs, Location loc)
+ : base (parent, new MemberName (name, loc), attrs)
{
this.name = name;
this.decl = decl;
/// <summary>
/// This is the third method which is called during the resolving
- /// process. We're called immediately after calling Resolve() on
- /// all of the current class'es type parameters.
- ///
- /// All we do is setting the attributes on the GenericTypeParameterBuilder.
- /// </summary>
- /// <remarks>
- /// This is not done in Resolve() since Resolve() may be called before
- /// Define() for partial generic classes.
- /// </remarks>
- public void DefineConstraints ()
- {
- if (constraints != null)
- constraints.Define (type);
- }
-
- /// <summary>
- /// This is the forth method which is called during the resolving
/// process. We're called immediately after calling DefineConstraints()
/// on all of the current class'es type parameters.
///
}
/// <summary>
- /// This is the fith and last method which is called during the resolving
+ /// This is the fourth and last method which is called during the resolving
/// process. We're called after everything is fully resolved and actually
/// register the constraints with SRE and the TypeManager.
/// </summary>
return false;
}
- MethodBase mb = implementing;
- if (mb.Mono_IsInflatedMethod)
- mb = mb.GetGenericMethodDefinition ();
+ MethodBase mb = TypeManager.DropGenericMethodArguments (implementing);
int pos = type.GenericParameterPosition;
- ParameterData pd = TypeManager.GetParameterData (mb);
- GenericConstraints temp_gc = pd.GenericConstraints (pos);
Type mparam = mb.GetGenericArguments () [pos];
+ GenericConstraints temp_gc = ReflectionConstraints.GetConstraints (mparam);
if (temp_gc != null)
gc = new InflatedConstraints (temp_gc, implementing.DeclaringType);
425, loc, "The constraints for type " +
"parameter `{0}' of method `{1}' must match " +
"the constraints for type parameter `{2}' " +
- "of interface method `{3}'. Consider using " +
+ "of interface method `{3}'. Consider using " +
"an explicit interface implementation instead",
Name, TypeManager.CSharpSignature (builder),
- mparam, TypeManager.CSharpSignature (mb));
+ TypeManager.CSharpName (mparam), TypeManager.CSharpSignature (mb));
return false;
}
} else if (DeclSpace is Iterator) {
type.SetBaseTypeConstraint (gc.ClassConstraint);
type.SetInterfaceConstraints (gc.InterfaceConstraints);
+ type.SetGenericParameterAttributes (gc.Attributes);
TypeManager.RegisterBuilder (type, gc.InterfaceConstraints);
return true;
return constraints.CheckInterfaceMethod (ec, new_constraints);
}
+ public void EmitAttributes (EmitContext ec)
+ {
+ if (OptAttributes != null)
+ OptAttributes.Emit (ec, this);
+ }
+
public override string DocCommentHeader {
get {
throw new InvalidOperationException (
public override void ApplyAttributeBuilder (Attribute a,
CustomAttributeBuilder cb)
- { }
+ {
+ type.SetCustomAttribute (cb);
+ }
public override AttributeTargets AttributeTargets {
get {
- return (AttributeTargets) 0;
+ return (AttributeTargets) AttributeTargets.GenericParameter;
}
}
public override string[] ValidAttributeTargets {
get {
- return new string [0];
+ return new string [] { "type parameter" };
}
}
ArrayList members = new ArrayList ();
- GenericConstraints gc = (GenericConstraints) constraints;
-
if (gc.HasClassConstraint) {
MemberList list = TypeManager.FindMembers (
gc.ClassConstraint, mt, bf, filter, criteria);
return "TypeParameter[" + name + "]";
}
+ public static string GetSignatureForError (TypeParameter[] tp)
+ {
+ if (tp == null || tp.Length == 0)
+ return "";
+
+ StringBuilder sb = new StringBuilder ("<");
+ for (int i = 0; i < tp.Length; ++i) {
+ if (i > 0)
+ sb.Append (",");
+ sb.Append (tp[i].GetSignatureForError ());
+ }
+ sb.Append ('>');
+ return sb.ToString ();
+ }
+
+ public void InflateConstraints (Type declaring)
+ {
+ if (constraints != null)
+ gc = new InflatedConstraints (constraints, declaring);
+ }
+
protected class InflatedConstraints : GenericConstraints
{
GenericConstraints gc;
return null;
if (t.IsGenericParameter)
return dargs [t.GenericParameterPosition];
- if (t.IsGenericInstance) {
+ if (t.IsGenericType) {
t = t.GetGenericTypeDefinition ();
t = t.MakeGenericType (dargs);
}
/// parser creates a `MemberName' with `TypeArguments' for both cases and
/// in case of a generic type definition, we call GetDeclarations().
/// </summary>
- public string[] GetDeclarations ()
+ public TypeParameterName[] GetDeclarations ()
{
- string[] ret = new string [args.Count];
+ TypeParameterName[] ret = new TypeParameterName [args.Count];
for (int i = 0; i < args.Count; i++) {
+ TypeParameterName name = args [i] as TypeParameterName;
+ if (name != null) {
+ ret [i] = name;
+ continue;
+ }
SimpleName sn = args [i] as SimpleName;
if (sn != null) {
- ret [i] = sn.Name;
+ ret [i] = new TypeParameterName (sn.Name, null, sn.Location);
continue;
}
atypes = new Type [count];
for (int i = 0; i < count; i++){
- TypeExpr te = ((Expression) args [i]).ResolveAsTypeTerminal (ec);
+ TypeExpr te = ((Expression) args [i]).ResolveAsTypeTerminal (ec, false);
if (te == null) {
ok = false;
continue;
Report.Error (306, Location, "The type `{0}' may not be used " +
"as a type argument.", TypeManager.CSharpName (te.Type));
return false;
+ } else if (te.Type == TypeManager.void_type) {
+ Report.Error (1547, Location,
+ "Keyword `void' cannot be used in this context");
+ return false;
}
atypes [i] = te.Type;
}
}
+ public class TypeParameterName : SimpleName
+ {
+ Attributes attributes;
+
+ public TypeParameterName (string name, Attributes attrs, Location loc)
+ : base (name, loc)
+ {
+ attributes = attrs;
+ }
+
+ public Attributes OptAttributes {
+ get {
+ return attributes;
+ }
+ }
+ }
+
/// <summary>
/// An instantiation of a generic type.
/// </summary>
get { return args; }
}
- protected string DeclarationName {
- get {
- StringBuilder sb = new StringBuilder ();
- sb.Append (gt.FullName);
- sb.Append ("<");
- for (int i = 0; i < gen_params.Length; i++) {
- if (i > 0)
- sb.Append (",");
- sb.Append (gen_params [i]);
- }
- sb.Append (">");
- return sb.ToString ();
+ public override string GetSignatureForError ()
+ {
+ return TypeManager.CSharpName (gt);
+ }
+
+ protected override TypeExpr DoResolveAsTypeStep (EmitContext ec)
+ {
+ if (!ResolveConstructedType (ec))
+ return null;
+
+ return this;
+ }
+
+ /// <summary>
+ /// Check the constraints; we're called from ResolveAsTypeTerminal()
+ /// after fully resolving the constructed type.
+ /// </summary>
+ public bool CheckConstraints (EmitContext ec)
+ {
+ return ConstraintChecker.CheckConstraints (ec, gt, gen_params, atypes, loc);
+ }
+
+ /// <summary>
+ /// Resolve the constructed type, but don't check the constraints.
+ /// </summary>
+ public bool ResolveConstructedType (EmitContext ec)
+ {
+ if (type != null)
+ return true;
+ // If we already know the fully resolved generic type.
+ if (gt != null)
+ return DoResolveType (ec);
+
+ int num_args;
+ Type t = name.Type;
+
+ if (t == null) {
+ Report.Error (246, loc, "Cannot find type `{0}'<...>", Name);
+ return false;
}
+
+ num_args = TypeManager.GetNumberOfTypeArguments (t);
+ if (num_args == 0) {
+ Report.Error (308, loc,
+ "The non-generic type `{0}' cannot " +
+ "be used with type arguments.",
+ TypeManager.CSharpName (t));
+ return false;
+ }
+
+ gt = t.GetGenericTypeDefinition ();
+ return DoResolveType (ec);
}
- protected bool CheckConstraint (EmitContext ec, Type ptype, Expression expr,
- Type ctype)
+ bool DoResolveType (EmitContext ec)
{
- if (TypeManager.HasGenericArguments (ctype)) {
- Type[] types = TypeManager.GetTypeArguments (ctype);
+ //
+ // Resolve the arguments.
+ //
+ if (args.Resolve (ec) == false)
+ return false;
- TypeArguments new_args = new TypeArguments (loc);
+ gen_params = gt.GetGenericArguments ();
+ atypes = args.Arguments;
- for (int i = 0; i < types.Length; i++) {
- Type t = types [i];
+ if (atypes.Length != gen_params.Length) {
+ Report.Error (305, loc,
+ "Using the generic type `{0}' " +
+ "requires {1} type arguments",
+ TypeManager.CSharpName (gt),
+ gen_params.Length.ToString ());
+ return false;
+ }
- if (t.IsGenericParameter) {
- int pos = t.GenericParameterPosition;
- t = args.Arguments [pos];
- }
- new_args.Add (new TypeExpression (t, loc));
- }
+ //
+ // Now bind the parameters.
+ //
+ type = gt.MakeGenericType (atypes);
+ return true;
+ }
- TypeExpr ct = new ConstructedType (ctype, new_args, loc);
- if (ct.ResolveAsTypeStep (ec) == null)
+ public Expression GetSimpleName (EmitContext ec)
+ {
+ return this;
+ }
+
+ public override bool CheckAccessLevel (DeclSpace ds)
+ {
+ return ds.CheckAccessLevel (gt);
+ }
+
+ public override bool AsAccessible (DeclSpace ds, int flags)
+ {
+ return ds.AsAccessible (gt, flags);
+ }
+
+ public override bool IsClass {
+ get { return gt.IsClass; }
+ }
+
+ public override bool IsValueType {
+ get { return gt.IsValueType; }
+ }
+
+ public override bool IsInterface {
+ get { return gt.IsInterface; }
+ }
+
+ public override bool IsSealed {
+ get { return gt.IsSealed; }
+ }
+
+ public override bool Equals (object obj)
+ {
+ ConstructedType cobj = obj as ConstructedType;
+ if (cobj == null)
+ return false;
+
+ if ((type == null) || (cobj.type == null))
+ return false;
+
+ return type == cobj.type;
+ }
+
+ public override int GetHashCode ()
+ {
+ return base.GetHashCode ();
+ }
+
+ public override string Name {
+ get {
+ return full_name;
+ }
+ }
+
+
+ public override string FullName {
+ get {
+ return full_name;
+ }
+ }
+ }
+
+ public abstract class ConstraintChecker
+ {
+ protected readonly Type[] gen_params;
+ protected readonly Type[] atypes;
+ protected readonly Location loc;
+
+ protected ConstraintChecker (Type[] gen_params, Type[] atypes, Location loc)
+ {
+ this.gen_params = gen_params;
+ this.atypes = atypes;
+ this.loc = loc;
+ }
+
+ /// <summary>
+ /// Check the constraints; we're called from ResolveAsTypeTerminal()
+ /// after fully resolving the constructed type.
+ /// </summary>
+ public bool CheckConstraints (EmitContext ec)
+ {
+ for (int i = 0; i < gen_params.Length; i++) {
+ if (!CheckConstraints (ec, i))
return false;
- ctype = ct.Type;
}
- return Convert.ImplicitStandardConversionExists (ec, expr, ctype);
+ return true;
}
protected bool CheckConstraints (EmitContext ec, int index)
is_class = is_struct = false;
}
} else {
- is_class = atype.IsClass;
- is_struct = atype.IsValueType;
+ is_class = atype.IsClass || atype.IsInterface;
+ is_struct = atype.IsValueType && !TypeManager.IsNullableType (atype);
}
//
"a reference type in order to use it " +
"as type parameter `{1}' in the " +
"generic type or method `{2}'.",
- atype, ptype, DeclarationName);
+ TypeManager.CSharpName (atype),
+ TypeManager.CSharpName (ptype),
+ GetSignatureForError ());
return false;
} else if (gc.HasValueTypeConstraint && !is_struct) {
- Report.Error (453, loc, "The type `{0}' must be " +
- "a value type in order to use it " +
+ Report.Error (453, loc, "The type `{0}' must be a " +
+ "non-nullable value type in order to use it " +
"as type parameter `{1}' in the " +
"generic type or method `{2}'.",
- atype, ptype, DeclarationName);
+ TypeManager.CSharpName (atype),
+ TypeManager.CSharpName (ptype),
+ GetSignatureForError ());
return false;
}
// The class constraint comes next.
//
if (gc.HasClassConstraint) {
- if (!CheckConstraint (ec, ptype, aexpr, gc.ClassConstraint)) {
- Report.Error (309, loc, "The type `{0}' must be " +
- "convertible to `{1}' in order to " +
- "use it as parameter `{2}' in the " +
- "generic type or method `{3}'",
- atype, gc.ClassConstraint, ptype, DeclarationName);
+ if (!CheckConstraint (ec, ptype, aexpr, gc.ClassConstraint))
return false;
- }
}
//
// Now, check the interface constraints.
//
foreach (Type it in gc.InterfaceConstraints) {
- Type itype;
- if (it.IsGenericParameter)
- itype = atypes [it.GenericParameterPosition];
- else
- itype = it;
-
- if (!CheckConstraint (ec, ptype, aexpr, itype)) {
- Report.Error (309, loc, "The type `{0}' must be " +
- "convertible to `{1}' in order to " +
- "use it as parameter `{2}' in the " +
- "generic type or method `{3}'",
- atype, itype, ptype, DeclarationName);
+ if (!CheckConstraint (ec, ptype, aexpr, it))
return false;
- }
}
//
if (HasDefaultConstructor (ec, atype))
return true;
+ Report_SymbolRelatedToPreviousError ();
+ Report.SymbolRelatedToPreviousError (atype);
Report.Error (310, loc, "The type `{0}' must have a public " +
"parameterless constructor in order to use it " +
"as parameter `{1}' in the generic type or " +
- "method `{2}'", atype, ptype, DeclarationName);
+ "method `{2}'",
+ TypeManager.CSharpName (atype),
+ TypeManager.CSharpName (ptype),
+ GetSignatureForError ());
+ return false;
+ }
+
+ protected bool CheckConstraint (EmitContext ec, Type ptype, Expression expr,
+ Type ctype)
+ {
+ if (TypeManager.HasGenericArguments (ctype)) {
+ Type[] types = TypeManager.GetTypeArguments (ctype);
+
+ TypeArguments new_args = new TypeArguments (loc);
+
+ for (int i = 0; i < types.Length; i++) {
+ Type t = types [i];
+
+ if (t.IsGenericParameter) {
+ int pos = t.GenericParameterPosition;
+ t = atypes [pos];
+ }
+ new_args.Add (new TypeExpression (t, loc));
+ }
+
+ TypeExpr ct = new ConstructedType (ctype, new_args, loc);
+ if (ct.ResolveAsTypeStep (ec, false) == null)
+ return false;
+ ctype = ct.Type;
+ } else if (ctype.IsGenericParameter) {
+ int pos = ctype.GenericParameterPosition;
+ ctype = atypes [pos];
+ }
+
+ if (Convert.ImplicitStandardConversionExists (ec, expr, ctype))
+ return true;
+
+ Error_TypeMustBeConvertible (expr.Type, ctype, ptype);
return false;
}
bool HasDefaultConstructor (EmitContext ec, Type atype)
{
+ atype = TypeManager.DropGenericTypeArguments (atype);
+
if (atype is TypeBuilder) {
if (atype.IsAbstract)
return false;
if ((c.Parameters.FixedParameters != null) &&
(c.Parameters.FixedParameters.Length != 0))
continue;
- if (c.Parameters.HasArglist ||
- (c.Parameters.ArrayParameter != null))
+ if (c.Parameters.HasArglist || c.Parameters.HasParams)
continue;
return true;
return false;
}
- protected override TypeExpr DoResolveAsTypeStep (EmitContext ec)
- {
- if (!ResolveConstructedType (ec))
- return null;
+ protected abstract string GetSignatureForError ();
+ protected abstract void Report_SymbolRelatedToPreviousError ();
- return this;
- }
-
- /// <summary>
- /// Check the constraints; we're called from ResolveAsTypeTerminal()
- /// after fully resolving the constructed type.
- /// </summary>
- public bool CheckConstraints (EmitContext ec)
+ void Error_TypeMustBeConvertible (Type atype, Type gc, Type ptype)
{
- for (int i = 0; i < gen_params.Length; i++) {
- if (!CheckConstraints (ec, i))
- return false;
- }
-
- return true;
+ Report_SymbolRelatedToPreviousError ();
+ Report.SymbolRelatedToPreviousError (atype);
+ Report.Error (309, loc,
+ "The type `{0}' must be convertible to `{1}' in order to " +
+ "use it as parameter `{2}' in the generic type or method `{3}'",
+ TypeManager.CSharpName (atype), TypeManager.CSharpName (gc),
+ TypeManager.CSharpName (ptype), GetSignatureForError ());
}
- /// <summary>
- /// Resolve the constructed type, but don't check the constraints.
- /// </summary>
- public bool ResolveConstructedType (EmitContext ec)
+ public static bool CheckConstraints (EmitContext ec, MethodBase definition,
+ MethodBase instantiated, Location loc)
{
- if (type != null)
- return true;
- // If we already know the fully resolved generic type.
- if (gt != null)
- return DoResolveType (ec);
-
- int num_args;
- Type t = name.Type;
+ MethodConstraintChecker checker = new MethodConstraintChecker (
+ definition, definition.GetGenericArguments (),
+ instantiated.GetGenericArguments (), loc);
- if (t == null) {
- Report.Error (246, loc, "Cannot find type `{0}'<...>", Name);
- return false;
- }
-
- num_args = TypeManager.GetNumberOfTypeArguments (t);
- if (num_args == 0) {
- Report.Error (308, loc,
- "The non-generic type `{0}' cannot " +
- "be used with type arguments.",
- TypeManager.CSharpName (t));
- return false;
- }
-
- gt = t.GetGenericTypeDefinition ();
- return DoResolveType (ec);
+ return checker.CheckConstraints (ec);
}
- bool DoResolveType (EmitContext ec)
+ public static bool CheckConstraints (EmitContext ec, Type gt, Type[] gen_params,
+ Type[] atypes, Location loc)
{
- //
- // Resolve the arguments.
- //
- if (args.Resolve (ec) == false)
- return false;
+ TypeConstraintChecker checker = new TypeConstraintChecker (
+ gt, gen_params, atypes, loc);
- gen_params = gt.GetGenericArguments ();
- atypes = args.Arguments;
-
- if (atypes.Length != gen_params.Length) {
- Report.Error (305, loc,
- "Using the generic type `{0}' " +
- "requires {1} type arguments",
- TypeManager.GetFullName (gt),
- gen_params.Length);
- return false;
- }
-
- //
- // Now bind the parameters.
- //
- type = gt.MakeGenericType (atypes);
- return true;
+ return checker.CheckConstraints (ec);
}
- public Expression GetSimpleName (EmitContext ec)
+ protected class MethodConstraintChecker : ConstraintChecker
{
- return this;
- }
-
- public override bool CheckAccessLevel (DeclSpace ds)
- {
- return ds.CheckAccessLevel (gt);
- }
-
- public override bool AsAccessible (DeclSpace ds, int flags)
- {
- return ds.AsAccessible (gt, flags);
- }
-
- public override bool IsClass {
- get { return gt.IsClass; }
- }
-
- public override bool IsValueType {
- get { return gt.IsValueType; }
- }
+ MethodBase definition;
- public override bool IsInterface {
- get { return gt.IsInterface; }
- }
-
- public override bool IsSealed {
- get { return gt.IsSealed; }
- }
-
- public override bool Equals (object obj)
- {
- ConstructedType cobj = obj as ConstructedType;
- if (cobj == null)
- return false;
+ public MethodConstraintChecker (MethodBase definition, Type[] gen_params,
+ Type[] atypes, Location loc)
+ : base (gen_params, atypes, loc)
+ {
+ this.definition = definition;
+ }
- if ((type == null) || (cobj.type == null))
- return false;
+ protected override string GetSignatureForError ()
+ {
+ return TypeManager.CSharpSignature (definition);
+ }
- return type == cobj.type;
+ protected override void Report_SymbolRelatedToPreviousError ()
+ {
+ Report.SymbolRelatedToPreviousError (definition);
+ }
}
- public override int GetHashCode ()
+ protected class TypeConstraintChecker : ConstraintChecker
{
- return base.GetHashCode ();
- }
+ Type gt;
- public override string Name {
- get {
- return full_name;
+ public TypeConstraintChecker (Type gt, Type[] gen_params, Type[] atypes,
+ Location loc)
+ : base (gen_params, atypes, loc)
+ {
+ this.gt = gt;
}
- }
+ protected override string GetSignatureForError ()
+ {
+ return TypeManager.CSharpName (gt);
+ }
- public override string FullName {
- get {
- return full_name;
+ protected override void Report_SymbolRelatedToPreviousError ()
+ {
+ Report.SymbolRelatedToPreviousError (gt);
}
}
}
public bool Define (MethodBuilder mb)
{
GenericTypeParameterBuilder[] gen_params;
- string[] names = MemberName.TypeArguments.GetDeclarations ();
- gen_params = mb.DefineGenericParameters (names);
+ TypeParameterName[] names = MemberName.TypeArguments.GetDeclarations ();
+ string[] snames = new string [names.Length];
+ for (int i = 0; i < names.Length; i++)
+ snames [i] = names [i].Name;
+ gen_params = mb.DefineGenericParameters (snames);
for (int i = 0; i < TypeParameters.Length; i++)
TypeParameters [i].Define (gen_params [i]);
return false;
bool ok = true;
- if (parameters.FixedParameters != null) {
- foreach (Parameter p in parameters.FixedParameters){
- if (!p.Resolve (ec))
- ok = false;
- }
- }
- if (parameters.ArrayParameter != null) {
- if (!parameters.ArrayParameter.Resolve (ec))
+ foreach (Parameter p in parameters.FixedParameters){
+ if (!p.Resolve (ec))
ok = false;
}
- if ((return_type != null) && (return_type.ResolveAsTypeTerminal (ec) == null))
+ if ((return_type != null) && (return_type.ResolveAsTypeTerminal (ec, false) == null))
ok = false;
return ok;
}
- public override bool DefineMembers (TypeContainer parent)
+ public void EmitAttributes (EmitContext ec)
+ {
+ for (int i = 0; i < TypeParameters.Length; i++)
+ TypeParameters [i].EmitAttributes (ec);
+
+ if (OptAttributes != null)
+ OptAttributes.Emit (ec, this);
+ }
+
+ public override bool DefineMembers ()
{
return true;
}
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
- // FIXME
+ base.ApplyAttributeBuilder (a, cb);
}
public override AttributeTargets AttributeTargets {
public override Expression DoResolve (EmitContext ec)
{
- TypeExpr texpr = expr.ResolveAsTypeTerminal (ec);
+ TypeExpr texpr = expr.ResolveAsTypeTerminal (ec, false);
if (texpr == null)
return null;
args.Add (underlying);
ConstructedType ctype = new ConstructedType (TypeManager.generic_nullable_type, args, loc);
- return ctype.ResolveAsTypeTerminal (ec);
+ return ctype.ResolveAsTypeTerminal (ec, false);
}
}
//
// A list of core types that the compiler requires or uses
//
- static public Type new_constraint_attr_type;
static public Type activator_type;
static public Type generic_ienumerator_type;
static public Type generic_ienumerable_type;
static void InitGenericCoreTypes ()
{
activator_type = CoreLookupType ("System", "Activator");
- new_constraint_attr_type = CoreLookupType (
- "System.Runtime.CompilerServices", "NewConstraintAttribute");
generic_ienumerator_type = CoreLookupType (
"System.Collections.Generic", "IEnumerator", 1);
public static TypeContainer LookupGenericTypeContainer (Type t)
{
- while (t.IsGenericInstance)
- t = t.GetGenericTypeDefinition ();
-
+ t = DropGenericTypeArguments (t);
return LookupTypeContainer (t);
}
if (tparam != null)
return tparam.GenericConstraints;
- return new ReflectionConstraints (t);
- }
-
- public static bool IsGeneric (Type t)
- {
- DeclSpace ds = (DeclSpace) builder_to_declspace [t];
-
- return ds.IsGeneric;
+ return ReflectionConstraints.GetConstraints (t);
}
public static bool HasGenericArguments (Type t)
return t.GetGenericArguments ();
}
+ public static Type DropGenericTypeArguments (Type t)
+ {
+ if (!t.IsGenericType)
+ return t;
+ // Micro-optimization: a generic typebuilder is always a generic type definition
+ if (t is TypeBuilder)
+ return t;
+ return t.GetGenericTypeDefinition ();
+ }
+
+ public static MethodBase DropGenericMethodArguments (MethodBase m)
+ {
+ if (m.IsGenericMethodDefinition)
+ return m;
+ if (m.IsGenericMethod)
+ return ((MethodInfo) m).GetGenericMethodDefinition ();
+ if (!m.DeclaringType.IsGenericType)
+ return m;
+
+ Type t = m.DeclaringType.GetGenericTypeDefinition ();
+ BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic |
+ BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly;
+
+ if (m is ConstructorInfo) {
+ foreach (ConstructorInfo c in t.GetConstructors (bf))
+ if (c.MetadataToken == m.MetadataToken)
+ return c;
+ } else {
+ foreach (MethodBase mb in t.GetMethods (bf))
+ if (mb.MetadataToken == m.MetadataToken)
+ return mb;
+ }
+
+ return m;
+ }
+
+ public static FieldInfo GetGenericFieldDefinition (FieldInfo fi)
+ {
+ if (fi.DeclaringType.IsGenericTypeDefinition ||
+ !fi.DeclaringType.IsGenericType)
+ return fi;
+
+ Type t = fi.DeclaringType.GetGenericTypeDefinition ();
+ BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic |
+ BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly;
+
+ foreach (FieldInfo f in t.GetFields (bf))
+ if (f.MetadataToken == fi.MetadataToken)
+ return f;
+
+ return fi;
+ }
+
//
// Whether `array' is an array of T and `enumerator' is `IEnumerable<T>'.
// For instance "string[]" -> "IEnumerable<string>".
//
public static bool IsIEnumerable (Type array, Type enumerator)
{
- if (!array.IsArray || !enumerator.IsGenericInstance)
+ if (!array.IsArray || !enumerator.IsGenericType)
return false;
if (enumerator.GetGenericTypeDefinition () != generic_ienumerable_type)
if (a.Equals (b))
return true;
- if ((a is TypeBuilder) && a.IsGenericTypeDefinition && b.IsGenericInstance) {
- //
- // `a' is a generic type definition's TypeBuilder and `b' is a
- // generic instance of the same type.
- //
- // Example:
- //
- // class Stack<T>
- // {
- // void Test (Stack<T> stack) { }
- // }
- //
- // The first argument of `Test' will be the generic instance
- // "Stack<!0>" - which is the same type than the "Stack" TypeBuilder.
- //
- //
- // We hit this via Closure.Filter() for gen-82.cs.
- //
- if (a != b.GetGenericTypeDefinition ())
- return false;
-
- Type[] aparams = a.GetGenericArguments ();
- Type[] bparams = b.GetGenericArguments ();
-
- if (aparams.Length != bparams.Length)
- return false;
-
- for (int i = 0; i < aparams.Length; i++)
- if (!IsEqual (aparams [i], bparams [i]))
- return false;
-
- return true;
- }
-
- if ((b is TypeBuilder) && b.IsGenericTypeDefinition && a.IsGenericInstance)
- return IsEqual (b, a);
-
if (a.IsGenericParameter && b.IsGenericParameter) {
if (a.DeclaringMethod != b.DeclaringMethod &&
(a.DeclaringMethod == null || b.DeclaringMethod == null))
return IsEqual (a.GetElementType (), b.GetElementType ());
}
- if (a.IsGenericInstance && b.IsGenericInstance) {
+ if (a.IsByRef && b.IsByRef)
+ return IsEqual (a.GetElementType (), b.GetElementType ());
+
+ if (a.IsGenericType && b.IsGenericType) {
if (a.GetGenericTypeDefinition () != b.GetGenericTypeDefinition ())
return false;
return true;
}
+ //
+ // This is to build with the broken circular dependencies between
+ // System and System.Configuration in the 2.x profile where we
+ // end up with a situation where:
+ //
+ // System on the second build is referencing the System.Configuration
+ // that has references to the first System build.
+ //
+ // Point in case: NameValueCollection built on the first pass, vs
+ // NameValueCollection build on the second one. The problem is that
+ // we need to override some methods sometimes, or we need to
+ //
+ if (RootContext.BrokenCircularDeps){
+ if (a.Name == b.Name && a.Namespace == b.Namespace){
+ Console.WriteLine ("GonziMatch: {0}.{1}", a.Namespace, a.Name);
+ return true;
+ }
+ }
return false;
}
// class X<T,U> : I<T>, I<U>
// class X<T> : I<T>, I<float>
//
- if (b.IsGenericParameter || !b.IsGenericInstance) {
+ if (b.IsGenericParameter || !b.IsGenericType) {
int pos = a.GenericParameterPosition;
Type[] args = a.DeclaringMethod != null ? method_infered : class_infered;
if (args [pos] == null) {
// become equal).
//
- if (a.IsGenericInstance || b.IsGenericInstance)
+ if (a.IsGenericType || b.IsGenericType)
return MayBecomeEqualGenericInstances (a, b, class_infered, method_infered);
//
Type[] class_infered,
Type[] method_infered)
{
- if (!a.IsGenericInstance || !b.IsGenericInstance)
+ if (!a.IsGenericType || !b.IsGenericType)
return false;
if (a.GetGenericTypeDefinition () != b.GetGenericTypeDefinition ())
return false;
int tcount = GetNumberOfTypeArguments (type);
int pcount = GetNumberOfTypeArguments (parent);
- if (type.IsGenericInstance)
- type = type.GetGenericTypeDefinition ();
- if (parent.IsGenericInstance)
- parent = parent.GetGenericTypeDefinition ();
-
if (tcount != pcount)
return false;
+ type = DropGenericTypeArguments (type);
+ parent = DropGenericTypeArguments (parent);
+
return type.Equals (parent);
}
/// <summary>
/// Whether `mb' is a generic method definition.
/// </summary>
- public static bool IsGenericMethod (MethodBase mb)
+ public static bool IsGenericMethodDefinition (MethodBase mb)
{
if (mb.DeclaringType is TypeBuilder) {
IMethodData method = (IMethodData) builder_to_method [mb];
return mb.IsGenericMethodDefinition;
}
+ /// <summary>
+ /// Whether `mb' is a generic method definition.
+ /// </summary>
+ public static bool IsGenericMethod (MethodBase mb)
+ {
+ if (mb.DeclaringType is TypeBuilder) {
+ IMethodData method = (IMethodData) builder_to_method [mb];
+ if (method == null)
+ return false;
+
+ return method.GenericMethod != null;
+ }
+
+ return mb.IsGenericMethod;
+ }
+
//
// Type inference.
//
static bool InferType (Type pt, Type at, Type[] infered)
{
- if (pt.IsGenericParameter && (pt.DeclaringMethod != null)) {
+ if (pt == at)
+ return true;
+
+ if (pt.IsGenericParameter) {
+ if (pt.DeclaringMethod == null)
+ return false;
+
int pos = pt.GenericParameterPosition;
if (infered [pos] == null) {
}
if (at.IsArray) {
- if (!pt.IsArray ||
- (at.GetArrayRank () != pt.GetArrayRank ()))
- return false;
+ if (pt.IsArray) {
+ if (at.GetArrayRank () != pt.GetArrayRank ())
+ return false;
- return InferType (pt.GetElementType (), at.GetElementType (), infered);
+ return InferType (pt.GetElementType (), at.GetElementType (), infered);
+ }
+
+ if (!pt.IsGenericType ||
+ (pt.GetGenericTypeDefinition () != generic_ienumerable_type))
+ return false;
+
+ Type[] args = GetTypeArguments (pt);
+ return InferType (args [0], at.GetElementType (), infered);
}
if (pt.IsArray) {
if (pt.IsByRef && at.IsByRef)
return InferType (pt.GetElementType (), at.GetElementType (), infered);
ArrayList list = new ArrayList ();
- if (at.IsGenericInstance)
+ if (at.IsGenericType)
list.Add (at);
for (Type bt = at.BaseType; bt != null; bt = bt.BaseType)
list.Add (bt);
bool found_one = false;
foreach (Type type in list) {
- if (!type.IsGenericInstance)
+ if (!type.IsGenericType)
continue;
Type[] infered_types = new Type [infered.Length];
public static bool IsNullableType (Type t)
{
- if (!t.IsGenericInstance)
- return false;
-
- Type gt = t.GetGenericTypeDefinition ();
- return gt == generic_nullable_type;
+ return generic_nullable_type == DropGenericTypeArguments (t);
}
}
Type = type;
UnderlyingType = TypeManager.GetTypeArguments (type) [0];
- PropertyInfo has_value_pi = type.GetProperty ("HasValue");
- PropertyInfo value_pi = type.GetProperty ("Value");
+ PropertyInfo has_value_pi = TypeManager.GetProperty (type, "HasValue");
+ PropertyInfo value_pi = TypeManager.GetProperty (type, "Value");
HasValue = has_value_pi.GetGetMethod (false);
Value = value_pi.GetGetMethod (false);
if (expr == null)
return null;
- if (!(expr is IMemoryLocation))
- temp = new LocalTemporary (ec, expr.Type);
+ temp = new LocalTemporary (ec, expr.Type);
info = new NullableInfo (expr.Type);
type = info.UnderlyingType;
ec.ig.EmitCall (OpCodes.Call, info.HasValue, null);
}
+ public void Store (EmitContext ec)
+ {
+ create_temp (ec);
+ }
+
void create_temp (EmitContext ec)
{
if ((temp != null) && !has_temp) {
public void EmitAssign (EmitContext ec, Expression source,
bool leave_copy, bool prepare_for_load)
{
- source.Emit (ec);
- ec.ig.Emit (OpCodes.Newobj, info.Constructor);
+ InternalWrap wrap = new InternalWrap (source, info, loc);
+ ((IAssignMethod) expr).EmitAssign (ec, wrap, leave_copy, false);
+ }
- if (leave_copy)
- ec.ig.Emit (OpCodes.Dup);
+ protected class InternalWrap : Expression
+ {
+ public Expression expr;
+ public NullableInfo info;
- Expression empty = new EmptyExpression (expr.Type);
- ((IAssignMethod) expr).EmitAssign (ec, empty, false, prepare_for_load);
+ public InternalWrap (Expression expr, NullableInfo info, Location loc)
+ {
+ this.expr = expr;
+ this.info = info;
+ this.loc = loc;
+
+ type = info.Type;
+ eclass = ExprClass.Value;
+ }
+
+ public override Expression DoResolve (EmitContext ec)
+ {
+ return this;
+ }
+
+ public override void Emit (EmitContext ec)
+ {
+ expr.Emit (ec);
+ ec.ig.Emit (OpCodes.Newobj, info.Constructor);
+ }
}
}
return null;
TypeExpr target_type = new NullableType (expr.Type, loc);
- target_type = target_type.ResolveAsTypeTerminal (ec);
+ target_type = target_type.ResolveAsTypeTerminal (ec, false);
if (target_type == null)
return null;
{
public readonly Binary.Operator Oper;
- Expression left, right, underlying, null_value, bool_wrap;
+ Expression left, right, original_left, original_right;
+ Expression underlying, null_value, bool_wrap;
Unwrap left_unwrap, right_unwrap;
bool is_equality, is_comparision, is_boolean;
Location loc)
{
this.Oper = op;
- this.left = left;
- this.right = right;
+ this.left = original_left = left;
+ this.right = original_right = right;
this.loc = loc;
}
return null;
}
- if (((Oper == Binary.Operator.BitwiseAnd) || (Oper == Binary.Operator.BitwiseOr) ||
- (Oper == Binary.Operator.LogicalAnd) || (Oper == Binary.Operator.LogicalOr)) &&
+ if ((Oper == Binary.Operator.LogicalAnd) ||
+ (Oper == Binary.Operator.LogicalOr)) {
+ Binary.Error_OperatorCannotBeApplied (
+ loc, Binary.OperName (Oper),
+ original_left.GetSignatureForError (),
+ original_right.GetSignatureForError ());
+ return null;
+ }
+
+ if (((Oper == Binary.Operator.BitwiseAnd) || (Oper == Binary.Operator.BitwiseOr)) &&
((left.Type == TypeManager.bool_type) && (right.Type == TypeManager.bool_type))) {
Expression empty = new EmptyExpression (TypeManager.bool_type);
bool_wrap = new Wrap (empty, loc).Resolve (ec);
public override void Emit (EmitContext ec)
{
+ if (left_unwrap != null)
+ left_unwrap.Store (ec);
+ if (right_unwrap != null)
+ right_unwrap.Store (ec);
+
if (is_boolean) {
EmitBoolean (ec);
return;
projects / mono.git / blobdiff