//
using System;
-using System.Text;
using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection.Emit;
-using System.Reflection;
namespace Mono.CSharp {
Indexer = 1 << 5,
Operator = 1 << 6,
Destructor = 1 << 7,
- //Constant = 1 << 8,
-
- NestedType = 1 << 10,
Class = 1 << 11,
Struct = 1 << 12,
Delegate = 1 << 13,
Enum = 1 << 14,
Interface = 1 << 15,
+ TypeParameter = 1 << 16,
+
+ ArrayType = 1 << 19,
+ PointerType = 1 << 20,
+ InternalCompilerType = 1 << 21,
+ MissingType = 1 << 22,
+ Void = 1 << 23,
- MaskType = Constructor | Event | Field | Method | Property | NestedType | Indexer | Operator | Destructor,
- All = MaskType
+ NestedMask = Class | Struct | Delegate | Enum | Interface,
+ GenericMask = Method | Class | Struct | Delegate | Interface,
+ MaskType = Constructor | Event | Field | Method | Property | Indexer | Operator | Destructor | NestedMask
}
[Flags]
{
None = 0,
- // Member has to be accessible
- AccessibleOnly = 1,
-
// Inspect only queried type members
DeclaredOnly = 1 << 1,
- // Excluded static
+ // Exclude static
InstanceOnly = 1 << 2,
- //
- NoOverloadableOverrides = 1 << 3
+ NoAccessors = 1 << 3,
+
+ // Member has to be override
+ OverrideOnly = 1 << 4
}
-/*
- public struct MemberFilter : IEquatable<MemberCore>
+
+ public struct MemberFilter : IEquatable<MemberSpec>
{
public readonly string Name;
public readonly MemberKind Kind;
- public readonly TypeSpec[] Parameters;
+ public readonly AParametersCollection Parameters;
public readonly TypeSpec MemberType;
+ public readonly int Arity; // -1 to ignore the check
- public MemberFilter (IMethod m)
- {
- Name = m.MethodBuilder.Name;
- Kind = MemberKind.Method;
- Parameters = m.Parameters.Types;
- MemberType = m.ReturnType;
- }
-
- public MemberFilter (string name, MemberKind kind)
+ private MemberFilter (string name, MemberKind kind)
{
Name = name;
Kind = kind;
Parameters = null;
MemberType = null;
+ Arity = -1;
+ }
+
+ public MemberFilter (MethodSpec m)
+ {
+ Name = m.Name;
+ Kind = MemberKind.Method;
+ Parameters = m.Parameters;
+ MemberType = m.ReturnType;
+ Arity = m.Arity;
}
- public MemberFilter (string name, MemberKind kind, TypeSpec[] param, TypeSpec type)
- : this (name, kind)
+ public MemberFilter (string name, int arity, MemberKind kind, AParametersCollection param, TypeSpec type)
{
Name = name;
Kind = kind;
Parameters = param;
MemberType = type;
+ this.Arity = arity;
}
- public static MemberFilter Constuctor (TypeSpec[] param)
+ public static MemberFilter Constructor (AParametersCollection param)
{
- return new MemberFilter (System.Reflection.ConstructorInfo.ConstructorName, MemberKind.Constructor, param, null);
+ return new MemberFilter (Mono.CSharp.Constructor.ConstructorName, 0, MemberKind.Constructor, param, null);
}
public static MemberFilter Property (string name, TypeSpec type)
{
- return new MemberFilter (name, MemberKind.Property, null, type);
+ return new MemberFilter (name, 0, MemberKind.Property, null, type);
}
public static MemberFilter Field (string name, TypeSpec type)
{
- return new MemberFilter (name, MemberKind.Field, null, type);
+ return new MemberFilter (name, 0, MemberKind.Field, null, type);
}
- public static MemberFilter Method (string name, TypeSpec[] param, TypeSpec type)
+ public static MemberFilter Method (string name, int arity, AParametersCollection param, TypeSpec type)
{
- return new MemberFilter (name, MemberKind.Method, param, type);
+ return new MemberFilter (name, arity, MemberKind.Method, param, type);
}
- #region IEquatable<MemberCore> Members
+ #region IEquatable<MemberSpec> Members
- public bool Equals (MemberCore other)
+ public bool Equals (MemberSpec other)
{
// Is the member of the correct type ?
- if ((other.MemberKind & Kind & MemberKind.MaskType) == 0)
+ // TODO: Isn't this redundant ?
+ if ((other.Kind & Kind & MemberKind.MaskType) == 0)
+ return false;
+
+ // Check arity when not disabled
+ if (Arity >= 0 && Arity != other.Arity)
return false;
if (Parameters != null) {
if (other is IParametersMember) {
- AParametersCollection other_param = ((IParametersMember) other).Parameters;
- if (TypeSpecArrayComparer.Default.Equals (Parameters, other_param.Types))
- return true;
+ var other_param = ((IParametersMember) other).Parameters;
+ if (!TypeSpecComparer.Override.IsEqual (Parameters, other_param))
+ return false;
+ } else {
+ return false;
}
-
- return false;
}
if (MemberType != null) {
- //throw new NotImplementedException ();
+ if (other is IInterfaceMemberSpec) {
+ var other_type = ((IInterfaceMemberSpec) other).MemberType;
+ if (!TypeSpecComparer.Override.IsEqual (other_type, MemberType))
+ return false;
+ } else {
+ return false;
+ }
}
return true;
#endregion
}
-*/
- /// <summary>
- /// This is a readonly list of MemberInfo's.
- /// </summary>
- public class MemberList : IList<MemberInfo> {
- public readonly IList<MemberInfo> List;
- int count;
-
- /// <summary>
- /// Create a new MemberList from the given IList.
- /// </summary>
- public MemberList (IList<MemberInfo> list)
- {
- if (list != null)
- this.List = list;
- else
- this.List = new List<MemberInfo> ();
- count = List.Count;
- }
- /// <summary>
- /// Concatenate the ILists `first' and `second' to a new MemberList.
- /// </summary>
- public MemberList (IList<MemberInfo> first, IList<MemberInfo> second)
+ //
+ // The MemberCache is the main members container used by compiler. It contains
+ // all members imported or defined during compilation using on demand filling
+ // process. Inflated containers are also using MemberCache to make inflated
+ // members look like normal definition.
+ //
+ // All of the methods are performance and memory sensitive as the MemberCache
+ // is the underlying engine of all member based operations.
+ //
+ public class MemberCache
+ {
+ [Flags]
+ enum StateFlags
{
- var list = new List<MemberInfo> ();
- list.AddRange (first);
- list.AddRange (second);
- count = list.Count;
- List = list;
+ HasConversionOperator = 1 << 1,
+ HasUserOperator = 1 << 2
}
- public static readonly MemberList Empty = new MemberList (Array.AsReadOnly (new MemberInfo[0]));
+ readonly Dictionary<string, IList<MemberSpec>> member_hash;
+ Dictionary<string, MemberSpec[]> locase_members;
+ IList<MethodSpec> missing_abstract;
+ StateFlags state; // TODO: Move to TypeSpec or ITypeDefinition
- /// <summary>
- /// Cast the MemberList into a MemberInfo[] array.
- /// </summary>
- /// <remarks>
- /// This is an expensive operation, only use it if it's really necessary.
- /// </remarks>
- public static explicit operator MemberInfo [] (MemberList list)
- {
- Timer.StartTimer (TimerType.MiscTimer);
- MemberInfo [] result = new MemberInfo [list.Count];
- list.CopyTo (result, 0);
- Timer.StopTimer (TimerType.MiscTimer);
- return result;
- }
+ public static readonly string IndexerNameAlias = "<this>";
- // ICollection
+ public static readonly MemberCache Empty = new MemberCache (0);
- public int Count {
- get {
- return count;
- }
+ public MemberCache ()
+ : this (16)
+ {
}
- public void CopyTo (MemberInfo[] array, int index)
+ public MemberCache (int capacity)
{
- List.CopyTo (array, index);
+ member_hash = new Dictionary<string, IList<MemberSpec>> (capacity);
}
- // IEnumerable
-
- public IEnumerator<MemberInfo> GetEnumerator ()
+ public MemberCache (MemberCache cache)
+ : this (cache.member_hash.Count)
{
- return List.GetEnumerator ();
+ this.state = cache.state;
}
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
+ //
+ // Creates a new MemberCache for the given `container'.
+ //
+ public MemberCache (TypeContainer container)
+ : this () // TODO: Optimize the size
{
- return List.GetEnumerator ();
}
- // IList
+ //
+ // For cases where we need to union cache members
+ //
+ public void AddBaseType (TypeSpec baseType)
+ {
+ var cache = baseType.MemberCache;
- public bool IsFixedSize {
- get {
- return true;
- }
- }
+ IList<MemberSpec> list;
+ foreach (var entry in cache.member_hash) {
+ if (!member_hash.TryGetValue (entry.Key, out list)) {
+ if (entry.Value.Count == 1) {
+ list = entry.Value;
+ } else {
+ list = new List<MemberSpec> (entry.Value);
+ }
- public bool IsReadOnly {
- get {
- return true;
+ member_hash.Add (entry.Key, list);
+ continue;
+ }
+
+ foreach (var ce in entry.Value) {
+ if (list.Contains (ce))
+ continue;
+
+ if (list is MemberSpec[]) {
+ list = new List<MemberSpec> () { list [0] };
+ member_hash[entry.Key] = list;
+ }
+
+ list.Add (ce);
+ }
}
}
- MemberInfo IList<MemberInfo>.this [int index] {
- get {
- return List [index];
- }
+ //
+ // Member-cache does not contain base members but it does
+ // contain all base interface members, so the Lookup code
+ // can use simple inheritance rules.
+ //
+ public void AddInterface (TypeSpec iface)
+ {
+ var cache = iface.MemberCache;
- set {
- throw new NotSupportedException ();
+ IList<MemberSpec> list;
+ foreach (var entry in cache.member_hash) {
+ if (!member_hash.TryGetValue (entry.Key, out list)) {
+ if (entry.Value.Count == 1) {
+ list = entry.Value;
+ } else {
+ list = new List<MemberSpec> (entry.Value);
+ }
+
+ member_hash.Add (entry.Key, list);
+ continue;
+ }
+
+ foreach (var ce in entry.Value) {
+ if (list.Contains (ce))
+ continue;
+
+ if (AddInterfaceMember (ce, ref list))
+ member_hash[entry.Key] = list;
+ }
}
- }
- // FIXME: try to find out whether we can avoid the cast in this indexer.
- public MemberInfo this [int index] {
- get {
- return (MemberInfo) List [index];
+ // Add also all base interfaces
+ if (iface.Interfaces != null) {
+ foreach (var base_iface in iface.Interfaces)
+ AddInterface (base_iface);
}
}
- public void Add (MemberInfo value)
+ public void AddMember (InterfaceMemberBase imb, string exlicitName, MemberSpec ms)
{
- throw new NotSupportedException ();
+ // Explicit names cannot be looked-up but can be used for
+ // collision checking (no name mangling needed)
+ if (imb.IsExplicitImpl)
+ AddMember (exlicitName, ms, false);
+ else
+ AddMember (ms);
}
- public void Clear ()
+ //
+ // Add non-explicit member to member cache
+ //
+ public void AddMember (MemberSpec ms)
{
- throw new NotSupportedException ();
+ AddMember (GetLookupName (ms), ms, false);
}
- public bool Contains (MemberInfo value)
+ void AddMember (string name, MemberSpec member, bool removeHiddenMembers)
{
- return List.Contains (value);
- }
+ if (member.Kind == MemberKind.Operator) {
+ var dt = member.DeclaringType;
+ switch (dt.BuiltinType) {
+ case BuiltinTypeSpec.Type.String:
+ case BuiltinTypeSpec.Type.Delegate:
+ case BuiltinTypeSpec.Type.MulticastDelegate:
+ // Some core types have user operators but they cannot be used as normal
+ // user operators as they are predefined and therefore having different
+ // rules (e.g. binary operators) by not setting the flag we hide them for
+ // user conversions
+ // TODO: Should I do this for all core types ?
+ break;
+ default:
+ if (name == Operator.GetMetadataName (Operator.OpType.Implicit) || name == Operator.GetMetadataName (Operator.OpType.Explicit)) {
+ state |= StateFlags.HasConversionOperator;
+ } else {
+ state |= StateFlags.HasUserOperator;
+ }
- public int IndexOf (MemberInfo value)
- {
- return List.IndexOf (value);
- }
+ break;
+ }
+ }
- public void Insert (int index, MemberInfo value)
- {
- throw new NotSupportedException ();
- }
+ IList<MemberSpec> list;
+ if (!member_hash.TryGetValue (name, out list)) {
+ member_hash.Add (name, new MemberSpec[] { member });
+ return;
+ }
- public bool Remove (MemberInfo value)
- {
- throw new NotSupportedException ();
- }
+ if (removeHiddenMembers && member.DeclaringType.IsInterface) {
+ if (AddInterfaceMember (member, ref list))
+ member_hash[name] = list;
+ } else {
+ if (list.Count == 1) {
+ list = new List<MemberSpec> () { list[0] };
+ member_hash[name] = list;
+ }
- public void RemoveAt (int index)
- {
- throw new NotSupportedException ();
+ list.Add (member);
+ }
}
- }
- /// <summary>
- /// This interface is used to get all members of a class when creating the
- /// member cache. It must be implemented by all DeclSpace derivatives which
- /// want to support the member cache and by TypeHandle to get caching of
- /// non-dynamic types.
- /// </summary>
- public interface IMemberContainer {
- /// <summary>
- /// The name of the IMemberContainer. This is only used for
- /// debugging purposes.
- /// </summary>
- string Name {
- get;
+ public void AddMemberImported (MemberSpec ms)
+ {
+ AddMember (GetLookupName (ms), ms, true);
}
- /// <summary>
- /// The type of this IMemberContainer.
- /// </summary>
- Type Type {
- get;
- }
+ //
+ // Ignores any base interface member which can be hidden
+ // by this interface
+ //
+ static bool AddInterfaceMember (MemberSpec member, ref IList<MemberSpec> existing)
+ {
+ var member_param = member is IParametersMember ? ((IParametersMember) member).Parameters : ParametersCompiled.EmptyReadOnlyParameters;
- /// <summary>
- /// Returns the IMemberContainer of the base class or null if this
- /// is an interface or TypeManger.object_type.
- /// This is used when creating the member cache for a class to get all
- /// members from the base class.
- /// </summary>
- MemberCache BaseCache {
- get;
- }
+ //
+ // interface IA : IB { int Prop { set; } }
+ // interface IB { bool Prop { get; } }
+ //
+ // IB.Prop is never accessible from IA interface
+ //
+ for (int i = 0; i < existing.Count; ++i) {
+ var entry = existing[i];
- /// <summary>
- /// Whether this is an interface.
- /// </summary>
- bool IsInterface {
- get;
- }
+ if (entry.Arity != member.Arity)
+ continue;
- /// <summary>
- /// Returns all members of this class with the corresponding MemberTypes
- /// and BindingFlags.
- /// </summary>
- /// <remarks>
- /// When implementing this method, make sure not to return any inherited
- /// members and check the MemberTypes and BindingFlags properly.
- /// Unfortunately, System.Reflection is lame and doesn't provide a way to
- /// get the BindingFlags (static/non-static,public/non-public) in the
- /// MemberInfo class, but the cache needs this information. That's why
- /// this method is called multiple times with different BindingFlags.
- /// </remarks>
- MemberList GetMembers (MemberTypes mt, BindingFlags bf);
- }
+ if (entry is IParametersMember) {
+ var entry_param = ((IParametersMember) entry).Parameters;
+ if (!TypeSpecComparer.Override.IsEqual (entry_param, member_param))
+ continue;
+ }
- /// <summary>
- /// The MemberCache is used by dynamic and non-dynamic types to speed up
- /// member lookups. It has a member name based hash table; it maps each member
- /// name to a list of CacheEntry objects. Each CacheEntry contains a MemberInfo
- /// and the BindingFlags that were initially used to get it. The cache contains
- /// all members of the current class and all inherited members. If this cache is
- /// for an interface types, it also contains all inherited members.
- ///
- /// There are two ways to get a MemberCache:
- /// * if this is a dynamic type, lookup the corresponding DeclSpace and then
- /// use the DeclSpace.MemberCache property.
- /// * if this not a dynamic type, call TypeHandle.GetTypeHandle() to get a
- /// TypeHandle instance for the type and then use TypeHandle.MemberCache.
- /// </summary>
- public class MemberCache {
- public readonly IMemberContainer Container;
- protected Dictionary<string, List<CacheEntry>> member_hash;
- protected Dictionary<string, List<CacheEntry>> method_hash;
-
- Dictionary<string, object> locase_table;
-
- static List<MethodInfo> overrides = new List<MethodInfo> ();
-
- /// <summary>
- /// Create a new MemberCache for the given IMemberContainer `container'.
- /// </summary>
- public MemberCache (IMemberContainer container)
- {
- this.Container = container;
+ if (member.DeclaringType.ImplementsInterface (entry.DeclaringType, false)) {
+ if (existing.Count == 1) {
+ existing = new MemberSpec[] { member };
+ return true;
+ }
- Timer.IncrementCounter (CounterType.MemberCache);
- Timer.StartTimer (TimerType.CacheInit);
+ existing.RemoveAt (i--);
+ continue;
+ }
- // If we have a base class (we have a base class unless we're
- // TypeManager.object_type), we deep-copy its MemberCache here.
- if (Container.BaseCache != null)
- member_hash = SetupCache (Container.BaseCache);
- else
- member_hash = new Dictionary<string, List<CacheEntry>> ();
-
- // If this is neither a dynamic type nor an interface, create a special
- // method cache with all declared and inherited methods.
- Type type = container.Type;
- if (!(type is TypeBuilder) && !type.IsInterface &&
- // !(type.IsGenericType && (type.GetGenericTypeDefinition () is TypeBuilder)) &&
- !TypeManager.IsGenericType (type) && !TypeManager.IsGenericParameter (type) &&
- (Container.BaseCache == null || Container.BaseCache.method_hash != null)) {
- method_hash = new Dictionary<string, List<CacheEntry>> ();
- AddMethods (type);
+ if ((entry.DeclaringType == member.DeclaringType && entry.IsAccessor == member.IsAccessor) ||
+ entry.DeclaringType.ImplementsInterface (member.DeclaringType, false))
+ return false;
}
- // Add all members from the current class.
- AddMembers (Container);
+ if (existing.Count == 1) {
+ existing = new List<MemberSpec> () { existing[0], member };
+ return true;
+ }
- Timer.StopTimer (TimerType.CacheInit);
+ existing.Add (member);
+ return false;
}
- public MemberCache (Type baseType, IMemberContainer container)
+ public static MemberSpec FindMember (TypeSpec container, MemberFilter filter, BindingRestriction restrictions)
{
- this.Container = container;
- if (baseType == null)
- this.member_hash = new Dictionary<string, List<CacheEntry>> ();
- else
- this.member_hash = SetupCache (TypeManager.LookupMemberCache (baseType));
- }
+ do {
+ IList<MemberSpec> applicable;
+ if (container.MemberCache.member_hash.TryGetValue (filter.Name, out applicable)) {
+ // Start from the end because interface members are in reverse order
+ for (int i = applicable.Count - 1; i >= 0; i--) {
+ var entry = applicable [i];
+
+ if ((restrictions & BindingRestriction.InstanceOnly) != 0 && entry.IsStatic)
+ continue;
- public MemberCache (Type[] ifaces)
- {
- //
- // The members of this cache all belong to other caches.
- // So, 'Container' will not be used.
- //
- this.Container = null;
+ if ((restrictions & BindingRestriction.NoAccessors) != 0 && entry.IsAccessor)
+ continue;
- member_hash = new Dictionary<string, List<CacheEntry>> ();
- if (ifaces == null)
- return;
+ if ((restrictions & BindingRestriction.OverrideOnly) != 0 && (entry.Modifiers & Modifiers.OVERRIDE) == 0)
+ continue;
- foreach (Type itype in ifaces)
- AddCacheContents (TypeManager.LookupMemberCache (itype));
- }
+ if (!filter.Equals (entry))
+ continue;
- public MemberCache (IMemberContainer container, Type base_class, Type[] ifaces)
- {
- this.Container = container;
+ if ((restrictions & BindingRestriction.DeclaredOnly) != 0 && container.IsInterface && entry.DeclaringType != container)
+ continue;
- // If we have a base class (we have a base class unless we're
- // TypeManager.object_type), we deep-copy its MemberCache here.
- if (Container.BaseCache != null)
- member_hash = SetupCache (Container.BaseCache);
- else
- member_hash = new Dictionary<string, List<CacheEntry>> ();
-
- if (base_class != null)
- AddCacheContents (TypeManager.LookupMemberCache (base_class));
- if (ifaces != null) {
- foreach (Type itype in ifaces) {
- MemberCache cache = TypeManager.LookupMemberCache (itype);
- if (cache != null)
- AddCacheContents (cache);
+ return entry;
+ }
}
- }
- }
- /// <summary>
- /// Bootstrap this member cache by doing a deep-copy of our base.
- /// </summary>
- static Dictionary<string, List<CacheEntry>> SetupCache (MemberCache base_class)
- {
- if (base_class == null)
- return new Dictionary<string, List<CacheEntry>> ();
+ if ((restrictions & BindingRestriction.DeclaredOnly) != 0)
+ break;
- var hash = new Dictionary<string, List<CacheEntry>> (base_class.member_hash.Count);
- var it = base_class.member_hash.GetEnumerator ();
- while (it.MoveNext ()) {
- hash.Add (it.Current.Key, new List<CacheEntry> (it.Current.Value));
- }
-
- return hash;
+ container = container.BaseType;
+ } while (container != null);
+
+ return null;
}
-
+
//
- // Converts ModFlags to BindingFlags
+ // A special method to work with member lookup only. It returns a list of all members named @name
+ // starting from @container. It's very performance sensitive
//
- static BindingFlags GetBindingFlags (Modifiers modifiers)
+ public static IList<MemberSpec> FindMembers (TypeSpec container, string name, bool declaredOnly)
{
- BindingFlags bf;
- if ((modifiers & Modifiers.STATIC) != 0)
- bf = BindingFlags.Static;
- else
- bf = BindingFlags.Instance;
+ IList<MemberSpec> applicable;
- if ((modifiers & Modifiers.PRIVATE) != 0)
- bf |= BindingFlags.NonPublic;
- else
- bf |= BindingFlags.Public;
+ do {
+ if (container.MemberCache.member_hash.TryGetValue (name, out applicable) || declaredOnly)
+ return applicable;
- return bf;
- }
+ container = container.BaseType;
+ } while (container != null);
- /// <summary>
- /// Add the contents of `cache' to the member_hash.
- /// </summary>
- void AddCacheContents (MemberCache cache)
- {
- var it = cache.member_hash.GetEnumerator ();
- while (it.MoveNext ()) {
- List<CacheEntry> list;
- if (!member_hash.TryGetValue (it.Current.Key, out list))
- member_hash [it.Current.Key] = list = new List<CacheEntry> ();
-
- var entries = it.Current.Value;
- for (int i = entries.Count-1; i >= 0; i--) {
- var entry = entries [i];
-
- if (entry.Container != cache.Container)
- break;
- list.Add (entry);
- }
- }
- }
-
- /// <summary>
- /// Add all members from class `container' to the cache.
- /// </summary>
- void AddMembers (IMemberContainer container)
- {
- // We need to call AddMembers() with a single member type at a time
- // to get the member type part of CacheEntry.EntryType right.
- if (!container.IsInterface) {
- AddMembers (MemberTypes.Constructor, container);
- AddMembers (MemberTypes.Field, container);
- }
- AddMembers (MemberTypes.Method, container);
- AddMembers (MemberTypes.Property, container);
- AddMembers (MemberTypes.Event, container);
- // Nested types are returned by both Static and Instance searches.
- AddMembers (MemberTypes.NestedType,
- BindingFlags.Static | BindingFlags.Public, container);
- AddMembers (MemberTypes.NestedType,
- BindingFlags.Static | BindingFlags.NonPublic, container);
+ return null;
}
- void AddMembers (MemberTypes mt, IMemberContainer container)
+ //
+ // Finds the nested type in container
+ //
+ public static TypeSpec FindNestedType (TypeSpec container, string name, int arity)
{
- AddMembers (mt, BindingFlags.Static | BindingFlags.Public, container);
- AddMembers (mt, BindingFlags.Static | BindingFlags.NonPublic, container);
- AddMembers (mt, BindingFlags.Instance | BindingFlags.Public, container);
- AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, container);
- }
+ IList<MemberSpec> applicable;
+ TypeSpec best_match = null;
+ do {
+ // TODO: Don't know how to handle this yet
+ // When resolving base type of nested type, parent type must have
+ // base type resolved to scan full hierarchy correctly
+ // Similarly MemberCacheTypes will inflate BaseType and Interfaces
+ // based on type definition
+ var tc = container.MemberDefinition as TypeContainer;
+ if (tc != null)
+ tc.DefineType ();
+
+ if (container.MemberCacheTypes.member_hash.TryGetValue (name, out applicable)) {
+ for (int i = applicable.Count - 1; i >= 0; i--) {
+ var entry = applicable[i];
+ if ((entry.Kind & MemberKind.NestedMask) == 0)
+ continue;
- public void AddMember (MemberInfo mi, MemberCore mc)
- {
- AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mi.Name, mi);
- }
+ var ts = (TypeSpec) entry;
+ if (arity == ts.Arity)
+ return ts;
- public void AddGenericMember (MemberInfo mi, InterfaceMemberBase mc)
- {
- AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container,
- MemberName.MakeName (mc.GetFullName (mc.MemberName), mc.MemberName.TypeArguments), mi);
- }
+ if (arity < 0) {
+ if (best_match == null) {
+ best_match = ts;
+ } else if (System.Math.Abs (ts.Arity + arity) < System.Math.Abs (ts.Arity + arity)) {
+ best_match = ts;
+ }
+ }
+ }
+ }
- public void AddNestedType (DeclSpace type)
- {
- AddMember (MemberTypes.NestedType, GetBindingFlags (type.ModFlags), (IMemberContainer) type.Parent,
- type.TypeBuilder.Name, type.TypeBuilder);
- }
+ container = container.BaseType;
+ } while (container != null);
- public void AddInterface (MemberCache baseCache)
- {
- if (baseCache.member_hash.Count > 0)
- AddCacheContents (baseCache);
+ return best_match;
}
- void AddMember (MemberTypes mt, BindingFlags bf, IMemberContainer container,
- string name, MemberInfo member)
+ //
+ // Looks for extension methods with defined name and extension type
+ //
+ public List<MethodSpec> FindExtensionMethods (IMemberContext invocationContext, TypeSpec extensionType, string name, int arity)
{
- // We use a name-based hash table of ArrayList's.
- List<CacheEntry> list;
- if (!member_hash.TryGetValue (name, out list)) {
- list = new List<CacheEntry> (1);
- member_hash.Add (name, list);
- }
+ IList<MemberSpec> entries;
+ if (!member_hash.TryGetValue (name, out entries))
+ return null;
- // When this method is called for the current class, the list will
- // already contain all inherited members from our base classes.
- // We cannot add new members in front of the list since this'd be an
- // expensive operation, that's why the list is sorted in reverse order
- // (ie. members from the current class are coming last).
- list.Add (new CacheEntry (container, member, mt, bf));
- }
+ List<MethodSpec> candidates = null;
+ foreach (var entry in entries) {
+ if (entry.Kind != MemberKind.Method || (arity > 0 && entry.Arity != arity))
+ continue;
- /// <summary>
- /// Add all members from class `container' with the requested MemberTypes and
- /// BindingFlags to the cache. This method is called multiple times with different
- /// MemberTypes and BindingFlags.
- /// </summary>
- void AddMembers (MemberTypes mt, BindingFlags bf, IMemberContainer container)
- {
- MemberList members = container.GetMembers (mt, bf);
+ var ms = (MethodSpec) entry;
+ if (!ms.IsExtensionMethod)
+ continue;
- foreach (MemberInfo member in members) {
- string name = member.Name;
+ if (!ms.IsAccessible (invocationContext))
+ continue;
- AddMember (mt, bf, container, name, member);
+ //
+ // Extension methods cannot be nested hence checking parent is enough
+ //
+ if ((ms.DeclaringType.Modifiers & Modifiers.INTERNAL) != 0 && !ms.DeclaringType.MemberDefinition.IsInternalAsPublic (invocationContext.Module.DeclaringAssembly))
+ continue;
- if (member is MethodInfo) {
- string gname = TypeManager.GetMethodName ((MethodInfo) member);
- if (gname != name)
- AddMember (mt, bf, container, gname, member);
- }
+ if (candidates == null)
+ candidates = new List<MethodSpec> ();
+ candidates.Add (ms);
}
- }
- /// <summary>
- /// Add all declared and inherited methods from class `type' to the method cache.
- /// </summary>
- void AddMethods (Type type)
- {
- AddMethods (BindingFlags.Static | BindingFlags.Public |
- BindingFlags.FlattenHierarchy, type);
- AddMethods (BindingFlags.Static | BindingFlags.NonPublic |
- BindingFlags.FlattenHierarchy, type);
- AddMethods (BindingFlags.Instance | BindingFlags.Public, type);
- AddMethods (BindingFlags.Instance | BindingFlags.NonPublic, type);
+ return candidates;
}
- void AddMethods (BindingFlags bf, Type type)
+ //
+ // Returns base members of @member member if no exact match is found @bestCandidate returns
+ // the best match
+ //
+ public static MemberSpec FindBaseMember (MemberCore member, out MemberSpec bestCandidate, ref bool overrides)
{
- MethodBase [] members = type.GetMethods (bf);
+ bestCandidate = null;
+ var container = member.Parent.PartialContainer.Definition;
+ if (!container.IsInterface) {
+ container = container.BaseType;
- Array.Reverse (members);
+ // It can happen for a user definition of System.Object
+ if (container == null)
+ return null;
+ }
- foreach (MethodBase member in members) {
- string name = member.Name;
+ string name = GetLookupName (member);
+ var member_param = member is IParametersMember ? ((IParametersMember) member).Parameters : null;
- // We use a name-based hash table of ArrayList's.
- List<CacheEntry> list;
- if (!method_hash.TryGetValue (name, out list)) {
- list = new List<CacheEntry> (1);
- method_hash.Add (name, list);
- }
+ var mkind = GetMemberCoreKind (member);
+ bool member_with_accessors = mkind == MemberKind.Indexer || mkind == MemberKind.Property;
- MethodInfo curr = (MethodInfo) member;
- while (curr.IsVirtual && (curr.Attributes & MethodAttributes.NewSlot) == 0) {
- MethodInfo base_method = curr.GetBaseDefinition ();
+ IList<MemberSpec> applicable;
+ MemberSpec ambig_candidate = null;
- if (base_method == curr)
- // Not every virtual function needs to have a NewSlot flag.
- break;
+ do {
+ if (container.MemberCache.member_hash.TryGetValue (name, out applicable)) {
+ for (int i = 0; i < applicable.Count; ++i) {
+ var entry = applicable [i];
- overrides.Add (curr);
- list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
- curr = base_method;
- }
+ if ((entry.Modifiers & Modifiers.PRIVATE) != 0)
+ continue;
- if (overrides.Count > 0) {
- for (int i = 0; i < overrides.Count; ++i)
- TypeManager.RegisterOverride ((MethodBase) overrides [i], curr);
- overrides.Clear ();
- }
+ if ((entry.Modifiers & Modifiers.AccessibilityMask) == Modifiers.INTERNAL &&
+ !entry.DeclaringType.MemberDefinition.IsInternalAsPublic (member.Module.DeclaringAssembly))
+ continue;
- // Unfortunately, the elements returned by Type.GetMethods() aren't
- // sorted so we need to do this check for every member.
- BindingFlags new_bf = bf;
- if (member.DeclaringType == type)
- new_bf |= BindingFlags.DeclaredOnly;
+ //
+ // Isn't the member of same kind ?
+ //
+ if ((entry.Kind & ~MemberKind.Destructor & mkind & MemberKind.MaskType) == 0) {
+ // Destructors are ignored as they cannot be overridden by user
+ if ((entry.Kind & MemberKind.Destructor) != 0)
+ continue;
- list.Add (new CacheEntry (Container, member, MemberTypes.Method, new_bf));
- }
- }
+ // A method with different arity does not hide base member
+ if (mkind != MemberKind.Method && member.MemberName.Arity != entry.Arity)
+ continue;
- /// <summary>
- /// Compute and return a appropriate `EntryType' magic number for the given
- /// MemberTypes and BindingFlags.
- /// </summary>
- protected static EntryType GetEntryType (MemberTypes mt, BindingFlags bf)
- {
- EntryType type = EntryType.None;
-
- if ((mt & MemberTypes.Constructor) != 0)
- type |= EntryType.Constructor;
- if ((mt & MemberTypes.Event) != 0)
- type |= EntryType.Event;
- if ((mt & MemberTypes.Field) != 0)
- type |= EntryType.Field;
- if ((mt & MemberTypes.Method) != 0)
- type |= EntryType.Method;
- if ((mt & MemberTypes.Property) != 0)
- type |= EntryType.Property;
- // Nested types are returned by static and instance searches.
- if ((mt & MemberTypes.NestedType) != 0)
- type |= EntryType.NestedType | EntryType.Static | EntryType.Instance;
-
- if ((bf & BindingFlags.Instance) != 0)
- type |= EntryType.Instance;
- if ((bf & BindingFlags.Static) != 0)
- type |= EntryType.Static;
- if ((bf & BindingFlags.Public) != 0)
- type |= EntryType.Public;
- if ((bf & BindingFlags.NonPublic) != 0)
- type |= EntryType.NonPublic;
- if ((bf & BindingFlags.DeclaredOnly) != 0)
- type |= EntryType.Declared;
-
- return type;
- }
+ bestCandidate = entry;
+ return null;
+ }
- /// <summary>
- /// The `MemberTypes' enumeration type is a [Flags] type which means that it may
- /// denote multiple member types. Returns true if the given flags value denotes a
- /// single member types.
- /// </summary>
- public static bool IsSingleMemberType (MemberTypes mt)
- {
- switch (mt) {
- case MemberTypes.Constructor:
- case MemberTypes.Event:
- case MemberTypes.Field:
- case MemberTypes.Method:
- case MemberTypes.Property:
- case MemberTypes.NestedType:
- return true;
+ //
+ // Same kind of different arity is valid
+ //
+ if (member.MemberName.Arity != entry.Arity) {
+ continue;
+ }
- default:
- return false;
- }
- }
+ if ((entry.Kind & mkind & (MemberKind.Method | MemberKind.Indexer)) != 0) {
+ if (entry.IsAccessor != member is AbstractPropertyEventMethod)
+ continue;
- /// <summary>
- /// We encode the MemberTypes and BindingFlags of each members in a "magic"
- /// number to speed up the searching process.
- /// </summary>
- [Flags]
- public enum EntryType {
- None = 0x000,
+ var pm = entry as IParametersMember;
+ if (!TypeSpecComparer.Override.IsEqual (pm.Parameters, member_param))
+ continue;
+ }
- Instance = 0x001,
- Static = 0x002,
- MaskStatic = Instance|Static,
+ //
+ // Skip override for member with accessors. It may not fully implement the base member
+ // but keep flag we found an implementation in case the base member is abstract
+ //
+ if (member_with_accessors && ((entry.Modifiers & (Modifiers.OVERRIDE | Modifiers.SEALED)) == Modifiers.OVERRIDE)) {
+ //
+ // Set candidate to override implementation to flag we found an implementation
+ //
+ overrides = true;
+ continue;
+ }
- Public = 0x004,
- NonPublic = 0x008,
- MaskProtection = Public|NonPublic,
+ //
+ // For members with parameters we can encounter an ambiguous candidates (they match exactly)
+ // because generic type parameters could be inflated into same types
+ //
+ if (ambig_candidate == null && (entry.Kind & mkind & (MemberKind.Method | MemberKind.Indexer)) != 0) {
+ bestCandidate = null;
+ ambig_candidate = entry;
+ continue;
+ }
- Declared = 0x010,
+ bestCandidate = ambig_candidate;
+ return entry;
+ }
+ }
- Constructor = 0x020,
- Event = 0x040,
- Field = 0x080,
- Method = 0x100,
- Property = 0x200,
- NestedType = 0x400,
+ if (container.IsInterface || ambig_candidate != null)
+ break;
- NotExtensionMethod = 0x800,
+ container = container.BaseType;
+ } while (container != null);
- MaskType = Constructor|Event|Field|Method|Property|NestedType
+ return ambig_candidate;
}
- public class CacheEntry {
- public readonly IMemberContainer Container;
- public EntryType EntryType;
- public readonly MemberInfo Member;
-
- public CacheEntry (IMemberContainer container, MemberInfo member,
- MemberTypes mt, BindingFlags bf)
- {
- this.Container = container;
- this.Member = member;
- this.EntryType = GetEntryType (mt, bf);
+ //
+ // Returns inflated version of MemberSpec, it works similarly to
+ // SRE TypeBuilder.GetMethod
+ //
+ public static T GetMember<T> (TypeSpec container, T spec) where T : MemberSpec
+ {
+ IList<MemberSpec> applicable;
+ if (container.MemberCache.member_hash.TryGetValue (GetLookupName (spec), out applicable)) {
+ for (int i = applicable.Count - 1; i >= 0; i--) {
+ var entry = applicable[i];
+ if (entry.MemberDefinition == spec.MemberDefinition)
+ return (T) entry;
+ }
}
- public override string ToString ()
- {
- return String.Format ("CacheEntry ({0}:{1}:{2})", Container.Name,
- EntryType, Member);
- }
+ throw new InternalErrorException ("Missing member `{0}' on inflated type `{1}'",
+ spec.GetSignatureForError (), container.GetSignatureForError ());
}
- /// <summary>
- /// This is called each time we're walking up one level in the class hierarchy
- /// and checks whether we can abort the search since we've already found what
- /// we were looking for.
- /// </summary>
- protected bool DoneSearching (IList<MemberInfo> list)
+ static MemberKind GetMemberCoreKind (MemberCore member)
{
- //
- // We've found exactly one member in the current class and it's not
- // a method or constructor.
- //
- if (list.Count == 1 && !(list [0] is MethodBase))
- return true;
-
- //
- // Multiple properties: we query those just to find out the indexer
- // name
- //
- if ((list.Count > 0) && (list [0] is PropertyInfo))
- return true;
-
- return false;
+ if (member is FieldBase)
+ return MemberKind.Field;
+ if (member is Indexer)
+ return MemberKind.Indexer;
+ if (member is Class)
+ return MemberKind.Class;
+ if (member is Struct)
+ return MemberKind.Struct;
+ if (member is Destructor)
+ return MemberKind.Destructor;
+ if (member is Method)
+ return MemberKind.Method;
+ if (member is Property)
+ return MemberKind.Property;
+ if (member is EventField)
+ return MemberKind.Event;
+ if (member is Interface)
+ return MemberKind.Interface;
+ if (member is EventProperty)
+ return MemberKind.Event;
+ if (member is Delegate)
+ return MemberKind.Delegate;
+ if (member is Enum)
+ return MemberKind.Enum;
+
+ throw new NotImplementedException (member.GetType ().ToString ());
}
- /// <summary>
- /// Looks up members with name `name'. If you provide an optional
- /// filter function, it'll only be called with members matching the
- /// requested member name.
- ///
- /// This method will try to use the cache to do the lookup if possible.
- ///
- /// Unlike other FindMembers implementations, this method will always
- /// check all inherited members - even when called on an interface type.
- ///
- /// If you know that you're only looking for methods, you should use
- /// MemberTypes.Method alone since this speeds up the lookup a bit.
- /// When doing a method-only search, it'll try to use a special method
- /// cache (unless it's a dynamic type or an interface) and the returned
- /// MemberInfo's will have the correct ReflectedType for inherited methods.
- /// The lookup process will automatically restart itself in method-only
- /// search mode if it discovers that it's about to return methods.
- /// </summary>
- List<MemberInfo> global = new List<MemberInfo> ();
- bool using_global;
-
- static MemberInfo [] emptyMemberInfo = new MemberInfo [0];
-
- public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, string name,
- MemberFilter filter, object criteria)
+ public static IList<MemberSpec> GetCompletitionMembers (IMemberContext ctx, TypeSpec container, string name)
{
- if (using_global)
- throw new Exception ();
-
- bool declared_only = (bf & BindingFlags.DeclaredOnly) != 0;
- bool method_search = mt == MemberTypes.Method;
- // If we have a method cache and we aren't already doing a method-only search,
- // then we restart a method search if the first match is a method.
- bool do_method_search = !method_search && (method_hash != null);
-
- List<CacheEntry> applicable;
-
- // If this is a method-only search, we try to use the method cache if
- // possible; a lookup in the method cache will return a MemberInfo with
- // the correct ReflectedType for inherited methods.
-
- if (method_search && (method_hash != null))
- method_hash.TryGetValue (name, out applicable);
- else
- member_hash.TryGetValue (name, out applicable);
+ var matches = new List<MemberSpec> ();
+ foreach (var entry in container.MemberCache.member_hash) {
+ foreach (var name_entry in entry.Value) {
+ if (name_entry.IsAccessor)
+ continue;
+
+ if ((name_entry.Kind & (MemberKind.Constructor | MemberKind.Destructor | MemberKind.Operator)) != 0)
+ continue;
+
+ if (!name_entry.IsAccessible (ctx))
+ continue;
+
+ if (name == null || name_entry.Name.StartsWith (name)) {
+ matches.Add (name_entry);
+ }
+ }
+ }
- if (applicable == null)
- return emptyMemberInfo;
+ return matches;
+ }
+ //
+ // Returns members of @iface only, base members are ignored
+ //
+ public static List<MethodSpec> GetInterfaceMethods (TypeSpec iface)
+ {
//
- // 32 slots gives 53 rss/54 size
- // 2/4 slots gives 55 rss
+ // MemberCache flatten interfaces, therefore in cases like this one
+ //
+ // interface IA : IB {}
+ // interface IB { void Foo () }
//
- // Strange: from 25,000 calls, only 1,800
- // are above 2. Why does this impact it?
+ // we would return Foo inside IA which is not expected in this case
//
- global.Clear ();
- using_global = true;
+ var methods = new List<MethodSpec> ();
+ foreach (var entry in iface.MemberCache.member_hash.Values) {
+ foreach (var name_entry in entry) {
+ if (iface == name_entry.DeclaringType) {
+ if (name_entry.Kind == MemberKind.Method) {
+ methods.Add ((MethodSpec) name_entry);
+ }
+ }
+ }
+ }
- Timer.StartTimer (TimerType.CachedLookup);
+ return methods;
+ }
- EntryType type = GetEntryType (mt, bf);
+ //
+ // Returns all not implememted abstract members inside abstract type
+ // NOTE: Returned list is shared and must not be modified
+ //
+ public static IList<MethodSpec> GetNotImplementedAbstractMethods (TypeSpec type)
+ {
+ if (type.MemberCache.missing_abstract != null)
+ return type.MemberCache.missing_abstract;
+
+ var abstract_methods = new List<MethodSpec> ();
+ List<TypeSpec> hierarchy = null;
- IMemberContainer current = Container;
+ //
+ // Stage 1: top-to-bottom scan for abstract members
+ //
+ var abstract_type = type;
+ while (true) {
+ foreach (var entry in abstract_type.MemberCache.member_hash) {
+ foreach (var name_entry in entry.Value) {
+ if ((name_entry.Modifiers & Modifiers.ABSTRACT) == 0)
+ continue;
- bool do_interface_search = current.IsInterface;
+ if (name_entry.Kind != MemberKind.Method)
+ continue;
- // `applicable' is a list of all members with the given member name `name'
- // in the current class and all its base classes. The list is sorted in
- // reverse order due to the way how the cache is initialy created (to speed
- // things up, we're doing a deep-copy of our base).
+ abstract_methods.Add ((MethodSpec) name_entry);
+ }
+ }
- for (int i = applicable.Count-1; i >= 0; i--) {
- CacheEntry entry = (CacheEntry) applicable [i];
+ var base_type = abstract_type.BaseType;
+ if (!base_type.IsAbstract)
+ break;
- // This happens each time we're walking one level up in the class
- // hierarchy. If we're doing a DeclaredOnly search, we must abort
- // the first time this happens (this may already happen in the first
- // iteration of this loop if there are no members with the name we're
- // looking for in the current class).
- if (entry.Container != current) {
- if (declared_only)
- break;
+ if (hierarchy == null)
+ hierarchy = new List<TypeSpec> ();
- if (!do_interface_search && DoneSearching (global))
- break;
+ hierarchy.Add (abstract_type);
+ abstract_type = base_type;
+ }
- current = entry.Container;
- }
+ int not_implemented_count = abstract_methods.Count;
+ if (not_implemented_count == 0 || hierarchy == null) {
+ type.MemberCache.missing_abstract = abstract_methods;
+ return type.MemberCache.missing_abstract;
+ }
- // Is the member of the correct type ?
- if ((entry.EntryType & type & EntryType.MaskType) == 0)
+ //
+ // Stage 2: Remove already implemented methods
+ //
+ foreach (var type_up in hierarchy) {
+ var members = type_up.MemberCache.member_hash;
+ if (members.Count == 0)
continue;
- // Is the member static/non-static ?
- if ((entry.EntryType & type & EntryType.MaskStatic) == 0)
- continue;
+ for (int i = 0; i < abstract_methods.Count; ++i) {
+ var candidate = abstract_methods [i];
+ if (candidate == null)
+ continue;
- // Apply the filter to it.
- if (filter (entry.Member, criteria)) {
- if ((entry.EntryType & EntryType.MaskType) != EntryType.Method) {
- do_method_search = false;
- }
-
- // Because interfaces support multiple inheritance we have to be sure that
- // base member is from same interface, so only top level member will be returned
- if (do_interface_search && global.Count > 0) {
- bool member_already_exists = false;
-
- foreach (MemberInfo mi in global) {
- if (mi is MethodBase)
- continue;
+ IList<MemberSpec> applicable;
+ if (!members.TryGetValue (candidate.Name, out applicable))
+ continue;
- if (IsInterfaceBaseInterface (TypeManager.GetInterfaces (mi.DeclaringType), entry.Member.DeclaringType)) {
- member_already_exists = true;
- break;
- }
- }
- if (member_already_exists)
+ var filter = new MemberFilter (candidate);
+ foreach (var item in applicable) {
+ if ((item.Modifiers & (Modifiers.OVERRIDE | Modifiers.VIRTUAL)) == 0)
continue;
- }
- global.Add (entry.Member);
+ if (filter.Equals (item)) {
+ --not_implemented_count;
+ abstract_methods [i] = null;
+ break;
+ }
+ }
}
}
- Timer.StopTimer (TimerType.CachedLookup);
+ if (not_implemented_count == abstract_methods.Count) {
+ type.MemberCache.missing_abstract = abstract_methods;
+ return type.MemberCache.missing_abstract;
+ }
- // If we have a method cache and we aren't already doing a method-only
- // search, we restart in method-only search mode if the first match is
- // a method. This ensures that we return a MemberInfo with the correct
- // ReflectedType for inherited methods.
- if (do_method_search && (global.Count > 0)){
- using_global = false;
+ var not_implemented = new MethodSpec[not_implemented_count];
+ int counter = 0;
+ foreach (var m in abstract_methods) {
+ if (m == null)
+ continue;
- return FindMembers (MemberTypes.Method, bf, name, filter, criteria);
+ not_implemented[counter++] = m;
}
- using_global = false;
- MemberInfo [] copy = new MemberInfo [global.Count];
- global.CopyTo (copy);
- return copy;
+ type.MemberCache.missing_abstract = not_implemented;
+ return type.MemberCache.missing_abstract;
}
- /// <summary>
- /// Returns true if iterface exists in any base interfaces (ifaces)
- /// </summary>
- static bool IsInterfaceBaseInterface (Type[] ifaces, Type ifaceToFind)
+ static string GetLookupName (MemberSpec ms)
{
- foreach (Type iface in ifaces) {
- if (iface == ifaceToFind)
- return true;
+ if (ms.Kind == MemberKind.Indexer)
+ return IndexerNameAlias;
- Type[] base_ifaces = TypeManager.GetInterfaces (iface);
- if (base_ifaces.Length > 0 && IsInterfaceBaseInterface (base_ifaces, ifaceToFind))
- return true;
- }
- return false;
- }
-
- // find the nested type @name in @this.
- public Type FindNestedType (string name)
- {
- List<CacheEntry> applicable;
- if (!member_hash.TryGetValue (name, out applicable))
- return null;
-
- for (int i = applicable.Count-1; i >= 0; i--) {
- CacheEntry entry = applicable [i];
- if ((entry.EntryType & EntryType.NestedType & EntryType.MaskType) != 0)
- return (Type) entry.Member;
+ if (ms.Kind == MemberKind.Constructor) {
+ if (ms.IsStatic)
+ return Constructor.TypeConstructorName;
+
+ return Constructor.ConstructorName;
}
-
- return null;
+
+ return ms.Name;
}
- public MemberInfo FindBaseEvent (Type invocation_type, string name)
+ static string GetLookupName (MemberCore mc)
{
- List<CacheEntry> applicable;
- if (!member_hash.TryGetValue (name, out applicable))
- return null;
+ if (mc is Indexer)
+ return IndexerNameAlias;
- //
- // Walk the chain of events, starting from the top.
- //
- for (int i = applicable.Count - 1; i >= 0; i--)
- {
- CacheEntry entry = applicable [i];
- if ((entry.EntryType & EntryType.Event) == 0)
- continue;
-
- EventInfo ei = (EventInfo)entry.Member;
- return ei.GetAddMethod (true);
- }
+ if (mc is Constructor)
+ return Constructor.ConstructorName;
- return null;
+ return mc.MemberName.Name;
}
//
- // Looks for extension methods with defined name and extension type
+ // Returns all operators declared on container and its base types (until declaredOnly is used)
//
- public List<MethodSpec> FindExtensionMethods (Assembly thisAssembly, Type extensionType, string name, bool publicOnly)
+ public static IList<MemberSpec> GetUserOperator (TypeSpec container, Operator.OpType op, bool declaredOnly)
{
- List<CacheEntry> entries;
- if (method_hash != null)
- method_hash.TryGetValue (name, out entries);
- else {
- member_hash.TryGetValue (name, out entries);
- }
+ IList<MemberSpec> found = null;
- if (entries == null)
- return null;
+ IList<MemberSpec> applicable;
+ do {
+ var mc = container.MemberCache;
- EntryType entry_type = EntryType.Static | EntryType.Method | EntryType.NotExtensionMethod;
- EntryType found_entry_type = entry_type & ~EntryType.NotExtensionMethod;
+ if (((op == Operator.OpType.Implicit || op == Operator.OpType.Explicit) && (mc.state & StateFlags.HasConversionOperator) != 0) ||
+ (mc.state & StateFlags.HasUserOperator) != 0) {
- List<MethodSpec> candidates = null;
- foreach (CacheEntry entry in entries) {
- if ((entry.EntryType & entry_type) == found_entry_type) {
- MethodBase mb = (MethodBase)entry.Member;
-
- // Simple accessibility check
- if ((entry.EntryType & EntryType.Public) == 0 && publicOnly) {
- MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
- if (ma != MethodAttributes.Assembly && ma != MethodAttributes.FamORAssem)
- continue;
-
- if (!TypeManager.IsThisOrFriendAssembly (thisAssembly, mb.DeclaringType.Assembly))
- continue;
- }
+ if (mc.member_hash.TryGetValue (Operator.GetMetadataName (op), out applicable)) {
+ int i;
+ for (i = 0; i < applicable.Count; ++i) {
+ if (applicable[i].Kind != MemberKind.Operator) {
+ break;
+ }
+ }
+
+ //
+ // Handles very rare case where a method with same name as operator (op_xxxx) exists
+ // and we have to resize the applicable list
+ //
+ if (i != applicable.Count) {
+ for (i = 0; i < applicable.Count; ++i) {
+ if (applicable[i].Kind != MemberKind.Operator) {
+ continue;
+ }
- IMethodData md = TypeManager.GetMethod (mb);
- AParametersCollection pd = md == null ?
- TypeManager.GetParameterData (mb) : md.ParameterInfo;
+ if (found == null) {
+ found = new List<MemberSpec> ();
+ found.Add (applicable[i]);
+ } else {
+ var prev = found as List<MemberSpec>;
+ if (prev == null) {
+ prev = new List<MemberSpec> (found.Count + 1);
+ prev.AddRange (found);
+ }
- Type ex_type = pd.ExtensionMethodType;
- if (ex_type == null) {
- entry.EntryType |= EntryType.NotExtensionMethod;
- continue;
- }
+ prev.Add (applicable[i]);
+ }
+ }
+ } else {
+ if (found == null) {
+ found = applicable;
+ } else {
+ var merged = found as List<MemberSpec>;
+ if (merged == null) {
+ merged = new List<MemberSpec> (found.Count + applicable.Count);
+ merged.AddRange (found);
+ found = merged;
+ }
- if (candidates == null)
- candidates = new List<MethodSpec> (2);
- candidates.Add (Import.CreateMethod (mb));
+ merged.AddRange (applicable);
+ }
+ }
+ }
}
- }
- return candidates;
+ // BaseType call can be expensive
+ if (declaredOnly)
+ break;
+
+ container = container.BaseType;
+ } while (container != null);
+
+ return found;
}
-
- //
- // This finds the method or property for us to override. invocation_type is the type where
- // the override is going to be declared, name is the name of the method/property, and
- // param_types is the parameters, if any to the method or property
+
//
- // Because the MemberCache holds members from this class and all the base classes,
- // we can avoid tons of reflection stuff.
+ // Inflates all member cache nested types
//
- public MemberInfo FindMemberToOverride (Type invocation_type, string name, AParametersCollection parameters, GenericMethod generic_method, bool is_property)
+ public void InflateTypes (MemberCache inflated_cache, TypeParameterInflator inflator)
{
- List<CacheEntry> applicable;
- if (method_hash != null && !is_property)
- method_hash.TryGetValue (name, out applicable);
- else
- member_hash.TryGetValue (name, out applicable);
-
- if (applicable == null)
- return null;
- //
- // Walk the chain of methods, starting from the top.
- //
- for (int i = applicable.Count - 1; i >= 0; i--) {
- CacheEntry entry = applicable [i];
-
- if ((entry.EntryType & (is_property ? (EntryType.Property | EntryType.Field) : EntryType.Method)) == 0)
- continue;
+ foreach (var item in member_hash) {
+ IList<MemberSpec> inflated_members = null;
+ for (int i = 0; i < item.Value.Count; ++i ) {
+ var member = item.Value[i];
- PropertyInfo pi = null;
- MethodInfo mi = null;
- FieldInfo fi = null;
- AParametersCollection cmp_attrs;
-
- if (is_property) {
- if ((entry.EntryType & EntryType.Field) != 0) {
- fi = (FieldInfo)entry.Member;
- cmp_attrs = ParametersCompiled.EmptyReadOnlyParameters;
- } else {
- pi = (PropertyInfo) entry.Member;
- cmp_attrs = TypeManager.GetParameterData (pi);
+ // FIXME: When inflating members refering nested types before they are inflated
+ if (member == null)
+ continue;
+
+ if ((member.Kind & MemberKind.NestedMask) != 0 &&
+ (member.Modifiers & Modifiers.COMPILER_GENERATED) == 0) {
+ if (inflated_members == null) {
+ inflated_members = new MemberSpec[item.Value.Count];
+ inflated_cache.member_hash.Add (item.Key, inflated_members);
+ }
+
+ inflated_members [i] = member.InflateMember (inflator);
}
- } else {
- mi = (MethodInfo) entry.Member;
- cmp_attrs = TypeManager.GetParameterData (mi);
}
+ }
+ }
+
+ //
+ // Inflates all open type members, requires InflateTypes to be called before
+ //
+ public void InflateMembers (MemberCache cacheToInflate, TypeSpec inflatedType, TypeParameterInflator inflator)
+ {
+ var inflated_member_hash = cacheToInflate.member_hash;
+ Dictionary<MemberSpec, MethodSpec> accessor_relation = null;
+ List<MemberSpec> accessor_members = null;
+
+ // Copy member specific flags when all members were added
+ cacheToInflate.state = state;
+
+ foreach (var item in member_hash) {
+ var members = item.Value;
+ IList<MemberSpec> inflated_members = null;
+ for (int i = 0; i < members.Count; ++i ) {
+ var member = members[i];
+
+ //
+ // All nested types have been inflated earlier except for
+ // compiler types which are created later and could miss InflateTypes
+ //
+ if ((member.Kind & MemberKind.NestedMask) != 0 &&
+ (member.Modifiers & Modifiers.COMPILER_GENERATED) == 0) {
+ if (inflated_members == null)
+ inflated_members = inflated_member_hash[item.Key];
- if (fi != null) {
- // TODO: Almost duplicate !
- // Check visibility
- switch (fi.Attributes & FieldAttributes.FieldAccessMask) {
- case FieldAttributes.PrivateScope:
continue;
- case FieldAttributes.Private:
+ }
+
+ //
+ // Clone the container first
+ //
+ if (inflated_members == null) {
+ inflated_members = new MemberSpec [item.Value.Count];
+ inflated_member_hash.Add (item.Key, inflated_members);
+ }
+
+ var local_inflator = inflator;
+
+ if (member.DeclaringType != inflatedType) {
//
- // A private method is Ok if we are a nested subtype.
- // The spec actually is not very clear about this, see bug 52458.
+ // Don't inflate top-level non-generic interface members
+ // merged into generic interface
//
- if (!invocation_type.Equals (entry.Container.Type) &&
- !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
+ if (!member.DeclaringType.IsGeneric && !member.DeclaringType.IsNested) {
+ inflated_members [i] = member;
continue;
- break;
- case FieldAttributes.FamANDAssem:
- case FieldAttributes.Assembly:
+ }
+
//
- // Check for assembly methods
+ // Needed when inflating flatten interfaces. It inflates
+ // container type only, type parameters are already done
//
- if (fi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
- continue;
- break;
+ // Handles cases like:
+ //
+ // interface I<T> {}
+ // interface I<U, V> : I<U> {}
+ //
+ // class C: I<int, bool> {}
+ //
+ var inflated_parent = inflator.Inflate (member.DeclaringType);
+ if (inflated_parent != inflator.TypeInstance)
+ local_inflator = new TypeParameterInflator (inflator, inflated_parent);
}
- return entry.Member;
- }
- //
- // Check the arguments
- //
- if (cmp_attrs.Count != parameters.Count)
- continue;
-
- int j;
- for (j = 0; j < cmp_attrs.Count; ++j) {
//
- // LAMESPEC: No idea why `params' modifier is ignored
+ // Inflate every member, its parent is now different
//
- if ((parameters.FixedParameters [j].ModFlags & ~Parameter.Modifier.PARAMS) !=
- (cmp_attrs.FixedParameters [j].ModFlags & ~Parameter.Modifier.PARAMS))
- break;
+ var inflated = member.InflateMember (local_inflator);
+ inflated_members [i] = inflated;
+
+ if (member is PropertySpec || member is EventSpec) {
+ if (accessor_members == null)
+ accessor_members = new List<MemberSpec> ();
+
+ accessor_members.Add (inflated);
+ continue;
+ }
- if (!TypeManager.IsEqual (parameters.Types [j], cmp_attrs.Types [j]))
- break;
+ if (member.IsAccessor) {
+ if (accessor_relation == null)
+ accessor_relation = new Dictionary<MemberSpec, MethodSpec> ();
+ accessor_relation.Add (member, (MethodSpec) inflated);
+ }
}
+ }
- if (j < cmp_attrs.Count)
- continue;
+ if (accessor_members != null) {
+ foreach (var member in accessor_members) {
+ var prop = member as PropertySpec;
+ if (prop != null) {
+ if (prop.Get != null)
+ prop.Get = accessor_relation[prop.Get];
+ if (prop.Set != null)
+ prop.Set = accessor_relation[prop.Set];
- //
- // check generic arguments for methods
- //
- if (mi != null) {
- Type [] cmpGenArgs = TypeManager.GetGenericArguments (mi);
- if (generic_method == null && cmpGenArgs != null && cmpGenArgs.Length != 0)
continue;
- if (generic_method != null && cmpGenArgs != null && cmpGenArgs.Length != generic_method.TypeParameters.Length)
- continue;
- }
+ }
- //
- // get one of the methods because this has the visibility info.
- //
- if (is_property) {
- mi = pi.GetGetMethod (true);
- if (mi == null)
- mi = pi.GetSetMethod (true);
+ var ev = (EventSpec) member;
+ ev.AccessorAdd = accessor_relation[ev.AccessorAdd];
+ ev.AccessorRemove = accessor_relation[ev.AccessorRemove];
}
-
- //
- // Check visibility
- //
- switch (mi.Attributes & MethodAttributes.MemberAccessMask) {
- case MethodAttributes.PrivateScope:
+ }
+ }
+
+ //
+ // Removes hidden base members of an interface. For compiled interfaces we cannot
+ // do name filtering during Add (as we do for import) because we need all base
+ // names to be valid during type definition.
+ // Add replaces hidden base member with current one which means any name collision
+ // (CS0108) of non-first name would be unnoticed because the name was replaced
+ // with the one from compiled type
+ //
+ public void RemoveHiddenMembers (TypeSpec container)
+ {
+ foreach (var entry in member_hash) {
+ var values = entry.Value;
+
+ int container_members_start_at = 0;
+ while (values[container_members_start_at].DeclaringType != container && ++container_members_start_at < entry.Value.Count);
+
+ if (container_members_start_at == 0 || container_members_start_at == values.Count)
continue;
- case MethodAttributes.Private:
- //
- // A private method is Ok if we are a nested subtype.
- // The spec actually is not very clear about this, see bug 52458.
- //
- if (!invocation_type.Equals (entry.Container.Type) &&
- !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
- continue;
- break;
- case MethodAttributes.FamANDAssem:
- case MethodAttributes.Assembly:
- //
- // Check for assembly methods
- //
- if (!TypeManager.IsThisOrFriendAssembly (invocation_type.Assembly, mi.DeclaringType.Assembly))
+
+ for (int i = 0; i < container_members_start_at; ++i) {
+ var member = values[i];
+
+ if (!container.ImplementsInterface (member.DeclaringType, false))
continue;
- break;
+
+ var member_param = member is IParametersMember ? ((IParametersMember) member).Parameters : ParametersCompiled.EmptyReadOnlyParameters;
+
+ for (int ii = container_members_start_at; ii < values.Count; ++ii) {
+ var container_entry = values[ii];
+
+ if (container_entry.Arity != member.Arity)
+ continue;
+
+ if (container_entry is IParametersMember) {
+ if (!TypeSpecComparer.Override.IsEqual (((IParametersMember) container_entry).Parameters, member_param))
+ continue;
+ }
+
+ values.RemoveAt (i);
+ --container_members_start_at;
+ --ii;
+ --i;
+ }
}
- return entry.Member;
}
-
- return null;
}
- /// <summary>
- /// The method is looking for conflict with inherited symbols (errors CS0108, CS0109).
- /// We handle two cases. The first is for types without parameters (events, field, properties).
- /// The second are methods, indexers and this is why ignore_complex_types is here.
- /// The latest param is temporary hack. See DoDefineMembers method for more info.
- /// </summary>
- public MemberInfo FindMemberWithSameName (string name, bool ignore_complex_types, MemberInfo ignore_member)
- {
- List<CacheEntry> applicable = null;
-
- if (method_hash != null)
- method_hash.TryGetValue (name, out applicable);
-
- if (applicable != null) {
- for (int i = applicable.Count - 1; i >= 0; i--) {
- CacheEntry entry = (CacheEntry) applicable [i];
- if ((entry.EntryType & EntryType.Public) != 0)
- return entry.Member;
- }
- }
-
- if (member_hash == null)
- return null;
-
- if (member_hash.TryGetValue (name, out applicable)) {
- for (int i = applicable.Count - 1; i >= 0; i--) {
- CacheEntry entry = (CacheEntry) applicable [i];
- if ((entry.EntryType & EntryType.Public) != 0 & entry.Member != ignore_member) {
- if (ignore_complex_types) {
- if ((entry.EntryType & EntryType.Method) != 0)
- continue;
-
- // Does exist easier way how to detect indexer ?
- if ((entry.EntryType & EntryType.Property) != 0) {
- AParametersCollection arg_types = TypeManager.GetParameterData ((PropertyInfo)entry.Member);
- if (arg_types.Count > 0)
- continue;
- }
- }
- return entry.Member;
- }
- }
- }
- return null;
- }
-
-
- /// <summary>
- /// Builds low-case table for CLS Compliance test
- /// </summary>
- public Dictionary<string, object> GetPublicMembers ()
- {
- if (locase_table != null)
- return locase_table;
-
- locase_table = new Dictionary<string, object> ();
- foreach (var entry in member_hash) {
- var members = entry.Value;
- for (int ii = 0; ii < members.Count; ++ii) {
- CacheEntry member_entry = members [ii];
-
- if ((member_entry.EntryType & EntryType.Public) == 0)
- continue;
-
- // TODO: Does anyone know easier way how to detect that member is internal ?
- switch (member_entry.EntryType & EntryType.MaskType) {
- case EntryType.Constructor:
+ //
+ // Checks all appropriate container members for CLS compliance
+ //
+ public void VerifyClsCompliance (TypeSpec container, Report report)
+ {
+ if (locase_members != null)
+ return;
+
+ if (container.BaseType == null) {
+ locase_members = new Dictionary<string, MemberSpec[]> (member_hash.Count); // StringComparer.OrdinalIgnoreCase);
+ } else {
+ container.BaseType.MemberCache.VerifyClsCompliance (container.BaseType, report);
+ locase_members = new Dictionary<string, MemberSpec[]> (container.BaseType.MemberCache.locase_members); //, StringComparer.OrdinalIgnoreCase);
+ }
+
+ var is_imported_type = container.MemberDefinition.IsImported;
+ foreach (var entry in container.MemberCache.member_hash) {
+ for (int i = 0; i < entry.Value.Count; ++i ) {
+ var name_entry = entry.Value[i];
+ if ((name_entry.Modifiers & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
continue;
-
- case EntryType.Field:
- if ((((FieldInfo)member_entry.Member).Attributes & (FieldAttributes.Assembly | FieldAttributes.Public)) == FieldAttributes.Assembly)
- continue;
- break;
-
- case EntryType.Method:
- if ((((MethodInfo)member_entry.Member).Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
- continue;
- break;
-
- case EntryType.Property:
- PropertyInfo pi = (PropertyInfo)member_entry.Member;
- if (pi.GetSetMethod () == null && pi.GetGetMethod () == null)
- continue;
- break;
-
- case EntryType.Event:
- EventInfo ei = (EventInfo)member_entry.Member;
- MethodInfo mi = ei.GetAddMethod ();
- if ((mi.Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
- continue;
- break;
- }
- string lcase = ((string)entry.Key).ToLower (System.Globalization.CultureInfo.InvariantCulture);
- locase_table [lcase] = member_entry.Member;
- break;
- }
- }
- return locase_table;
- }
-
- public IDictionary<string, List<CacheEntry>> Members {
- get {
- return member_hash;
- }
- }
-
- /// <summary>
- /// Cls compliance check whether methods or constructors parameters differing only in ref or out, or in array rank
- /// </summary>
- ///
- // TODO: refactor as method is always 'this'
- public static void VerifyClsParameterConflict (IList<CacheEntry> al, MethodCore method, MemberInfo this_builder, Report Report)
- {
- EntryType tested_type = (method is Constructor ? EntryType.Constructor : EntryType.Method) | EntryType.Public;
-
- for (int i = 0; i < al.Count; ++i) {
- var entry = al [i];
-
- // skip itself
- if (entry.Member == this_builder)
- continue;
-
- if ((entry.EntryType & tested_type) != tested_type)
- continue;
-
- MethodBase method_to_compare = (MethodBase)entry.Member;
- AttributeTester.Result result = AttributeTester.AreOverloadedMethodParamsClsCompliant (
- method.Parameters, TypeManager.GetParameterData (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.IsClsComplianceRequired ())
- continue;
-
- Report.SymbolRelatedToPreviousError (entry.Member);
- switch (result) {
- case AttributeTester.Result.RefOutArrayError:
- Report.Warning (3006, 1, 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.Warning (3007, 1, method.Location,
- "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant",
- method.GetSignatureForError ());
- continue;
+
+ if ((name_entry.Modifiers & (Modifiers.OVERRIDE | Modifiers.COMPILER_GENERATED)) != 0)
+ continue;
+
+ if ((name_entry.Kind & MemberKind.MaskType) == 0)
+ continue;
+
+ if (name_entry.MemberDefinition.CLSAttributeValue == false)
+ continue;
+
+ IParametersMember p_a = name_entry as IParametersMember;
+ if (p_a != null && !name_entry.IsAccessor) {
+ if (!is_imported_type) {
+ var p_a_pd = p_a.Parameters;
+ for (int ii = i + 1; ii < entry.Value.Count; ++ii) {
+ var checked_entry = entry.Value[ii];
+ IParametersMember p_b = checked_entry as IParametersMember;
+ if (p_b == null)
+ continue;
+
+ if (p_a_pd.Count != p_b.Parameters.Count)
+ continue;
+
+ if (checked_entry.IsAccessor)
+ continue;
+
+ var res = ParametersCompiled.IsSameClsSignature (p_a.Parameters, p_b.Parameters);
+ if (res != 0) {
+ var last = GetLaterDefinedMember (checked_entry, name_entry);
+ if (last == checked_entry.MemberDefinition) {
+ report.SymbolRelatedToPreviousError (name_entry);
+ } else {
+ report.SymbolRelatedToPreviousError (checked_entry);
+ }
+
+ if ((res & 1) != 0) {
+ report.Warning (3006, 1, last.Location,
+ "Overloaded method `{0}' differing only in ref or out, or in array rank, is not CLS-compliant",
+ name_entry.GetSignatureForError ());
+ }
+
+ if ((res & 2) != 0) {
+ report.Warning (3007, 1, last.Location,
+ "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant",
+ name_entry.GetSignatureForError ());
+ }
+ }
+ }
+ }
+ }
+
+ if (i > 0 || name_entry.Kind == MemberKind.Constructor || name_entry.Kind == MemberKind.Indexer)
+ continue;
+
+ var name_entry_locase = name_entry.Name.ToLowerInvariant ();
+
+ MemberSpec[] found;
+ if (!locase_members.TryGetValue (name_entry_locase, out found)) {
+ found = new MemberSpec[] { name_entry };
+ locase_members.Add (name_entry_locase, found);
+ } else {
+ bool same_names_only = true;
+ foreach (var f in found) {
+ if (f.Name == name_entry.Name)
+ continue;
+
+// if (f.IsAccessor && name_entry.IsAccessor)
+// continue;
+
+ same_names_only = false;
+ if (!is_imported_type) {
+ var last = GetLaterDefinedMember (f, name_entry);
+ if (last == f.MemberDefinition) {
+ report.SymbolRelatedToPreviousError (name_entry);
+ } else {
+ report.SymbolRelatedToPreviousError (f);
+ }
+
+ report.Warning (3005, 1, last.Location,
+ "Identifier `{0}' differing only in case is not CLS-compliant", last.GetSignatureForError ());
+ }
+ }
+
+ if (!same_names_only) {
+ Array.Resize (ref found, found.Length + 1);
+ found[found.Length - 1] = name_entry;
+ locase_members[name_entry_locase] = found;
+ }
+ }
}
+ }
+ }
+
+ //
+ // Local report helper to issue correctly ordered members stored in hashtable
+ //
+ static MemberCore GetLaterDefinedMember (MemberSpec a, MemberSpec b)
+ {
+ var mc_a = a.MemberDefinition as MemberCore;
+ var mc_b = b.MemberDefinition as MemberCore;
+ if (mc_a == null)
+ return mc_b;
+
+ if (mc_b == null)
+ return mc_a;
+
+ if (mc_a.Location.File != mc_a.Location.File)
+ return mc_b;
+
+ return mc_b.Location.Row > mc_a.Location.Row ? mc_b : mc_a;
+ }
+
+ public bool CheckExistingMembersOverloads (MemberCore member, AParametersCollection parameters)
+ {
+ var name = GetLookupName (member);
+ var imb = member as InterfaceMemberBase;
+ if (imb != null && imb.IsExplicitImpl) {
+ name = imb.GetFullName (name);
+ }
- throw new NotImplementedException (result.ToString ());
- }
- }
+ return CheckExistingMembersOverloads (member, name, parameters);
+ }
- public bool CheckExistingMembersOverloads (MemberCore member, string name, ParametersCompiled parameters, Report Report)
+ public bool CheckExistingMembersOverloads (MemberCore member, string name, AParametersCollection parameters)
{
- List<CacheEntry> entries;
+ IList<MemberSpec> entries;
if (!member_hash.TryGetValue (name, out entries))
- return true;
+ return false;
+
+ var Report = member.Compiler.Report;
int method_param_count = parameters.Count;
for (int i = entries.Count - 1; i >= 0; --i) {
- CacheEntry ce = (CacheEntry) entries [i];
-
- if (ce.Container != member.Parent.PartialContainer)
- return true;
-
- Type [] p_types;
- AParametersCollection pd;
- if ((ce.EntryType & EntryType.Property) != 0) {
- pd = TypeManager.GetParameterData ((PropertyInfo) ce.Member);
- p_types = pd.Types;
- } else {
- MethodBase mb = (MethodBase) ce.Member;
-
- // TODO: This is more like a hack, because we are adding generic methods
- // twice with and without arity name
- if (TypeManager.IsGenericMethod (mb) && !member.MemberName.IsGeneric)
- continue;
+ var ce = entries[i];
+ var pm = ce as IParametersMember;
+ var pd = pm == null ? ParametersCompiled.EmptyReadOnlyParameters : pm.Parameters;
+ if (pd.Count != method_param_count)
+ continue;
- pd = TypeManager.GetParameterData (mb);
- p_types = pd.Types;
- }
+ if (ce.Arity != member.MemberName.Arity)
+ continue;
- if (p_types.Length != method_param_count)
+ // Ignore merged interface members
+ if (member.Parent.PartialContainer != ce.DeclaringType.MemberDefinition)
continue;
+ var p_types = pd.Types;
if (method_param_count > 0) {
int ii = method_param_count - 1;
- Type type_a, type_b;
+ TypeSpec type_a, type_b;
do {
type_a = parameters.Types [ii];
type_b = p_types [ii];
- if (TypeManager.IsGenericParameter (type_a) && type_a.DeclaringMethod != null)
- type_a = typeof (TypeParameter);
-
- if (TypeManager.IsGenericParameter (type_b) && type_b.DeclaringMethod != null)
- type_b = typeof (TypeParameter);
-
if ((pd.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF) !=
(parameters.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF))
break;
- } while (TypeManager.IsEqual (type_a, type_b) && ii-- != 0);
+ } while (TypeSpecComparer.Override.IsEqual (type_a, type_b) && ii-- != 0);
if (ii >= 0)
continue;
//
// Operators can differ in return type only
//
- if (member is Operator) {
- Operator op = TypeManager.GetMethod ((MethodBase) ce.Member) as Operator;
- if (op != null && op.ReturnType != ((Operator) member).ReturnType)
- continue;
- }
+ if (member is Operator && ce.Kind == MemberKind.Operator && ((MethodSpec) ce).ReturnType != ((Operator) member).ReturnType)
+ continue;
//
// Report difference in parameter modifiers only
//
if (pd != null && member is MethodCore) {
ii = method_param_count;
- while (ii-- != 0 && parameters.FixedParameters [ii].ModFlags == pd.FixedParameters [ii].ModFlags &&
- parameters.ExtensionMethodType == pd.ExtensionMethodType);
+ while (ii-- != 0 && parameters.FixedParameters[ii].ModFlags == pd.FixedParameters[ii].ModFlags &&
+ parameters.ExtensionMethodType == pd.ExtensionMethodType) ;
if (ii >= 0) {
- MethodCore mc = TypeManager.GetMethod ((MethodBase) ce.Member) as MethodCore;
- Report.SymbolRelatedToPreviousError (ce.Member);
- if ((member.ModFlags & Modifiers.PARTIAL) != 0 && (mc.ModFlags & Modifiers.PARTIAL) != 0) {
+ var mc = ce as MethodSpec;
+ member.Compiler.Report.SymbolRelatedToPreviousError (ce);
+ if ((member.ModFlags & Modifiers.PARTIAL) != 0 && (mc.Modifiers & Modifiers.PARTIAL) != 0) {
if (parameters.HasParams || pd.HasParams) {
Report.Error (758, member.Location,
"A partial method declaration and partial method implementation cannot differ on use of `params' modifier");
Report.Error (755, member.Location,
"A partial method declaration and partial method implementation must be both an extension method or neither");
}
+ } else if (member is Constructor) {
+ Report.Error (851, member.Location,
+ "Overloaded contructor `{0}' cannot differ on use of parameter modifiers only",
+ member.GetSignatureForError ());
} else {
- if (member is Constructor) {
- Report.Error (851, member.Location,
- "Overloaded contructor `{0}' cannot differ on use of parameter modifiers only",
- member.GetSignatureForError ());
- } else {
- Report.Error (663, member.Location,
- "Overloaded method `{0}' cannot differ on use of parameter modifiers only",
- member.GetSignatureForError ());
- }
+ Report.Error (663, member.Location,
+ "Overloaded method `{0}' cannot differ on use of parameter modifiers only",
+ member.GetSignatureForError ());
}
return false;
}
}
}
- if ((ce.EntryType & EntryType.Method) != 0) {
+ if ((ce.Kind & MemberKind.Method) != 0) {
Method method_a = member as Method;
- Method method_b = TypeManager.GetMethod ((MethodBase) ce.Member) as Method;
+ Method method_b = ce.MemberDefinition as Method;
if (method_a != null && method_b != null && (method_a.ModFlags & method_b.ModFlags & Modifiers.PARTIAL) != 0) {
const Modifiers partial_modifiers = Modifiers.STATIC | Modifiers.UNSAFE;
if (method_a.IsPartialDefinition == method_b.IsPartialImplementation) {
method_a.Parent.IsUnsafe && method_b.Parent.IsUnsafe) {
if (method_a.IsPartialImplementation) {
method_a.SetPartialDefinition (method_b);
- entries.RemoveAt (i);
+ if (entries.Count == 1)
+ member_hash.Remove (name);
+ else
+ entries.RemoveAt (i);
} else {
method_b.SetPartialDefinition (method_a);
method_a.caching_flags |= MemberCore.Flags.PartialDefinitionExists;
continue;
}
- if ((method_a.ModFlags & Modifiers.STATIC) != (method_b.ModFlags & Modifiers.STATIC)) {
- Report.SymbolRelatedToPreviousError (ce.Member);
+ if (method_a.IsStatic != method_b.IsStatic) {
+ Report.SymbolRelatedToPreviousError (ce);
Report.Error (763, member.Location,
"A partial method declaration and partial method implementation must be both `static' or neither");
}
- Report.SymbolRelatedToPreviousError (ce.Member);
+ Report.SymbolRelatedToPreviousError (ce);
Report.Error (764, member.Location,
"A partial method declaration and partial method implementation must be both `unsafe' or neither");
return false;
}
- Report.SymbolRelatedToPreviousError (ce.Member);
+ Report.SymbolRelatedToPreviousError (ce);
if (method_a.IsPartialDefinition) {
Report.Error (756, member.Location, "A partial method `{0}' declaration is already defined",
member.GetSignatureForError ());
- } else {
- Report.Error (757, member.Location, "A partial method `{0}' implementation is already defined",
- member.GetSignatureForError ());
}
+ Report.Error (757, member.Location, "A partial method `{0}' implementation is already defined",
+ member.GetSignatureForError ());
return false;
}
- Report.SymbolRelatedToPreviousError (ce.Member);
- IMethodData duplicate_member = TypeManager.GetMethod ((MethodBase) ce.Member);
- if (member is Operator && duplicate_member is Operator) {
- Report.Error (557, member.Location, "Duplicate user-defined conversion in type `{0}'",
- member.Parent.GetSignatureForError ());
- return false;
- }
+ Report.SymbolRelatedToPreviousError (ce);
bool is_reserved_a = member is AbstractPropertyEventMethod || member is Operator;
- bool is_reserved_b = duplicate_member is AbstractPropertyEventMethod || duplicate_member is Operator;
+ bool is_reserved_b = ((MethodSpec) ce).IsReservedMethod;
if (is_reserved_a || is_reserved_b) {
Report.Error (82, member.Location, "A member `{0}' is already reserved",
is_reserved_a ?
- TypeManager.GetFullNameSignature (ce.Member) :
+ ce.GetSignatureForError () :
member.GetSignatureForError ());
return false;
}
} else {
- Report.SymbolRelatedToPreviousError (ce.Member);
+ Report.SymbolRelatedToPreviousError (ce);
}
-
+
+ if (member is Operator && ce.Kind == MemberKind.Operator) {
+ Report.Error (557, member.Location, "Duplicate user-defined conversion in type `{0}'",
+ member.Parent.GetSignatureForError ());
+ return false;
+ }
+
Report.Error (111, member.Location,
"A member `{0}' is already defined. Rename this member or use different parameter types",
member.GetSignatureForError ());
projects / mono.git / blobdiff