namespace Mono.CSharp {
public class MemberName {
- public string Name;
+ public readonly string Name;
public readonly TypeArguments TypeArguments;
public readonly MemberName Left;
+ public readonly Location Location;
+
+ public static readonly MemberName Null = new MemberName ("", Location.Null);
- public static readonly MemberName Null = new MemberName ("");
+ bool is_double_colon;
- public MemberName (string name)
+ private MemberName (MemberName left, string name, bool is_double_colon,
+ TypeArguments args, Location loc)
{
this.Name = name;
+ this.Location = loc;
+ this.is_double_colon = is_double_colon;
+ this.TypeArguments = args;
+ this.Left = left;
}
- public MemberName (string name, TypeArguments args)
- : this (name)
+ public MemberName (string name, TypeArguments args, Location loc)
+ : this (name, loc)
{
this.TypeArguments = args;
}
- public MemberName (MemberName left, string name, TypeArguments args)
- : this (name, args)
+ public MemberName (string name, Location loc)
+ {
+ this.Name = name;
+ this.Location = loc;
+ }
+
+ public MemberName (MemberName left, string name, Location loc)
+ : this (name, loc)
{
this.Left = left;
}
+ public MemberName (MemberName left, string name, TypeArguments args, Location loc)
+ : this (name, args, loc)
+ {
+ this.Left = left;
+ }
+
+ public MemberName (string alias, string name, Location loc)
+ : this (new MemberName (alias, loc), name, true, null, loc)
+ {
+ }
+
public MemberName (MemberName left, MemberName right)
- : this (left, right.Name, right.TypeArguments)
+ : this (left, right, left != null ? left.Location : right != null ? right.Location : Location.Null)
+ {
+ }
+
+ public MemberName (MemberName left, MemberName right, Location loc)
+ : this (null, right.Name, false, right.TypeArguments, loc)
{
+ if (right.is_double_colon)
+ throw new InternalErrorException ("Cannot append double_colon member name");
+ this.Left = (right.Left == null) ? left : new MemberName (left, right.Left);
+ }
+
+ static readonly char [] dot_array = { '.' };
+
+ public static MemberName FromDotted (string name, Location loc)
+ {
+ string [] elements = name.Split (dot_array);
+ int count = elements.Length;
+ int i = 0;
+ MemberName n = new MemberName (elements [i++], loc);
+ while (i < count)
+ n = new MemberName (n, elements [i++], loc);
+ return n;
}
public string GetName ()
{
+ string connect = is_double_colon ? "::" : ".";
if (Left != null)
- return Left.GetName () + "." + Name;
+ return Left.GetName () + connect + Name;
else
return Name;
}
public string GetName (bool is_generic)
{
string name = is_generic ? Basename : Name;
+ string connect = is_double_colon ? "::" : ".";
if (Left != null)
- return Left.GetName (is_generic) + "." + name;
+ return Left.GetName (is_generic) + connect + name;
else
return name;
}
}
}
- public string GetMethodName ()
- {
- if (Left != null)
- return Left.GetTypeName () + "." + Name;
- else
- return Name;
+ public string MethodName {
+ get {
+ string connect = is_double_colon ? "::" : ".";
+ if (Left != null)
+ return Left.FullName + connect + Name;
+ else
+ return Name;
+ }
}
public static string MakeName (string name, TypeArguments args)
public string GetTypeName ()
{
+ string connect = is_double_colon ? "::" : ".";
if (Left != null)
- return Left.GetTypeName () + "." +
+ return Left.GetTypeName () + connect +
MakeName (Name, TypeArguments);
else
return MakeName (Name, TypeArguments);
return true;
}
- public Expression GetTypeExpression (Location loc)
+ public Expression GetTypeExpression ()
{
if (IsUnbound) {
- if (!CheckUnbound (loc))
+ if (!CheckUnbound (Location))
return null;
- return new UnboundTypeExpression (GetTypeName ());
+ return new UnboundTypeExpression (this, Location);
}
- if (Left != null) {
- Expression lexpr = Left.GetTypeExpression (loc);
-
- return new MemberAccess (lexpr, Name, TypeArguments, loc);
- } else {
+ if (Left == null) {
if (TypeArguments != null)
- return new SimpleName (Basename, TypeArguments, loc);
+ return new SimpleName (Basename, TypeArguments, Location);
else
- return new SimpleName (Name, loc);
+ return new SimpleName (Name, Location);
+ }
+
+ if (is_double_colon) {
+ if (Left.Left != null)
+ throw new InternalErrorException ("The left side of a :: should be an identifier");
+ return new QualifiedAliasMember (Left.Name, Name, Location);
}
+
+ Expression lexpr = Left.GetTypeExpression ();
+ return new MemberAccess (lexpr, Name, TypeArguments, Location);
}
public MemberName Clone ()
{
- if (Left != null)
- return new MemberName (Left.Clone (), Name, TypeArguments);
- else
- return new MemberName (Name, TypeArguments);
+ MemberName left_clone = Left == null ? null : Left.Clone ();
+ return new MemberName (left_clone, Name, is_double_colon, TypeArguments, Location);
}
public string Basename {
}
}
+ public string FullName {
+ get {
+ if (TypeArguments != null)
+ return Name + "<" + TypeArguments + ">";
+ else
+ return Name;
+ }
+ }
+
public override string ToString ()
{
- string full_name;
- if (TypeArguments != null)
- full_name = Name + "<" + TypeArguments + ">";
- else
- full_name = Name;
-
+ string connect = is_double_colon ? "::" : ".";
if (Left != null)
- return Left + "." + full_name;
+ return Left.FullName + connect + FullName;
else
- return full_name;
+ return FullName;
+ }
+
+ public override bool Equals (object other)
+ {
+ return Equals (other as MemberName);
+ }
+
+ public bool Equals (MemberName other)
+ {
+ if (this == other)
+ return true;
+ if (other == null || Name != other.Name)
+ return false;
+ if (is_double_colon != other.is_double_colon)
+ return false;
+
+ if ((TypeArguments != null) &&
+ (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count))
+ return false;
+
+ if ((TypeArguments == null) && (other.TypeArguments != null))
+ return false;
+
+ if (Left == null)
+ return other.Left == null;
+
+ return Left.Equals (other.Left);
+ }
+
+ public override int GetHashCode ()
+ {
+ int hash = Name.GetHashCode ();
+ for (MemberName n = Left; n != null; n = n.Left)
+ hash ^= n.Name.GetHashCode ();
+ if (is_double_colon)
+ hash ^= 0xbadc01d;
+
+ if (TypeArguments != null)
+ hash ^= TypeArguments.Count << 5;
+
+ return hash & 0x7FFFFFFF;
}
}
/// <summary>
/// Public name
/// </summary>
+
+ protected string cached_name;
public string Name {
get {
- return MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+ if (cached_name == null)
+ cached_name = MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+ return cached_name;
}
}
// Is not readonly because of IndexerName attribute
- public MemberName MemberName;
+ private MemberName member_name;
+ public MemberName MemberName {
+ get { return member_name; }
+ }
/// <summary>
/// Modifier flags that the user specified in the source code
/// <summary>
/// Location where this declaration happens
/// </summary>
- public readonly Location Location;
+ public Location Location {
+ get { return member_name.Location; }
+ }
/// <summary>
/// XML documentation comment
ClsCompliantAttributeTrue = 1 << 7, // Type has CLSCompliant (true)
Excluded_Undetected = 1 << 8, // Conditional attribute has not been detected yet
Excluded = 1 << 9, // Method is conditional
- TestMethodDuplication = 1 << 10 // Test for duplication must be performed
+ TestMethodDuplication = 1 << 10, // Test for duplication must be performed
+ IsUsed = 1 << 11,
+ IsAssigned = 1 << 12 // Field is assigned
}
/// <summary>
/// </summary>
internal Flags caching_flags;
- public MemberCore (TypeContainer parent, MemberName name, Attributes attrs,
- Location loc)
+ public MemberCore (TypeContainer parent, MemberName name, Attributes attrs)
: base (attrs)
{
if (parent is PartialContainer && !(this is PartialContainer))
throw new InternalErrorException ("A PartialContainer cannot be the direct parent of a member");
Parent = parent;
- MemberName = name;
- Location = loc;
+ member_name = name;
caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
}
- /// <summary>
- /// Tests presence of ObsoleteAttribute and report proper error
- /// </summary>
- protected void CheckUsageOfObsoleteAttribute (Type type)
+ protected virtual void SetMemberName (MemberName new_name)
{
- if (type == null)
- return;
-
- ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
- if (obsolete_attr == null)
- return;
-
- AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, Location);
+ member_name = new_name;
+ cached_name = null;
}
public abstract bool Define ();
//
public virtual string GetSignatureForError ()
{
- return Name;
- }
+ if (Parent == null || Parent.Parent == null)
+ return Name;
- /// <summary>
- /// Use this method when MethodBuilder is null
- /// </summary>
- public virtual string GetSignatureForError (TypeContainer tc)
- {
- return Name;
+ return String.Concat (Parent.GetSignatureForError (), '.', Name);
}
/// <summary>
/// </summary>
public virtual void Emit ()
{
- // Hack with Parent == null is for EnumMember
- if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
- VerifyObsoleteAttribute ();
-
if (!RootContext.VerifyClsCompliance)
return;
VerifyClsCompliance (Parent);
}
+ public virtual EmitContext EmitContext
+ {
+ get {
+ return Parent.EmitContext;
+ }
+ }
+
public bool InUnsafe {
get {
return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext;
}
}
+ public virtual bool IsUsed {
+ get {
+ return (caching_flags & Flags.IsUsed) != 0;
+ }
+ }
+
+ public void SetMemberIsUsed ()
+ {
+ caching_flags |= Flags.IsUsed;
+ }
+
//
// Whehter is it ok to use an unsafe pointer in this type container
//
/// <summary>
/// Returns instance of ObsoleteAttribute for this MemberCore
/// </summary>
- public ObsoleteAttribute GetObsoleteAttribute (DeclSpace ds)
+ public virtual ObsoleteAttribute GetObsoleteAttribute ()
{
// ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
return null;
Attribute obsolete_attr = OptAttributes.Search (
- TypeManager.obsolete_attribute_type, ds.EmitContext);
+ TypeManager.obsolete_attribute_type, EmitContext);
if (obsolete_attr == null)
return null;
- ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds.EmitContext);
+ ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (EmitContext);
if (obsolete == null)
return null;
return obsolete;
}
+ /// <summary>
+ /// Checks for ObsoleteAttribute presence. It's used for testing of all non-types elements
+ /// </summary>
+ public virtual void CheckObsoleteness (Location loc)
+ {
+ if (Parent != null)
+ Parent.CheckObsoleteness (loc);
+
+ ObsoleteAttribute oa = GetObsoleteAttribute ();
+ if (oa == null) {
+ return;
+ }
+
+ AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+ }
+
+ protected void CheckObsoleteType (Expression type)
+ {
+ ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type.Type);
+ if (obsolete_attr == null)
+ return;
+
+ if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
+ return;
+
+ AttributeTester.Report_ObsoleteMessage (obsolete_attr, TypeManager.CSharpName (type.Type), type.Location);
+ }
+
/// <summary>
/// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
/// </summary>
- public override bool IsClsCompliaceRequired (DeclSpace container)
+ public override bool IsClsComplianceRequired (DeclSpace container)
{
if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
return (caching_flags & Flags.ClsCompliant) != 0;
/// </summary>
protected virtual bool VerifyClsCompliance (DeclSpace ds)
{
- if (!IsClsCompliaceRequired (ds)) {
+ if (!IsClsComplianceRequired (ds)) {
if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
if (!IsExposedFromAssembly (ds))
- Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+ Report.Warning (3019, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
if (!CodeGen.Assembly.IsClsCompliant)
- Report.Warning (3021, Location, "'{0}' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+ Report.Warning (3021, Location, "`{0}' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant", GetSignatureForError ());
}
return false;
}
if (!CodeGen.Assembly.IsClsCompliant) {
if (HasClsCompliantAttribute) {
- Report.Error (3014, Location, "'{0}' cannot be marked as CLS-compliant because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+ Report.Error (3014, Location,
+ "`{0}' cannot be marked as CLS-compliant because the assembly is not marked as CLS-compliant",
+ GetSignatureForError ());
}
return false;
}
- int index = Name.LastIndexOf ('.');
- if (Name [index > 0 ? index + 1 : 0] == '_') {
- Report.Error (3008, Location, "Identifier '{0}' is not CLS-compliant", GetSignatureForError () );
+ if (member_name.Name [0] == '_') {
+ Report.Error (3008, Location, "Identifier `{0}' is not CLS-compliant", GetSignatureForError () );
}
return true;
}
- protected abstract void VerifyObsoleteAttribute ();
-
//
// Raised (and passed an XmlElement that contains the comment)
// when GenerateDocComment is writing documentation expectedly.
/// provides the common foundation for managing those name
/// spaces.
/// </remarks>
- public abstract class DeclSpace : MemberCore, IAlias {
+ public abstract class DeclSpace : MemberCore {
/// <summary>
/// This points to the actual definition that is being
/// created with System.Reflection.Emit
private Hashtable Cache = new Hashtable ();
public readonly string Basename;
- public readonly string Basename_with_arity;
protected Hashtable defined_names;
// The emit context for toplevel objects.
protected EmitContext ec;
- public EmitContext EmitContext {
- get { return ec; }
+ public override EmitContext EmitContext {
+ get {
+ return ec;
+ }
}
//
static string[] attribute_targets = new string [] { "type" };
public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
- Attributes attrs, Location l)
- : base (parent, name, attrs, l)
+ Attributes attrs)
+ : base (parent, name, attrs)
{
NamespaceEntry = ns;
- Basename = name.Name;
- Basename_with_arity = name.Basename;
+ Basename = name.Basename;
defined_names = new Hashtable ();
if (name.TypeArguments != null) {
is_generic = true;
/// <summary>
/// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
/// </summary>
- protected bool AddToContainer (MemberCore symbol, string fullname, string basename)
+ protected bool AddToContainer (MemberCore symbol, string name)
{
- if (basename == Basename && !(this is Interface)) {
+ if (name == MemberName.Name && !(this is Interface) && !(this is Enum)) {
if (symbol is TypeParameter)
- Report.Error (694, "Type parameter `{0}' has same name as " +
- "containing type or method", basename);
+ Report.Error (694, symbol.Location,
+ "Type parameter `{0}' has same name as " +
+ "containing type or method", name);
else {
Report.SymbolRelatedToPreviousError (this);
- Report.Error (542, "'{0}': member names cannot be the same as their " +
- "enclosing type", symbol.Location, symbol.GetSignatureForError ());
+ Report.Error (542, symbol.Location,
+ "`{0}': member names cannot be the same " +
+ "as their enclosing type",
+ symbol.GetSignatureForError ());
+ return false;
}
- return false;
}
- MemberCore mc = (MemberCore)defined_names [fullname];
+ MemberCore mc = (MemberCore) defined_names [name];
if (mc == null) {
- defined_names.Add (fullname, symbol);
+ defined_names.Add (name, symbol);
return true;
}
if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
return true;
- if (symbol is TypeParameter)
- Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", basename);
- else {
- Report.SymbolRelatedToPreviousError (mc);
+ Report.SymbolRelatedToPreviousError (mc);
+ if (symbol is PartialContainer || mc is PartialContainer) {
+ Report.Error (260, symbol.Location,
+ "Missing partial modifier on declaration of type `{0}'. Another partial declaration of this type exists",
+ name);
+ return false;
+ }
+
+ if (this is RootTypes) {
+ Report.Error (101, symbol.Location,
+ "The namespace `{0}' already contains a definition for `{1}'",
+ ((DeclSpace)symbol).NamespaceEntry.GetSignatureForError (), symbol.MemberName.Name);
+ } else if (symbol is TypeParameter) {
+ Report.Error (692, symbol.Location,
+ "Duplicate type parameter `{0}'", name);
+ } else {
Report.Error (102, symbol.Location,
- "The type '{0}' already contains a definition for '{1}'",
- GetSignatureForError (), basename);
+ "The type `{0}' already contains a definition for `{1}'",
+ GetSignatureForError (), symbol.MemberName.Name);
}
- return false;
- }
- public void RecordDecl ()
- {
- if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
- NamespaceEntry.DefineName (MemberName.Basename, this);
+ return false;
}
/// <summary>
return (MemberCore)defined_names [name];
}
- bool in_transit = false;
-
- /// <summary>
- /// This function is used to catch recursive definitions
- /// in declarations.
- /// </summary>
- public bool InTransit {
- get {
- return in_transit;
- }
-
- set {
- in_transit = value;
- }
- }
-
//
// root_types contains all the types. All TopLevel types
// hence have a parent that points to `root_types', that is
// why there is a non-obvious test down here.
//
public bool IsTopLevel {
- get {
- if (Parent != null){
- if (Parent.Parent == null)
- return true;
- }
- return false;
- }
+ get { return (Parent != null && Parent.Parent == null); }
}
public virtual void CloseType ()
}
}
+ protected virtual TypeAttributes TypeAttr {
+ get { return CodeGen.Module.DefaultCharSetType; }
+ }
+
/// <remarks>
/// Should be overriten by the appropriate declaration space
/// </remarks>
/// Define all members, but don't apply any attributes or do anything which may
/// access not-yet-defined classes. This method also creates the MemberCache.
/// </summary>
- public abstract bool DefineMembers (TypeContainer parent);
+ public virtual bool DefineMembers (TypeContainer parent)
+ {
+ if (((ModFlags & Modifiers.NEW) != 0) && IsTopLevel) {
+ Report.Error (1530, Location, "Keyword `new' is not allowed on namespace elements");
+ return false;
+ }
+ return true;
+ }
+
+ public override string GetSignatureForError ()
+ {
+ // Parent.GetSignatureForError
+ return Name;
+ }
//
// Whether this is an `unsafe context'
// Resolves the expression `e' for a type, and will recursively define
// types. This should only be used for resolving base types.
// </summary>
- public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
+ protected TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
{
TypeResolveEmitContext.loc = loc;
- TypeResolveEmitContext.ContainerType = TypeBuilder;
+ TypeResolveEmitContext.ResolvingTypeTree = true;
if (this is GenericMethod)
TypeResolveEmitContext.ContainerType = Parent.TypeBuilder;
- else
- TypeResolveEmitContext.ContainerType = TypeBuilder;
-
return e.ResolveAsTypeTerminal (TypeResolveEmitContext);
}
protected bool FamilyAccessible (Type tb, Type check_type)
{
Type declaring = check_type.DeclaringType;
- if (tb == declaring || TypeManager.IsFamilyAccessible (tb, declaring))
- return true;
-
- return NestedAccessible (tb, check_type);
+ return TypeManager.IsNestedFamilyAccessible (TypeBuilder, declaring);
}
// Access level of a type.
return ~ (~ mAccess | pAccess) == 0;
}
- public static void Error_AmbiguousTypeReference (Location loc, string name, string t1, string t2)
- {
- Report.Error (104, loc,
- "`{0}' is an ambiguous reference ({1} or {2})",
- name, t1, t2);
- }
-
//
// Return the nested type with name @name. Ensures that the nested type
// is defined if necessary. Do _not_ use this when you have a MemberCache handy.
for (Type current_type = TypeBuilder;
current_type != null && current_type != TypeManager.object_type;
current_type = current_type.BaseType) {
+ if (current_type.IsGenericInstance)
+ current_type = current_type.GetGenericTypeDefinition ();
if (current_type is TypeBuilder) {
DeclSpace decl = this;
if (current_type != TypeBuilder)
}
//
- // Public function used to locate types, this can only
- // be used after the ResolveTree function has been invoked.
+ // Public function used to locate types.
//
// Set 'ignore_cs0104' to true if you want to ignore cs0104 errors.
//
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
+ if (a.Type == TypeManager.required_attr_type) {
+ Report.Error (1608, a.Location, "The RequiredAttribute attribute is not permitted on C# types");
+ return;
+ }
TypeBuilder.SetCustomAttribute (cb);
}
Constraints constraints = null;
if (constraints_list != null) {
foreach (Constraints constraint in constraints_list) {
+ if (constraint == null)
+ continue;
if (constraint.TypeParameter == name) {
constraints = constraint;
break;
}
}
- type_params [i] = new TypeParameter (Parent, name, constraints, Location);
+ type_params [i] = new TypeParameter (
+ Parent, this, name, constraints, Location);
- string full_name = Name + "." + name;
- AddToContainer (type_params [i], full_name, name);
+ AddToContainer (type_params [i], name);
}
}
return null;
}
- bool IAlias.IsType {
- get { return true; }
- }
-
- string IAlias.Name {
- get { return Name; }
+ public override string[] ValidAttributeTargets {
+ get { return attribute_targets; }
}
- TypeExpr IAlias.ResolveAsType (EmitContext ec)
+ protected override bool VerifyClsCompliance (DeclSpace ds)
{
- if (TypeBuilder == null)
- throw new InvalidOperationException ();
+ if (!base.VerifyClsCompliance (ds)) {
+ return false;
+ }
- if (CurrentType != null)
- return new TypeExpression (CurrentType, Location);
- else
- return new TypeExpression (TypeBuilder, Location);
- }
+ IDictionary cache = TypeManager.AllClsTopLevelTypes;
+ string lcase = Name.ToLower (System.Globalization.CultureInfo.InvariantCulture);
+ if (!cache.Contains (lcase)) {
+ cache.Add (lcase, this);
+ return true;
+ }
- public override string[] ValidAttributeTargets {
- get {
- return attribute_targets;
+ object val = cache [lcase];
+ if (val == null) {
+ Type t = AttributeTester.GetImportedIgnoreCaseClsType (lcase);
+ if (t == null)
+ return true;
+ Report.SymbolRelatedToPreviousError (t);
}
+ else {
+ if (val is PartialContainer)
+ return true;
+
+ Report.SymbolRelatedToPreviousError ((DeclSpace)val);
+ }
+ Report.Warning (3005, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
+ return true;
}
}
return hash;
}
- void ClearDeclaredOnly (Hashtable hash)
- {
- IDictionaryEnumerator it = hash.GetEnumerator ();
- while (it.MoveNext ()) {
- foreach (CacheEntry ce in (ArrayList) it.Value)
- ce.EntryType &= ~EntryType.Declared;
- }
- }
-
/// <summary>
/// Add the contents of `cache' to the member_hash.
/// </summary>
AddMethods (BindingFlags.Instance | BindingFlags.NonPublic, type);
}
+ static ArrayList overrides = new ArrayList ();
+
void AddMethods (BindingFlags bf, Type type)
{
- //
- // Consider the case:
- //
- // class X { public virtual int f() {} }
- // class Y : X {}
- //
- // When processing 'Y', the method_cache will already have a copy of 'f',
- // with ReflectedType == X. However, we want to ensure that its ReflectedType == Y
- //
MethodBase [] members = type.GetMethods (bf);
Array.Reverse (members);
method_hash.Add (name, list);
}
- if (member.IsVirtual &&
- (member.Attributes & MethodAttributes.NewSlot) == 0) {
- MethodInfo base_method = ((MethodInfo) member).GetBaseDefinition ();
-
- if (base_method == member) {
- //
- // Both mcs and CSC 1.1 seem to emit a somewhat broken
- // ...Invoke () function for delegates: it's missing a 'newslot'.
- // CSC 2.0 emits a 'newslot' for a delegate's Invoke.
- //
- if (member.Name != "Invoke" ||
- !TypeManager.IsDelegateType (type)) {
- Report.SymbolRelatedToPreviousError (base_method);
- Report.Warning (-28,
- "{0} contains a method '{1}' that is marked " +
- " virtual, but doesn't appear to have a slot." +
- " The method may be ignored during overload resolution",
- type, base_method);
- }
- goto skip;
- }
-
- for (;;) {
- list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
- if ((base_method.Attributes & MethodAttributes.NewSlot) != 0)
- break;
+ MethodInfo curr = (MethodInfo) member;
+ while (curr.IsVirtual && (curr.Attributes & MethodAttributes.NewSlot) == 0) {
+ MethodInfo base_method = curr.GetBaseDefinition ();
- //
- // Shouldn't get here. Mono appears to be buggy.
- //
- MethodInfo new_base_method = base_method.GetBaseDefinition ();
- if (new_base_method == base_method) {
- Report.SymbolRelatedToPreviousError (base_method);
- Report.Warning (-28,
- "{0} contains a method '{1}' that is marked " +
- " virtual, but doesn't appear to have a slot." +
- " The method may be ignored during overload resolution",
- type, base_method);
- }
- base_method = new_base_method;
- }
+ if (base_method == curr)
+ // Not every virtual function needs to have a NewSlot flag.
+ break;
+ overrides.Add (curr);
+ list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
+ curr = base_method;
+ }
+ if (overrides.Count > 0) {
+ for (int i = 0; i < overrides.Count; ++i)
+ TypeManager.RegisterOverride ((MethodBase) overrides [i], curr);
+ overrides.Clear ();
}
- skip:
// Unfortunately, the elements returned by Type.GetMethods() aren't
// sorted so we need to do this check for every member.
// Because the MemberCache holds members from this class and all the base classes,
// we can avoid tons of reflection stuff.
//
- public MemberInfo FindMemberToOverride (Type invocationType, string name, Type [] paramTypes, bool is_property)
+ public MemberInfo FindMemberToOverride (Type invocationType, string name, Type [] paramTypes, GenericMethod genericMethod, bool is_property)
{
ArrayList applicable;
if (method_hash != null && !is_property)
if (!TypeManager.IsEqual (paramTypes [j], cmpAttrs [j]))
goto next;
}
-
+
+ //
+ // check generic arguments for methods
+ //
+ if (mi != null) {
+ Type [] cmpGenArgs = mi.GetGenericArguments ();
+ if (genericMethod != null && cmpGenArgs.Length > 0) {
+ if (genericMethod.TypeParameters.Length != cmpGenArgs.Length)
+ goto next;
+ }
+ else if (! (genericMethod == null && cmpGenArgs.Length == 0))
+ goto next;
+ }
+
//
// get one of the methods because this has the visibility info.
//
continue;
MethodBase method_to_compare = (MethodBase)entry.Member;
- if (AttributeTester.AreOverloadedMethodParamsClsCompliant (method.ParameterTypes, TypeManager.GetArgumentTypes (method_to_compare)))
+ AttributeTester.Result result = AttributeTester.AreOverloadedMethodParamsClsCompliant (
+ method.ParameterTypes, TypeManager.GetArgumentTypes (method_to_compare));
+
+ if (result == AttributeTester.Result.Ok)
continue;
IMethodData md = TypeManager.GetMethod (method_to_compare);
// TODO: now we are ignoring CLSCompliance(false) on method from other assembly which is buggy.
// However it is exactly what csc does.
- if (md != null && !md.IsClsCompliaceRequired (method.Parent))
+ if (md != null && !md.IsClsComplianceRequired (method.Parent))
continue;
Report.SymbolRelatedToPreviousError (entry.Member);
- Report.Error (3006, method.Location, "Overloaded method '{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
+ switch (result) {
+ case AttributeTester.Result.RefOutArrayError:
+ Report.Error (3006, method.Location, "Overloaded method `{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
+ continue;
+ case AttributeTester.Result.ArrayArrayError:
+ Report.Error (3007, method.Location, "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant", method.GetSignatureForError ());
+ continue;
+ }
+
+ throw new NotImplementedException (result.ToString ());
}
}
}
projects / mono.git / blobdiff