using System;
using System.Text;
using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection.Emit;
using System.Reflection;
using System.Linq;
{
None = 0,
- // Member has to be accessible
- AccessibleOnly = 1,
-
// Inspect only queried type members
DeclaredOnly = 1 << 1,
// Exclude static
InstanceOnly = 1 << 2,
- // Ignore member overrides
- NoOverrides = 1 << 3,
-
- NoAccessors = 1 << 4,
-
- StopOnFirstMatch = 1 << 5,
-
- DefaultMemberLookup = NoOverrides | StopOnFirstMatch
+ NoAccessors = 1 << 3
}
public struct MemberFilter : IEquatable<MemberSpec>
public readonly TypeSpec MemberType;
int arity; // -1 to ignore the check
- TypeSpec invocation_type;
private MemberFilter (string name, MemberKind kind)
{
Parameters = null;
MemberType = null;
arity = -1;
- invocation_type = null;
}
public MemberFilter (MethodSpec m)
Parameters = m.Parameters;
MemberType = m.ReturnType;
arity = m.Arity;
- invocation_type = null;
}
public MemberFilter (string name, int arity, MemberKind kind, AParametersCollection param, TypeSpec type)
Parameters = param;
MemberType = type;
this.arity = arity;
- invocation_type = null;
- }
-
- public TypeSpec InvocationType {
- get {
- return invocation_type;
- }
- set {
- invocation_type = value;
- }
}
public static MemberFilter Constructor (AParametersCollection param)
}
}
- if (invocation_type != null && !IsAccessible (other))
- return false;
-
return true;
}
- bool IsAccessible (MemberSpec other)
- {
- bool extra;
- return Expression.IsMemberAccessible (invocation_type, other, out extra);
- }
-
#endregion
}
}
foreach (var ce in entry.Value) {
- if (ce.DeclaringType != iface)
- break;
-
if (list.Contains (ce))
continue;
member_hash[entry.Key] = list;
}
}
+
+ // Add also all base interfaces
+ if (iface.Interfaces != null) {
+ foreach (var base_iface in iface.Interfaces)
+ AddInterface (base_iface);
+ }
}
public void AddMember (InterfaceMemberBase imb, string exlicitName, MemberSpec ms)
continue;
}
- if (member.DeclaringType.ImplementsInterface (entry.DeclaringType)) {
+ if (member.DeclaringType.ImplementsInterface (entry.DeclaringType, false)) {
if (existing is MemberSpec[]) {
existing = new MemberSpec[] { member };
return true;
}
if ((entry.DeclaringType == member.DeclaringType && entry.IsAccessor == member.IsAccessor) ||
- entry.DeclaringType.ImplementsInterface (member.DeclaringType))
+ entry.DeclaringType.ImplementsInterface (member.DeclaringType, false))
return false;
}
return false;
}
- public static IEnumerable<IndexerSpec> FindIndexers (TypeSpec container, BindingRestriction restrictions)
- {
- var filter = new MemberFilter (IndexerNameAlias, 0, MemberKind.Indexer, null, null);
- var found = FindMembers (container, filter, restrictions);
- return found == null ? null : found.Cast<IndexerSpec> ();
- }
-
public static MemberSpec FindMember (TypeSpec container, MemberFilter filter, BindingRestriction restrictions)
{
do {
continue;
return entry;
-
- // TODO MemberCache:
- //if ((restrictions & BindingRestriction.AccessibleOnly) != 0)
- // throw new NotImplementedException ("net");
}
}
}
//
- // Returns the first set of members starting from
- // container, the returned list must not be modified
+ // 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
//
- public static IList<MemberSpec> FindMembers (TypeSpec container, MemberFilter filter, BindingRestriction restrictions)
+ public static IList<MemberSpec> FindMembers (TypeSpec container, string name, bool declaredOnly)
{
IList<MemberSpec> applicable;
- List<MemberSpec> found = null;
- int match_counter = 0;
do {
- int i;
- if (container.MemberCache.member_hash.TryGetValue (filter.Name, out applicable)) {
- for (i = 0; i < applicable.Count; ++i) {
- var entry = applicable [i];
-
- // Is the member of the correct type
- if ((entry.Kind & filter.Kind & MemberKind.MaskType) == 0)
- continue;
-
- //
- // When using overloadable overrides filter ignore members which
- // are not base members. Including properties because overrides can
- // implement get or set only and we are looking for complete base member
- //
- const MemberKind overloadable = MemberKind.Indexer | MemberKind.Method | MemberKind.Property;
- if ((restrictions & BindingRestriction.NoOverrides) != 0 && (entry.Kind & overloadable) != 0) {
- if ((entry.Modifiers & Modifiers.OVERRIDE) != 0)
- continue;
- }
-
- if ((restrictions & BindingRestriction.InstanceOnly) != 0 && entry.IsStatic)
- continue;
-
- // Apply the filter to it.
- if (!filter.Equals (entry))
- continue;
-
- // Try not to allocate a new list until it's necessary
- if (found == null) {
- if (i == match_counter) {
- ++match_counter;
- continue;
- }
-
- found = new List<MemberSpec> (System.Math.Max (4, match_counter + 1));
- for (int ii = 0; ii < match_counter; ++ii)
- found.Add (applicable [ii]);
- }
-
- found.Add (entry);
- }
-
- // Deal with allocation-less optimization
- if ((restrictions & (BindingRestriction.DeclaredOnly | BindingRestriction.StopOnFirstMatch)) != 0) {
- if (found != null)
- return found;
-
- if (i == match_counter)
- return applicable;
-
- if (match_counter > 0) {
- found = new List<MemberSpec> (match_counter);
- for (int ii = 0; ii < match_counter; ++ii)
- found.Add (applicable[ii]);
-
- return found;
- }
-
- if ((restrictions & BindingRestriction.DeclaredOnly) != 0)
- return null;
- } else if (found == null) {
- if (i == match_counter) {
- found = new List<MemberSpec> (applicable);
- } else if (match_counter > 0) {
- found = new List<MemberSpec> (System.Math.Max (4, match_counter));
- for (int ii = 0; ii < match_counter; ++ii)
- found.Add (applicable[ii]);
- }
- }
- }
+ if (container.MemberCache.member_hash.TryGetValue (name, out applicable) || declaredOnly)
+ return applicable;
container = container.BaseType;
} while (container != null);
- return found;
+ return null;
}
//
List<MethodSpec> candidates = null;
foreach (var entry in entries) {
- if (entry.Kind != MemberKind.Method || (arity >= 0 && entry.Arity != arity))
+ if (entry.Kind != MemberKind.Method || (arity > 0 && entry.Arity != arity))
continue;
var ms = (MethodSpec) entry;
if (!ms.IsExtensionMethod)
continue;
- bool extra;
- if (!Expression.IsMemberAccessible (invocationType, ms, out extra))
+ if (!ms.IsAccessible (invocationType))
continue;
// TODO: CodeGen.Assembly.Builder
if ((entry.Modifiers & Modifiers.PRIVATE) != 0)
continue;
- //
- // Skip override members with accessors they may not fully implement the base member
- //
- if (member_with_accessors && (entry.Modifiers & (Modifiers.OVERRIDE | Modifiers.SEALED)) == Modifiers.OVERRIDE)
- continue;
-
if ((entry.Modifiers & Modifiers.AccessibilityMask) == Modifiers.INTERNAL) {
if (!TypeManager.IsThisOrFriendAssembly (member.Assembly, entry.Assembly))
continue;
}
//
- // Is the member of the correct type ?
- // Destructors are ignored as they cannot be overridden by user
+ // Is the member of same type ?
+ //
if ((entry.Kind & ~MemberKind.Destructor & mkind & MemberKind.MaskType) == 0) {
- if ((entry.Kind & MemberKind.Destructor) == 0 && (member_param == null || !(entry is IParametersMember))) {
+ // Destructors are ignored as they cannot be overridden by user
+ if ((entry.Kind & MemberKind.Destructor) != 0)
+ continue;
+
+ // Only different arity methods hide
+ if (mkind != MemberKind.Method && member.MemberName.Arity != entry.Arity)
+ continue;
+
+ if ((member_param == null || !(entry is IParametersMember))) {
bestCandidate = entry;
return null;
}
continue;
}
- if (member_param == null)
- return entry;
+ if (entry.Kind != mkind) {
+ if (bestCandidate == null)
+ bestCandidate = entry;
- // Check arity match
- int arity = member.MemberName.Arity;
- if (arity != entry.Arity)
continue;
+ }
+
+ if (member_param != null) {
+ // Check arity match
+ int arity = member.MemberName.Arity;
+ if (arity != entry.Arity)
+ continue;
+
+ var pm = entry as IParametersMember;
+ AParametersCollection entry_parameters;
+ if (pm == null) {
+ if (entry.Kind != MemberKind.Delegate)
+ continue;
+
+ // TODO: I don't have DelegateSpec
+ entry_parameters = Delegate.GetParameters (member.Compiler, (TypeSpec) entry);
+ } else {
+ entry_parameters = pm.Parameters;
+ }
- if (entry is IParametersMember) {
if (entry.IsAccessor != member is AbstractPropertyEventMethod)
continue;
- var entry_param = ((IParametersMember) entry).Parameters;
- if (TypeSpecComparer.Override.IsEqual (entry_param, member_param))
- return entry;
+ if (!TypeSpecComparer.Override.IsEqual (entry_parameters, member_param))
+ continue;
+ }
- continue;
+ //
+ // Skip override members with accessors they may not fully implement the base member
+ //
+ if (member_with_accessors) {
+ if ((entry.Modifiers & (Modifiers.OVERRIDE | Modifiers.SEALED)) == Modifiers.OVERRIDE) {
+ //
+ // Set candidate to member override to flag we found an implementation
+ //
+ bestCandidate = entry;
+ continue;
+ }
+ } else {
+ bestCandidate = null;
}
- if (bestCandidate == null)
- bestCandidate = entry;
+ return entry;
}
}
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 ());
}
if ((name_entry.Kind & (MemberKind.Constructor | MemberKind.Destructor | MemberKind.Operator)) != 0)
continue;
- bool extra;
- if (!Expression.IsMemberAccessible (InternalType.FakeInternalType, name_entry, out extra))
+ if (!name_entry.IsAccessible (InternalType.FakeInternalType))
continue;
if (name == null || name_entry.Name.StartsWith (name)) {
Dictionary<MethodSpec, 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;
projects / mono.git / blobdiff