//
// Copyright 2001 Ximian, Inc (http://www.ximian.com)
// Copyright 2004-2010 Novell, Inc
+// Copyright 2011 Xamarin Inc
//
//
InternalCompilerType = 1 << 21,
MissingType = 1 << 22,
Void = 1 << 23,
+ Namespace = 1 << 24,
NestedMask = Class | Struct | Delegate | Enum | Interface,
GenericMask = Method | Class | Struct | Delegate | Interface,
public readonly TypeSpec MemberType;
public readonly int Arity; // -1 to ignore the check
- private MemberFilter (string name, MemberKind kind)
- {
- Name = name;
- Kind = kind;
- Parameters = null;
- MemberType = null;
- Arity = -1;
- }
-
public MemberFilter (MethodSpec m)
{
Name = m.Name;
{
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;
- }
- break;
+ //
+ // Some core types have user operators but they cannot be used like 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
+ //
+ if (!BuiltinTypeSpec.IsPrimitiveType (dt) || dt.BuiltinType == BuiltinTypeSpec.Type.Char) {
+ switch (dt.BuiltinType) {
+ case BuiltinTypeSpec.Type.String:
+ case BuiltinTypeSpec.Type.Delegate:
+ case BuiltinTypeSpec.Type.MulticastDelegate:
+ break;
+ default:
+ if (name == Operator.GetMetadataName (Operator.OpType.Implicit) || name == Operator.GetMetadataName (Operator.OpType.Explicit)) {
+ state |= StateFlags.HasConversionOperator;
+ } else {
+ state |= StateFlags.HasUserOperator;
+ }
+
+ break;
+ }
}
}
// 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, string name, bool declaredOnly)
+ // declaredOnlyClass cannot be used interfaces. Manual filtering is required because names are
+ // compacted
+ //
+ public static IList<MemberSpec> FindMembers (TypeSpec container, string name, bool declaredOnlyClass)
{
IList<MemberSpec> applicable;
do {
- if (container.MemberCache.member_hash.TryGetValue (name, out applicable) || declaredOnly)
+ if (container.MemberCache.member_hash.TryGetValue (name, out applicable) || declaredOnlyClass)
return applicable;
container = container.BaseType;
// based on type definition
var tc = container.MemberDefinition as TypeContainer;
if (tc != null)
- tc.DefineType ();
+ tc.DefineContainer ();
if (container.MemberCacheTypes.member_hash.TryGetValue (name, out applicable)) {
for (int i = applicable.Count - 1; i >= 0; i--) {
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)
+ if ((name_entry.Modifiers & (Modifiers.ABSTRACT | Modifiers.OVERRIDE)) != Modifiers.ABSTRACT)
continue;
if (name_entry.Kind != MemberKind.Method)
if ((item.Modifiers & (Modifiers.OVERRIDE | Modifiers.VIRTUAL)) == 0)
continue;
+ //
+ // Abstract override does not override anything
+ //
+ if ((item.Modifiers & Modifiers.ABSTRACT) != 0)
+ continue;
+
if (filter.Equals (item)) {
--not_implemented_count;
abstract_methods [i] = null;
return IndexerNameAlias;
if (mc is Constructor)
- return Constructor.ConstructorName;
+ return mc.IsStatic ? Constructor.TypeConstructorName : Constructor.ConstructorName;
return mc.MemberName.Name;
}
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 btype = container.BaseType.GetDefinition ();
+ btype.MemberCache.VerifyClsCompliance (btype, report);
+ locase_members = new Dictionary<string, MemberSpec[]> (btype.MemberCache.locase_members); //, StringComparer.OrdinalIgnoreCase);
}
var is_imported_type = container.MemberDefinition.IsImported;
type_a = parameters.Types [ii];
type_b = p_types [ii];
- if ((pd.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF) !=
- (parameters.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF))
+ var a_byref = (pd.FixedParameters[ii].ModFlags & Parameter.Modifier.RefOutMask) != 0;
+ var b_byref = (parameters.FixedParameters[ii].ModFlags & Parameter.Modifier.RefOutMask) != 0;
+
+ if (a_byref != b_byref)
break;
} while (TypeSpecComparer.Override.IsEqual (type_a, type_b) && ii-- != 0);
//
if (pd != null && member is MethodCore) {
ii = method_param_count;
- while (ii-- != 0 && parameters.FixedParameters[ii].ModFlags == pd.FixedParameters[ii].ModFlags &&
+ while (ii-- != 0 &&
+ (parameters.FixedParameters[ii].ModFlags & Parameter.Modifier.ModifierMask) ==
+ (pd.FixedParameters[ii].ModFlags & Parameter.Modifier.ModifierMask) &&
parameters.ExtensionMethodType == pd.ExtensionMethodType) ;
if (ii >= 0) {
projects / mono.git / blobdiff