// decl.cs: Declaration base class for structs, classes, enums and interfaces.
//
// Author: Miguel de Icaza (miguel@gnu.org)
+// Marek Safar (marek.safar@seznam.cz)
//
// Licensed under the terms of the GNU GPL
//
using System;
using System.Text;
using System.Collections;
+using System.Globalization;
using System.Reflection.Emit;
using System.Reflection;
}
/// <summary>
- /// Base representation for members. This is only used to keep track
- /// of Name, Location and Modifier flags.
+ /// Base representation for members. This is used to keep track
+ /// of Name, Location and Modifier flags, and handling Attributes.
/// </summary>
- public abstract class MemberCore {
+ public abstract class MemberCore : Attributable {
/// <summary>
/// Public name
/// </summary>
/// </summary>
public readonly Location Location;
+ [Flags]
+ public enum Flags {
+ Obsolete_Undetected = 1, // Obsolete attribute has not been detected yet
+ Obsolete = 1 << 1, // Type has obsolete attribute
+ ClsCompliance_Undetected = 1 << 2, // CLS Compliance has not been detected yet
+ ClsCompliant = 1 << 3, // Type is CLS Compliant
+ CloseTypeCreated = 1 << 4, // Tracks whether we have Closed the type
+ HasCompliantAttribute_Undetected = 1 << 5, // Presence of CLSCompliantAttribute has not been detected
+ HasClsCompliantAttribute = 1 << 6, // Type has CLSCompliantAttribute
+ ClsCompliantAttributeTrue = 1 << 7, // Type has CLSCompliant (true)
+ Excluded_Undetected = 1 << 8, // Conditional attribute has not been detected yet
+ Excluded = 1 << 9 // Method is conditional
+
+ }
+
/// <summary>
- /// Attributes for this type
- /// </summary>
- Attributes attributes;
-
- public enum ClsComplianceValue
- {
- Undetected,
- Yes,
- No
- }
-
- /// <summary>
- /// Whether CLS compliance must be done on this type.
+ /// MemberCore flags at first detected then cached
/// </summary>
- protected ClsComplianceValue cls_compliance;
+ protected Flags caching_flags;
public MemberCore (MemberName name, Attributes attrs, Location loc)
+ : base (attrs)
{
Name = name.GetName (!(this is GenericMethod) && !(this is Method));
MemberName = name;
Location = loc;
- attributes = attrs;
- cls_compliance = ClsComplianceValue.Undetected;
+ caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
+ }
+
+ /// <summary>
+ /// Tests presence of ObsoleteAttribute and report proper error
+ /// </summary>
+ protected void CheckUsageOfObsoleteAttribute (Type type)
+ {
+ if (type == null)
+ return;
+
+ ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
+ if (obsolete_attr == null)
+ return;
+
+ AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, Location);
}
public abstract bool Define (TypeContainer parent);
return Name;
}
- public Attributes OptAttributes
- {
- get {
- return attributes;
- }
- set {
- attributes = value;
- }
- }
-
/// <summary>
/// Base Emit method. This is also entry point for CLS-Compliant verification.
/// </summary>
public virtual void Emit (TypeContainer container)
{
+ VerifyObsoleteAttribute ();
+
if (!RootContext.VerifyClsCompliance)
return;
}
/// <summary>
- /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
+ /// Returns instance of ObsoleteAttribute for this MemberCore
/// </summary>
- public bool IsClsCompliaceRequired (DeclSpace container)
+ public ObsoleteAttribute GetObsoleteAttribute (DeclSpace ds)
{
- if (cls_compliance != ClsComplianceValue.Undetected)
- return cls_compliance == ClsComplianceValue.Yes;
-
- if (!IsExposedFromAssembly (container)) {
- cls_compliance = ClsComplianceValue.No;
- return false;
+ // ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
+ if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
+ return null;
}
- if (!GetClsCompliantAttributeValue (container)) {
- cls_compliance = ClsComplianceValue.No;
- return false;
+ caching_flags &= ~Flags.Obsolete_Undetected;
+
+ if (OptAttributes == null)
+ return null;
+
+ // TODO: remove this allocation
+ EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+ null, null, ds.ModFlags, false);
+
+ Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type, ec);
+ if (obsolete_attr == null)
+ return null;
+
+ ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds);
+ if (obsolete == null)
+ return null;
+
+ caching_flags |= Flags.Obsolete;
+ return obsolete;
+ }
+
+ /// <summary>
+ /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
+ /// </summary>
+ public override bool IsClsCompliaceRequired (DeclSpace container)
+ {
+ if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
+ return (caching_flags & Flags.ClsCompliant) != 0;
+
+ if (GetClsCompliantAttributeValue (container) && IsExposedFromAssembly (container)) {
+ caching_flags &= ~Flags.ClsCompliance_Undetected;
+ caching_flags |= Flags.ClsCompliant;
+ return true;
}
- cls_compliance = ClsComplianceValue.Yes;
- return true;
+ caching_flags &= ~Flags.ClsCompliance_Undetected;
+ return false;
}
/// <summary>
/// Returns true when MemberCore is exposed from assembly.
/// </summary>
- protected virtual bool IsExposedFromAssembly (DeclSpace ds)
+ protected bool IsExposedFromAssembly (DeclSpace ds)
{
if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
return false;
bool GetClsCompliantAttributeValue (DeclSpace ds)
{
if (OptAttributes != null) {
- Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ds);
+ EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+ null, null, ds.ModFlags, false);
+ Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
if (cls_attribute != null) {
- if (cls_attribute.GetClsCompliantAttributeValue (ds)) {
- cls_compliance = ClsComplianceValue.Yes;
- return true;
- }
- cls_compliance = ClsComplianceValue.No;
- return false;
+ caching_flags |= Flags.HasClsCompliantAttribute;
+ return cls_attribute.GetClsCompliantAttributeValue (ds);
}
}
-
- cls_compliance = ds.GetClsCompliantAttributeValue ();
- return cls_compliance == ClsComplianceValue.Yes;
+ return ds.GetClsCompliantAttributeValue ();
}
/// <summary>
/// Returns true if MemberCore is explicitly marked with CLSCompliantAttribute
/// </summary>
- protected bool HasClsCompliantAttribute (DeclSpace ds)
- {
- if (OptAttributes == null)
- return false;
-
- return OptAttributes.GetClsCompliantAttribute (ds) != null;
+ protected bool HasClsCompliantAttribute {
+ get {
+ return (caching_flags & Flags.HasClsCompliantAttribute) != 0;
+ }
}
/// <summary>
return true;
bool error3006 = false;
- foreach (MemberInfo mi in ml) {
+ for (int i = 0; i < ml.Count; ++i) {
+ MemberInfo mi = ml [i];
if (name == mi.Name) {
MethodBase method = mi as MethodBase;
if (method == null || method == methodBuilder || paramTypes == null || paramTypes.Length == 0)
continue;
}
+ for (int ii = 0; ii < ml.Count; ++ii) {
+ mi = ml [ii];
+ if (name == mi.Name)
+ continue;
+ Report.SymbolRelatedToPreviousError (mi);
+ }
+
if (error3006)
Report.Error_T (3006, Location, GetSignatureForError ());
protected virtual bool VerifyClsCompliance (DeclSpace ds)
{
if (!IsClsCompliaceRequired (ds)) {
+ if (HasClsCompliantAttribute && !IsExposedFromAssembly (ds)) {
+ Report.Warning_T (3019, Location, GetSignatureForError ());
+ }
return false;
}
if (!CodeGen.Assembly.IsClsCompliant) {
- if (HasClsCompliantAttribute (ds)) {
+ if (HasClsCompliantAttribute) {
Report.Error_T (3014, Location, GetSignatureForError ());
}
}
- if (Name[0] == '_') {
+ int index = Name.LastIndexOf ('.');
+ if (Name [index > 0 ? index + 1 : 0] == '_') {
Report.Error_T (3008, Location, GetSignatureForError () );
}
return true;
}
+ protected abstract void VerifyObsoleteAttribute ();
+
}
/// <summary>
/// </summary>
public TypeExpr CurrentType;
- /// <summary>
- /// This variable tracks whether we have Closed the type
- /// </summary>
- public bool Created = false;
-
//
// This is the namespace in which this typecontainer
// was declared. We use this to resolve names.
TypeContainer parent;
+ static string[] attribute_targets = new string [] { "type" };
+
public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
Attributes attrs, Location l)
: base (name, attrs, l)
public virtual void CloseType ()
{
- if (!Created){
+ if ((caching_flags & Flags.CloseTypeCreated) == 0){
try {
TypeBuilder.CreateType ();
} catch {
// Note that this still creates the type and
// it is possible to save it
}
- Created = true;
+ caching_flags |= Flags.CloseTypeCreated;
}
}
public Type ResolveType (TypeExpr d, Location loc)
{
if (!d.CheckAccessLevel (this)) {
- Report. Error (122, loc, "`" + d.Name + "' " +
- "is inaccessible because of its protection level");
+ Report.Error_T (122, loc, d.Name);
return null;
}
if (t != null)
return t;
+ if (name.IndexOf ('.') > 0)
+ continue;
+
+ IAlias alias_value = ns.LookupAlias (name);
+ if (alias_value != null) {
+ t = LookupInterfaceOrClass ("", alias_value.Name, out error);
+ if (error)
+ return null;
+
+ if (t != null)
+ return t;
+ }
+
//
// Now check the using clause list
//
get;
}
+ public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+ {
+ try {
+ TypeBuilder.SetCustomAttribute (cb);
+ } catch (System.ArgumentException e) {
+ Report.Warning (-21, a.Location,
+ "The CharSet named property on StructLayout\n"+
+ "\tdoes not work correctly on Microsoft.NET\n"+
+ "\tYou might want to remove the CharSet declaration\n"+
+ "\tor compile using the Mono runtime instead of the\n"+
+ "\tMicrosoft .NET runtime\n"+
+ "\tThe runtime gave the error: " + e);
+ }
+ }
+
/// <summary>
/// Goes through class hierarchy and get value of first CLSCompliantAttribute that found.
/// If no is attribute exists then return assembly CLSCompliantAttribute.
/// </summary>
- public ClsComplianceValue GetClsCompliantAttributeValue ()
+ public bool GetClsCompliantAttributeValue ()
{
- if (cls_compliance != ClsComplianceValue.Undetected)
- return cls_compliance;
+ if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
+ return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+
+ caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
if (OptAttributes != null) {
- Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (this);
+ EmitContext ec = new EmitContext (parent, this, Location,
+ null, null, ModFlags, false);
+ Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
if (cls_attribute != null) {
- cls_compliance = cls_attribute.GetClsCompliantAttributeValue (this) ? ClsComplianceValue.Yes : ClsComplianceValue.No;
- return cls_compliance;
+ caching_flags |= Flags.HasClsCompliantAttribute;
+ if (cls_attribute.GetClsCompliantAttributeValue (this)) {
+ caching_flags |= Flags.ClsCompliantAttributeTrue;
+ return true;
+ }
+ return false;
}
}
if (parent == null) {
- cls_compliance = CodeGen.Assembly.IsClsCompliant ? ClsComplianceValue.Yes : ClsComplianceValue.No;
- return cls_compliance;
+ if (CodeGen.Assembly.IsClsCompliant) {
+ caching_flags |= Flags.ClsCompliantAttributeTrue;
+ return true;
+ }
+ return false;
}
- return parent.GetClsCompliantAttributeValue ();
+ if (parent.GetClsCompliantAttributeValue ()) {
+ caching_flags |= Flags.ClsCompliantAttributeTrue;
+ return true;
+ }
+ return false;
}
if (l != type_name.Length)
continue;
- if (String.Compare (Name, type_name, true) == 0 &&
- AttributeTester.IsClsCompliant (TypeManager.all_imported_types [type_name] as Type))
+ if (String.Compare (Name, type_name, true, CultureInfo.InvariantCulture) == 0 &&
+ AttributeTester.IsClsCompliant (TypeManager.all_imported_types [type_name] as Type)) {
+ Report.SymbolRelatedToPreviousError ((Type)TypeManager.all_imported_types [type_name]);
return false;
}
}
+ }
// Seek through generated types
foreach (string name in RootContext.Tree.Decls.Keys) {
if (l != name.Length)
continue;
- if (String.Compare (Name, name, true) == 0) {
+ if (String.Compare (Name, name, true, CultureInfo.InvariantCulture) == 0) {
if (Name == name)
continue;
DeclSpace found_ds = RootContext.Tree.Decls[name] as DeclSpace;
- if (found_ds.IsClsCompliaceRequired (found_ds.Parent))
+ if (found_ds.IsClsCompliaceRequired (found_ds.Parent)) {
+ Report.SymbolRelatedToPreviousError (found_ds.Location, found_ds.GetSignatureForError ());
return false;
}
}
+ }
return true;
}
return new TypeExpression (TypeBuilder, Location);
}
}
+
+ protected override string[] ValidAttributeTargets {
+ get {
+ return attribute_targets;
+ }
+ }
}
/// <summary>
protected Hashtable member_hash;
protected Hashtable method_hash;
- Hashtable interface_hash;
-
/// <summary>
/// Create a new MemberCache for the given IMemberContainer `container'.
/// </summary>
// TypeManager.object_type), we deep-copy its MemberCache here.
if (Container.IsInterface) {
MemberCache parent;
- interface_hash = new Hashtable ();
if (Container.Parent != null)
parent = Container.Parent.MemberCache;
/// <summary>
/// Add the contents of `new_hash' to `hash'.
/// </summary>
- void AddHashtable (Hashtable hash, Hashtable new_hash)
+ void AddHashtable (Hashtable hash, MemberCache cache)
{
+ Hashtable new_hash = cache.member_hash;
IDictionaryEnumerator it = new_hash.GetEnumerator ();
while (it.MoveNext ()) {
ArrayList list = (ArrayList) hash [it.Key];
- if (list != null)
- list.AddRange ((ArrayList) it.Value);
- else
- hash [it.Key] = ((ArrayList) it.Value).Clone ();
+ if (list == null)
+ hash [it.Key] = list = new ArrayList ();
+
+ foreach (CacheEntry entry in (ArrayList) it.Value) {
+ if (entry.Container != cache.Container)
+ break;
+ list.Add (entry);
+ }
}
}
foreach (TypeExpr iface in ifaces) {
Type itype = iface.Type;
- if (interface_hash.Contains (itype))
- continue;
-
- interface_hash [itype] = null;
-
IMemberContainer iface_container =
TypeManager.LookupMemberContainer (itype);
MemberCache iface_cache = iface_container.MemberCache;
- AddHashtable (hash, iface_cache.member_hash);
-
- if (iface_cache.interface_hash == null)
- continue;
-
- foreach (Type parent_contains in iface_cache.interface_hash.Keys)
- interface_hash [parent_contains] = null;
+ AddHashtable (hash, iface_cache);
}
return hash;
applicable = (ArrayList) method_hash [name];
else
applicable = (ArrayList) member_hash [name];
-
+
if (applicable == null)
return emptyMemberInfo;
IMemberContainer current = Container;
+
// `applicable' is a list of all members with the given member name `name'
// in the current class and all its parent classes. The list is sorted in
// reverse order due to the way how the cache is initialy created (to speed
for (int i = applicable.Count - 1; i >= 0; i--) {
CacheEntry entry = (CacheEntry) applicable [i];
- if ((entry.EntryType & (is_property ? EntryType.Property : EntryType.Method)) == 0)
+ if ((entry.EntryType & (is_property ? (EntryType.Property | EntryType.Field) : EntryType.Method)) == 0)
continue;
PropertyInfo pi = null;
MethodInfo mi = null;
- Type [] cmpAttrs;
+ FieldInfo fi = null;
+ Type [] cmpAttrs = null;
if (is_property) {
- pi = (PropertyInfo) entry.Member;
- cmpAttrs = TypeManager.GetArgumentTypes (pi);
+ if ((entry.EntryType & EntryType.Field) != 0) {
+ fi = (FieldInfo)entry.Member;
+
+ // TODO: For this case we ignore member type
+ //fb = TypeManager.GetField (fi);
+ //cmpAttrs = new Type[] { fb.MemberType };
+ } else {
+ pi = (PropertyInfo) entry.Member;
+ cmpAttrs = TypeManager.GetArgumentTypes (pi);
+ }
} else {
mi = (MethodInfo) entry.Member;
cmpAttrs = TypeManager.GetArgumentTypes (mi);
}
-
+
+ if (fi != null) {
+ // TODO: Almost duplicate !
+ // Check visibility
+ switch (fi.Attributes & FieldAttributes.FieldAccessMask) {
+ case FieldAttributes.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 (invocationType != entry.Container.Type &
+ TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
+ continue;
+
+ break;
+ case FieldAttributes.FamANDAssem:
+ case FieldAttributes.Assembly:
+ //
+ // Check for assembly methods
+ //
+ if (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
+ continue;
+ break;
+ }
+ return entry.Member;
+ }
+
//
// Check the arguments
//
projects / mono.git / blobdiff