using System.Reflection.Emit;
using System.Reflection;
-#if BOOTSTRAP_WITH_OLDLIB
+#if BOOTSTRAP_WITH_OLDLIB || NET_2_1
using XmlElement = System.Object;
#else
using System.Xml;
TypeArguments args, Location loc)
: this (left, name, is_double_colon, loc)
{
- this.TypeArguments = args;
+ if (args != null && args.Count > 0)
+ this.TypeArguments = args;
}
public MemberName (string name)
: this (left, name, false, args, loc)
{ }
- public MemberName (string alias, string name, Location loc)
- : this (new MemberName (alias, loc), name, true, loc)
+ public MemberName (string alias, string name, TypeArguments args, Location loc)
+ : this (new MemberName (alias, loc), name, true, args, loc)
{ }
public MemberName (MemberName left, MemberName right)
public Expression GetTypeExpression ()
{
-#if GMCS_SOURCE
- if (IsUnbound) {
- if (!CheckUnbound (Location))
- return null;
-
- return new UnboundTypeExpression (this, Location);
- }
-#endif
-
if (Left == null) {
if (TypeArguments != null)
return new SimpleName (Basename, TypeArguments, Location);
- else
- return new SimpleName (Name, Location);
+
+ 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);
+ return new QualifiedAliasMember (Left.Name, Basename, Location);
}
Expression lexpr = Left.GetTypeExpression ();
public int CountTypeArguments {
get {
- if (TypeArguments == null)
- return 0;
- else
+ if (TypeArguments != null)
return TypeArguments.Count;
+ else if (Left != null)
+ return Left.CountTypeArguments;
+ else
+ return 0;
}
}
{
return name + "`" + count;
}
-
- protected bool IsUnbound {
- get {
- if ((Left != null) && Left.IsUnbound)
- return true;
- else if (TypeArguments == null)
- return false;
- else
- return TypeArguments.IsUnbound;
- }
- }
-
- protected bool CheckUnbound (Location loc)
- {
- if ((Left != null) && !Left.CheckUnbound (loc))
- return false;
- if ((TypeArguments != null) && !TypeArguments.IsUnbound) {
- Report.Error (1031, loc, "Type expected");
- return false;
- }
-
- return true;
- }
}
/// <summary>
/// <summary>
/// Modifier flags that the user specified in the source code
/// </summary>
- public int ModFlags;
+ private int mod_flags;
+ public int ModFlags {
+ set {
+ mod_flags = value;
+ if ((value & Modifiers.COMPILER_GENERATED) != 0)
+ caching_flags = Flags.IsUsed | Flags.IsAssigned;
+ }
+ get {
+ return mod_flags;
+ }
+ }
- public readonly DeclSpace Parent;
+ public /*readonly*/ DeclSpace Parent;
/// <summary>
/// Location where this declaration happens
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
+ MethodOverloadsExist = 1 << 10, // Test for duplication must be performed
IsUsed = 1 << 11,
IsAssigned = 1 << 12, // Field is assigned
- HasExplicitLayout = 1 << 13
+ HasExplicitLayout = 1 << 13,
+ PartialDefinitionExists = 1 << 14 // Set when corresponding partial method definition exists
}
/// <summary>
member_name = new_name;
cached_name = null;
}
+
+ protected bool CheckAbstractAndExtern (bool has_block)
+ {
+ if (Parent.PartialContainer.Kind == Kind.Interface)
+ return true;
+
+ if (has_block) {
+ if ((ModFlags & Modifiers.EXTERN) != 0) {
+ Report.Error (179, Location, "`{0}' cannot declare a body because it is marked extern",
+ GetSignatureForError ());
+ return false;
+ }
+
+ if ((ModFlags & Modifiers.ABSTRACT) != 0) {
+ Report.Error (500, Location, "`{0}' cannot declare a body because it is marked abstract",
+ GetSignatureForError ());
+ return false;
+ }
+ } else {
+ if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN | Modifiers.PARTIAL)) == 0) {
+ if (RootContext.Version >= LanguageVersion.LINQ && this is Property.PropertyMethod) {
+ Report.Error (840, Location, "`{0}' must have a body because it is not marked abstract or extern. The property can be automatically implemented when you define both accessors",
+ GetSignatureForError ());
+ } else {
+ Report.Error (501, Location, "`{0}' must have a body because it is not marked abstract, extern, or partial",
+ GetSignatureForError ());
+ }
+ return false;
+ }
+ }
+
+ return true;
+ }
public abstract bool Define ();
return value;
}
}
+
+ // It's null for TypeParameter
+ if (Parent == null)
+ return false;
if (Parent.GetClsCompliantAttributeValue ()) {
caching_flags |= Flags.ClsCompliantAttributeTrue;
/// </summary>
protected bool HasClsCompliantAttribute {
get {
+ if ((caching_flags & Flags.HasCompliantAttribute_Undetected) != 0)
+ GetClsCompliantAttributeValue ();
+
return (caching_flags & Flags.HasClsCompliantAttribute) != 0;
}
}
/// <summary>
- /// It helps to handle error 102 & 111 detection
+ /// Returns true when a member supports multiple overloads (methods, indexers, etc)
/// </summary>
- public virtual bool MarkForDuplicationCheck ()
+ public virtual bool EnableOverloadChecks (MemberCore overload)
{
return false;
}
protected virtual bool VerifyClsCompliance ()
{
if (!IsClsComplianceRequired ()) {
- if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
+ if (HasClsCompliantAttribute && Report.WarningLevel >= 2) {
if (!IsExposedFromAssembly ())
Report.Warning (3019, 2, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
if (!CodeGen.Assembly.IsClsCompliant)
return true;
}
- if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
+ if (symbol.EnableOverloadChecks (mc))
return true;
Report.SymbolRelatedToPreviousError (mc);
return AccessLevel.Internal;
// By now, it must be nested
- AccessLevel parentLevel = TypeEffectiveAccessLevel (t.DeclaringType);
+ AccessLevel parent_level = TypeEffectiveAccessLevel (t.DeclaringType);
if (t.IsNestedPublic)
- return parentLevel;
+ return parent_level;
if (t.IsNestedAssembly)
- return parentLevel & AccessLevel.Internal;
+ return parent_level & AccessLevel.Internal;
if (t.IsNestedFamily)
- return parentLevel & AccessLevel.Protected;
+ return parent_level & AccessLevel.Protected;
if (t.IsNestedFamORAssem)
- return parentLevel & AccessLevel.ProtectedOrInternal;
+ return parent_level & AccessLevel.ProtectedOrInternal;
if (t.IsNestedFamANDAssem)
throw new NotImplementedException ("NestedFamANDAssem not implemented, cant make this kind of type from c# anyways");
private Type LookupNestedTypeInHierarchy (string name)
{
+ Type t = null;
// if the member cache has been created, lets use it.
// the member cache is MUCH faster.
- if (MemberCache != null)
- return MemberCache.FindNestedType (name);
+ if (MemberCache != null) {
+ t = MemberCache.FindNestedType (name);
+ if (t == null)
+ return null;
+
+ //
+ // FIXME: This hack is needed because member cache does not work
+ // with nested base generic types, it does only type name copy and
+ // not type construction
+ //
+#if !GMCS_SOURCE
+ return t;
+#endif
+ }
// no member cache. Do it the hard way -- reflection
- Type t = null;
for (Type current_type = TypeBuilder;
current_type != null && current_type != TypeManager.object_type;
current_type = current_type.BaseType) {
public virtual ExtensionMethodGroupExpr LookupExtensionMethod (Type extensionType, string name)
{
- return NamespaceEntry.LookupExtensionMethod (extensionType, true, name);
+ return null;
}
//
/// be used while the type is still being created since it doesn't use the cache
/// and relies on the filter doing the member name check.
/// </remarks>
- public abstract MemberList FindMembers (MemberTypes mt, BindingFlags bf,
- MemberFilter filter, object criteria);
+ ///
+ // [Obsolete ("Only MemberCache approach should be used")]
+ public virtual MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+ MemberFilter filter, object criteria)
+ {
+ throw new NotSupportedException ();
+ }
/// <remarks>
/// If we have a MemberCache, return it. This property may return null if the
List = list;
}
- public static readonly MemberList Empty = new MemberList (new ArrayList ());
+ public static readonly MemberList Empty = new MemberList (new ArrayList (0));
/// <summary>
/// Cast the MemberList into a MemberInfo[] array.
/// this method is called multiple times with different BindingFlags.
/// </remarks>
MemberList GetMembers (MemberTypes mt, BindingFlags bf);
-
- /// <summary>
- /// Return the container's member cache.
- /// </summary>
- MemberCache MemberCache {
- get;
- }
}
/// <summary>
Timer.StopTimer (TimerType.CacheInit);
}
+ public MemberCache (Type baseType, IMemberContainer container)
+ {
+ this.Container = container;
+ if (baseType == null)
+ this.member_hash = new Hashtable ();
+ else
+ this.member_hash = SetupCache (TypeManager.LookupMemberCache (baseType));
+ }
+
public MemberCache (Type[] ifaces)
{
//
/// </summary>
static Hashtable SetupCache (MemberCache base_class)
{
- Hashtable hash = new Hashtable ();
-
if (base_class == null)
- return hash;
+ return new Hashtable ();
+ Hashtable hash = new Hashtable (base_class.member_hash.Count);
IDictionaryEnumerator it = base_class.member_hash.GetEnumerator ();
while (it.MoveNext ()) {
- hash [it.Key] = ((ArrayList) it.Value).Clone ();
+ hash.Add (it.Key, ((ArrayList) it.Value).Clone ());
}
return hash;
}
+
+ //
+ // Converts ModFlags to BindingFlags
+ //
+ static BindingFlags GetBindingFlags (int modifiers)
+ {
+ BindingFlags bf;
+ if ((modifiers & Modifiers.STATIC) != 0)
+ bf = BindingFlags.Static;
+ else
+ bf = BindingFlags.Instance;
+
+ if ((modifiers & Modifiers.PRIVATE) != 0)
+ bf |= BindingFlags.NonPublic;
+ else
+ bf |= BindingFlags.Public;
+
+ return bf;
+ }
/// <summary>
/// Add the contents of `cache' to the member_hash.
AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, container);
}
+ public void AddMember (MemberInfo mi, MemberCore mc)
+ {
+ AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mi.Name, mi);
+ }
+
+ public void AddGenericMember (MemberInfo mi, MemberCore mc)
+ {
+ AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mc.MemberName.Basename, mi);
+ }
+
+ public void AddNestedType (DeclSpace type)
+ {
+ AddMember (MemberTypes.NestedType, GetBindingFlags (type.ModFlags), (IMemberContainer) type.Parent,
+ type.TypeBuilder.Name, type.TypeBuilder);
+ }
+
+ public void AddInterface (MemberCache baseCache)
+ {
+ if (baseCache.member_hash.Count > 0)
+ AddCacheContents (baseCache);
+ }
+
void AddMember (MemberTypes mt, BindingFlags bf, IMemberContainer container,
string name, MemberInfo member)
{
{
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,
return null;
}
- public MemberInfo FindBaseEvent (Type invocationType, string name)
+ public MemberInfo FindBaseEvent (Type invocation_type, string name)
{
ArrayList applicable = (ArrayList) member_hash [name];
if (applicable == null)
//
// Looks for extension methods with defined name and extension type
//
- public ArrayList FindExtensionMethods (Type extensionType, string name)
+ public ArrayList FindExtensionMethods (Type extensionType, string name, bool publicOnly)
{
ArrayList entries;
if (method_hash != null)
if (entries == null)
return null;
+ EntryType entry_type = EntryType.Static | EntryType.Method | EntryType.NotExtensionMethod;
+ if (publicOnly) {
+ entry_type |= EntryType.Public;
+ }
+ EntryType found_entry_type = entry_type & ~EntryType.NotExtensionMethod;
+
ArrayList candidates = null;
foreach (CacheEntry entry in entries) {
- if ((entry.EntryType & (EntryType.Static | EntryType.Method | EntryType.NotExtensionMethod)) == (EntryType.Static | EntryType.Method)) {
+ if ((entry.EntryType & entry_type) == found_entry_type) {
MethodBase mb = (MethodBase)entry.Member;
IMethodData md = TypeManager.GetMethod (mb);
continue;
}
- if (ex_type == extensionType || TypeManager.IsGenericParameter (ex_type)) {
+ //if (implicit conversion between ex_type and extensionType exist) {
if (candidates == null)
candidates = new ArrayList (2);
candidates.Add (mb);
- }
+ //}
}
}
}
//
- // This finds the method or property for us to override. invocationType is the type where
+ // 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
- // paramTypes is the parameters, if any to the method or property
+ // 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.
//
- public MemberInfo FindMemberToOverride (Type invocationType, string name, Type [] paramTypes, GenericMethod genericMethod, bool is_property)
+ public MemberInfo FindMemberToOverride (Type invocation_type, string name, Type [] param_types, GenericMethod generic_method, bool is_property)
{
ArrayList applicable;
if (method_hash != null && !is_property)
PropertyInfo pi = null;
MethodInfo mi = null;
FieldInfo fi = null;
- Type [] cmpAttrs = null;
+ Type [] cmp_attrs = null;
if (is_property) {
if ((entry.EntryType & EntryType.Field) != 0) {
// TODO: For this case we ignore member type
//fb = TypeManager.GetField (fi);
- //cmpAttrs = new Type[] { fb.MemberType };
+ //cmp_attrs = new Type[] { fb.MemberType };
} else {
pi = (PropertyInfo) entry.Member;
- cmpAttrs = TypeManager.GetArgumentTypes (pi);
+ cmp_attrs = TypeManager.GetArgumentTypes (pi);
}
} else {
mi = (MethodInfo) entry.Member;
- cmpAttrs = TypeManager.GetParameterData (mi).Types;
+ cmp_attrs = TypeManager.GetParameterData (mi).Types;
}
if (fi != null) {
// A private method is Ok if we are a nested subtype.
// The spec actually is not very clear about this, see bug 52458.
//
- if (!invocationType.Equals (entry.Container.Type) &&
- !TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
+ if (!invocation_type.Equals (entry.Container.Type) &&
+ !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
continue;
break;
case FieldAttributes.FamANDAssem:
//
// Check the arguments
//
- if (cmpAttrs.Length != paramTypes.Length)
+ if (cmp_attrs.Length != param_types.Length)
continue;
int j;
- for (j = 0; j < cmpAttrs.Length; ++j)
- if (!TypeManager.IsEqual (paramTypes [j], cmpAttrs [j]))
+ for (j = 0; j < cmp_attrs.Length; ++j)
+ if (!TypeManager.IsEqual (param_types [j], cmp_attrs [j]))
break;
- if (j < cmpAttrs.Length)
+ if (j < cmp_attrs.Length)
continue;
//
//
if (mi != null) {
Type [] cmpGenArgs = TypeManager.GetGenericArguments (mi);
- if (genericMethod == null && cmpGenArgs.Length != 0)
+ if (generic_method == null && cmpGenArgs.Length != 0)
continue;
- if (genericMethod != null && cmpGenArgs.Length != genericMethod.TypeParameters.Length)
+ if (generic_method != null && cmpGenArgs.Length != generic_method.TypeParameters.Length)
continue;
}
// A private method is Ok if we are a nested subtype.
// The spec actually is not very clear about this, see bug 52458.
//
- if (!invocationType.Equals (entry.Container.Type) &&
- !TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
+ if (!invocation_type.Equals (entry.Container.Type) &&
+ !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
continue;
break;
case MethodAttributes.FamANDAssem:
throw new NotImplementedException (result.ToString ());
}
}
+
+ public bool CheckExistingMembersOverloads (MemberCore member, string name, Parameters parameters)
+ {
+ ArrayList entries = (ArrayList)member_hash [name];
+ if (entries == null)
+ return true;
+
+ 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;
+ ParameterData pd = null;
+ if ((ce.EntryType & EntryType.Property) != 0) {
+ p_types = TypeManager.GetArgumentTypes ((PropertyInfo) ce.Member);
+ } else {
+ MethodBase mb = (MethodBase) ce.Member;
+#if GMCS_SOURCE
+ // TODO: This is more like a hack, because we are adding generic methods
+ // twice with and without arity name
+ if (mb.IsGenericMethod && !member.MemberName.IsGeneric)
+ continue;
+#endif
+ pd = TypeManager.GetParameterData (mb);
+ p_types = pd.Types;
+ }
+
+ if (p_types.Length != method_param_count)
+ continue;
+
+ if (method_param_count > 0) {
+ int ii = method_param_count - 1;
+ Type type_a, type_b;
+ do {
+ type_a = parameters.ParameterType (ii);
+ type_b = p_types [ii];
+#if GMCS_SOURCE
+ if (type_a.IsGenericParameter && type_a.DeclaringMethod != null)
+ type_a = null;
+
+ if (type_b.IsGenericParameter && type_b.DeclaringMethod != null)
+ type_b = null;
+#endif
+ } while (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;
+ }
+
+ //
+ // Report difference in parameter modifiers only
+ //
+ if (pd != null && !(member is AbstractPropertyEventMethod)) {
+ ii = method_param_count;
+ while (ii-- != 0 && parameters.ParameterModifier (ii) == pd.ParameterModifier (ii) &&
+ 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) {
+ 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");
+ } else {
+ Report.Error (755, member.Location,
+ "A partial method declaration and partial method implementation must be both an extension method or neither");
+ }
+ } else {
+ Report.Error (663, member.Location,
+ "An overloaded method `{0}' cannot differ on use of parameter modifiers only",
+ member.GetSignatureForError ());
+ }
+ return false;
+ }
+ }
+ }
+
+ if ((ce.EntryType & EntryType.Method) != 0) {
+ Method method_a = member as Method;
+ Method method_b = TypeManager.GetMethod ((MethodBase) ce.Member) as Method;
+ if (method_a != null && method_b != null && (method_a.ModFlags & method_b.ModFlags & Modifiers.PARTIAL) != 0) {
+ const int partial_modifiers = Modifiers.STATIC | Modifiers.UNSAFE;
+ if (method_a.IsPartialDefinition == method_b.IsPartialImplementation) {
+ if ((method_a.ModFlags & partial_modifiers) == (method_b.ModFlags & partial_modifiers) ||
+ method_a.Parent.IsInUnsafeScope && method_b.Parent.IsInUnsafeScope) {
+ if (method_a.IsPartialImplementation) {
+ method_a.SetPartialDefinition (method_b);
+ entries.RemoveAt (i);
+ } else {
+ method_b.SetPartialDefinition (method_a);
+ }
+ continue;
+ }
+
+ if ((method_a.ModFlags & Modifiers.STATIC) != (method_b.ModFlags & Modifiers.STATIC)) {
+ Report.SymbolRelatedToPreviousError (ce.Member);
+ Report.Error (763, member.Location,
+ "A partial method declaration and partial method implementation must be both `static' or neither");
+ }
+
+ Report.SymbolRelatedToPreviousError (ce.Member);
+ 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);
+ if (method_a.IsPartialDefinition) {
+ Report.Error (756, member.Location, "A partial method `{0}' declaration 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;
+ }
+
+ bool is_reserved_a = member is AbstractPropertyEventMethod || member is Operator;
+ bool is_reserved_b = duplicate_member is AbstractPropertyEventMethod || duplicate_member is Operator;
+
+ 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) :
+ member.GetSignatureForError ());
+ return false;
+ }
+ } else {
+ Report.SymbolRelatedToPreviousError (ce.Member);
+ }
+
+ Report.Error (111, member.Location,
+ "A member `{0}' is already defined. Rename this member or use different parameter types",
+ member.GetSignatureForError ());
+ return false;
+ }
+
+ return true;
+ }
}
}
projects / mono.git / blobdiff