// Licensed under the terms of the GNU GPL
//
// (C) 2001 Ximian, Inc (http://www.ximian.com)
+// (C) 2004 Novell, Inc
//
// TODO: Move the method verification stuff from the class.cs and interface.cs here
//
using System.Globalization;
using System.Reflection.Emit;
using System.Reflection;
+using System.Xml;
namespace Mono.CSharp {
public string GetMethodName ()
{
if (Left != null)
- return Left.GetFullName () + "." + Name;
+ return Left.GetTypeName () + "." + Name;
else
return Name;
}
- public string GetFullName ()
- {
- string full_name;
- if (TypeArguments != null)
- full_name = Name + "<" + TypeArguments + ">";
- else
- full_name = Name;
- if (Left != null)
- return Left.GetFullName () + "." + full_name;
- else
- return full_name;
- }
-
public static string MakeName (string name, TypeArguments args)
{
if (args == null)
public string GetTypeName ()
{
- string suffix = "";
if (Left != null)
return Left.GetTypeName () + "." +
MakeName (Name, TypeArguments);
}
}
- public readonly MemberName MemberName;
+ // Is not readonly because of IndexerName attribute
+ public MemberName MemberName;
/// <summary>
/// Modifier flags that the user specified in the source code
/// </summary>
public int ModFlags;
- public readonly TypeContainer Parent;
+ public /*readonly*/ TypeContainer Parent;
/// <summary>
/// Location where this declaration happens
/// </summary>
public readonly Location Location;
+ /// <summary>
+ /// XML documentation comment
+ /// </summary>
+ public string DocComment;
+
+ /// <summary>
+ /// Represents header string for documentation comment
+ /// for each member types.
+ /// </summary>
+ public abstract string DocCommentHeader { get; }
+
[Flags]
public enum Flags {
Obsolete_Undetected = 1, // Obsolete attribute has not been detected yet
/// </summary>
public virtual void Emit ()
{
- VerifyObsoleteAttribute ();
+ // Hack with Parent == null is for EnumMember
+ if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
+ VerifyObsoleteAttribute ();
if (!RootContext.VerifyClsCompliance)
return;
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);
+ Attribute obsolete_attr = OptAttributes.Search (
+ TypeManager.obsolete_attribute_type, ds.EmitContext);
if (obsolete_attr == null)
return null;
- ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds);
+ ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds.EmitContext);
if (obsolete == null)
return null;
/// <summary>
/// Returns true when MemberCore is exposed from assembly.
/// </summary>
- protected bool IsExposedFromAssembly (DeclSpace ds)
+ public bool IsExposedFromAssembly (DeclSpace ds)
{
if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
return false;
bool GetClsCompliantAttributeValue (DeclSpace ds)
{
if (OptAttributes != null) {
- EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
- null, null, ds.ModFlags, false);
- Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+ Attribute cls_attribute = OptAttributes.Search (
+ TypeManager.cls_compliant_attribute_type, ds.EmitContext);
if (cls_attribute != null) {
caching_flags |= Flags.HasClsCompliantAttribute;
- return cls_attribute.GetClsCompliantAttributeValue (ds);
+ return cls_attribute.GetClsCompliantAttributeValue (ds.EmitContext);
}
}
return ds.GetClsCompliantAttributeValue ();
}
}
+ /// <summary>
+ /// It helps to handle error 102 & 111 detection
+ /// </summary>
+ public virtual bool MarkForDuplicationCheck ()
+ {
+ return false;
+ }
+
/// <summary>
/// The main virtual method for CLS-Compliant verifications.
/// The method returns true if member is CLS-Compliant and false if member is not
protected virtual bool VerifyClsCompliance (DeclSpace ds)
{
if (!IsClsCompliaceRequired (ds)) {
- if ((RootContext.WarningLevel >= 2) && HasClsCompliantAttribute && !IsExposedFromAssembly (ds)) {
- Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+ if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
+ if (!IsExposedFromAssembly (ds))
+ Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+ if (!CodeGen.Assembly.IsClsCompliant)
+ Report.Warning (3021, Location, "'{0}' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
}
return false;
}
protected abstract void VerifyObsoleteAttribute ();
+ //
+ // Raised (and passed an XmlElement that contains the comment)
+ // when GenerateDocComment is writing documentation expectedly.
+ //
+ internal virtual void OnGenerateDocComment (DeclSpace ds, XmlElement intermediateNode)
+ {
+ }
+
+ //
+ // Returns a string that represents the signature for this
+ // member which should be used in XML documentation.
+ //
+ public virtual string GetDocCommentName (DeclSpace ds)
+ {
+ if (ds == null || this is DeclSpace)
+ return DocCommentHeader + Name;
+ else
+ return String.Concat (DocCommentHeader, ds.Name, ".", Name);
+ }
+
+ //
+ // Generates xml doc comments (if any), and if required,
+ // handle warning report.
+ //
+ internal virtual void GenerateDocComment (DeclSpace ds)
+ {
+ DocUtil.GenerateDocComment (this, ds);
+ }
}
/// <summary>
/// currently defining. We need to lookup members on this
/// instead of the TypeBuilder.
/// </summary>
- public TypeExpr CurrentType;
+ public Type CurrentType;
//
// This is the namespace in which this typecontainer
//
public NamespaceEntry NamespaceEntry;
- public Hashtable Cache = new Hashtable ();
+ private Hashtable Cache = new Hashtable ();
public string Basename;
readonly bool is_generic;
readonly int count_type_params;
+ // The emit context for toplevel objects.
+ protected EmitContext ec;
+
+ public EmitContext EmitContext {
+ get { return ec; }
+ }
+
//
// Whether we are Generic
//
/// <summary>
/// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
/// </summary>
- protected bool AddToContainer (MemberCore symbol, bool is_method, string fullname, string basename)
- {
- if (basename == Basename) {
- Report.SymbolRelatedToPreviousError (this);
- Report.Error (542, "'{0}': member names cannot be the same as their enclosing type", symbol.Location, symbol.GetSignatureForError ());
+ protected bool AddToContainer (MemberCore symbol, string fullname, string basename)
+ {
+ if (basename == Basename && !(this is Interface)) {
+ if (symbol is TypeParameter)
+ Report.Error (694, "Type parameter `{0}' has same name as " +
+ "containing type or method", basename);
+ else {
+ Report.SymbolRelatedToPreviousError (this);
+ Report.Error (542, "'{0}': member names cannot be the same as their " +
+ "enclosing type", symbol.Location, symbol.GetSignatureForError ());
+ }
return false;
}
MemberCore mc = (MemberCore)defined_names [fullname];
- if (is_method && (mc is MethodCore || mc is IMethodData)) {
- symbol.caching_flags |= Flags.TestMethodDuplication;
- mc.caching_flags |= Flags.TestMethodDuplication;
+ if (mc == null) {
+ defined_names.Add (fullname, symbol);
return true;
}
- if (mc != null) {
+ if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
+ return true;
+
+ if (symbol is TypeParameter)
+ Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", basename);
+ else {
Report.SymbolRelatedToPreviousError (mc);
- Report.Error (102, symbol.Location, "The type '{0}' already contains a definition for '{1}'", GetSignatureForError (), basename);
- return false;
+ Report.Error (102, symbol.Location,
+ "The type '{0}' already contains a definition for '{1}'",
+ GetSignatureForError (), basename);
}
-
- defined_names.Add (fullname, symbol);
- return true;
+ return false;
}
public void RecordDecl ()
in_transit = value;
}
}
-
- /// <summary>
- /// Looks up the alias for the name
- /// </summary>
- public IAlias LookupAlias (string name)
- {
- if (NamespaceEntry != null)
- return NamespaceEntry.LookupAlias (name);
- else
- return null;
- }
//
// root_types contains all the types. All TopLevel types
}
EmitContext type_resolve_ec;
- EmitContext GetTypeResolveEmitContext (TypeContainer parent, Location loc)
- {
- type_resolve_ec = new EmitContext (parent, this, loc, null, null, ModFlags, false);
- type_resolve_ec.ResolvingTypeTree = true;
-
- return type_resolve_ec;
- }
-
- // <summary>
- // Looks up the type, as parsed into the expression `e'.
- // </summary>
- //[Obsolete ("This method is going away soon")]
- public Type ResolveType (Expression e, bool silent, Location loc)
- {
- TypeExpr d = ResolveTypeExpr (e, silent, loc);
- if (d == null)
- return null;
-
- return ResolveType (d, loc);
- }
- public Type ResolveType (TypeExpr d, Location loc)
+ public FullNamedExpression ResolveNestedType (FullNamedExpression t, Location loc)
{
- if (!d.CheckAccessLevel (this)) {
- Report.Error (122, loc, "'{0}' is inaccessible due to its protection level", d.Name);
- return null;
- }
-
- Type t = d.ResolveType (type_resolve_ec);
- if (t == null)
- return null;
-
- if (d is UnboundTypeExpression)
- return t;
-
- TypeContainer tc = TypeManager.LookupTypeContainer (t);
+ TypeContainer tc = TypeManager.LookupTypeContainer (t.Type);
if ((tc != null) && tc.IsGeneric) {
if (!IsGeneric) {
- int tnum = TypeManager.GetNumberOfTypeArguments (t);
+ int tnum = TypeManager.GetNumberOfTypeArguments (t.Type);
Report.Error (305, loc,
"Using the generic type `{0}' " +
"requires {1} type arguments",
- TypeManager.GetFullName (t), tnum);
+ TypeManager.GetFullName (t.Type), tnum);
return null;
}
- ConstructedType ctype = new ConstructedType (
- t, TypeParameters, loc);
+ TypeParameter[] args;
+ if (this is GenericMethod)
+ args = Parent.TypeParameters;
+ else
+ args = TypeParameters;
- t = ctype.ResolveType (type_resolve_ec);
+ TypeExpr ctype = new ConstructedType (t.Type, args, loc);
+ return ctype.ResolveAsTypeTerminal (ec);
}
return t;
// Resolves the expression `e' for a type, and will recursively define
// types. This should only be used for resolving base types.
// </summary>
- public TypeExpr ResolveTypeExpr (Expression e, bool silent, Location loc)
+ public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
{
- if (type_resolve_ec == null)
- type_resolve_ec = GetTypeResolveEmitContext (Parent, loc);
+ if (type_resolve_ec == null) {
+ // FIXME: I think this should really be one of:
+ //
+ // a. type_resolve_ec = Parent.EmitContext;
+ // b. type_resolve_ec = new EmitContext (Parent, Parent, loc, null, null, ModFlags, false);
+ //
+ // However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
+ //
+ type_resolve_ec = new EmitContext (Parent, this, loc, null, null, ModFlags, false);
+ type_resolve_ec.ResolvingTypeTree = true;
+ }
type_resolve_ec.loc = loc;
if (this is GenericMethod)
type_resolve_ec.ContainerType = Parent.TypeBuilder;
else
type_resolve_ec.ContainerType = TypeBuilder;
- int errors = Report.Errors;
-
- TypeExpr d = e.ResolveAsTypeTerminal (type_resolve_ec, silent);
-
- if ((d != null) && (d.eclass == ExprClass.Type))
- return d;
-
- if (silent || (Report.Errors != errors))
- return null;
-
- if (e is SimpleName){
- SimpleName s = new SimpleName (((SimpleName) e).Name, loc);
- d = s.ResolveAsTypeTerminal (type_resolve_ec, silent);
-
- if ((d == null) || (d.Type == null)) {
- Report.Error (246, loc, "Cannot find type `{0}'", e);
- return null;
- }
-
- int num_args = TypeManager.GetNumberOfTypeArguments (d.Type);
-
- if (num_args == 0) {
- Report.Error (308, loc,
- "The non-generic type `{0}' cannot " +
- "be used with type arguments.",
- TypeManager.CSharpName (d.Type));
- return null;
- }
-
- Report.Error (305, loc,
- "Using the generic type `{0}' " +
- "requires {1} type arguments",
- TypeManager.GetFullName (d.Type), num_args);
- return null;
- }
-
- Report.Error (246, loc, "Cannot find type `{0}'", e);
- return null;
+ return e.ResolveAsTypeTerminal (type_resolve_ec);
}
public bool CheckAccessLevel (Type check_type)
{
TypeBuilder tb;
- if (this is GenericMethod)
+ if ((this is GenericMethod) || (this is Iterator))
tb = Parent.TypeBuilder;
else
tb = TypeBuilder;
if (check_type == tb)
return true;
+ if (TypeBuilder == null)
+ // FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
+ // However, this is invoked again later -- so safe to return true.
+ // May also be null when resolving top-level attributes.
+ return true;
+
if (check_type.IsGenericParameter)
return true; // FIXME
case TypeAttributes.NotPublic:
- if (TypeBuilder == null)
+ if (TypeBuilder == null)
// FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
// However, this is invoked again later -- so safe to return true.
// May also be null when resolving top-level attributes.
- return true;
-
- //
- // This test should probably use the declaringtype.
- //
+ return true;
+ //
+ // This test should probably use the declaringtype.
+ //
return check_type.Assembly == TypeBuilder.Assembly;
case TypeAttributes.NestedPublic:
return true;
case TypeAttributes.NestedPrivate:
- return NestedAccessible (check_type);
+ return NestedAccessible (tb, check_type);
case TypeAttributes.NestedFamily:
//
// Only accessible to methods in current type or any subtypes
//
- return FamilyAccessible (check_type);
+ return FamilyAccessible (tb, check_type);
case TypeAttributes.NestedFamANDAssem:
return (check_type.Assembly == tb.Assembly) &&
- FamilyAccessible (check_type);
+ FamilyAccessible (tb, check_type);
case TypeAttributes.NestedFamORAssem:
return (check_type.Assembly == tb.Assembly) ||
- FamilyAccessible (check_type);
+ FamilyAccessible (tb, check_type);
case TypeAttributes.NestedAssembly:
return check_type.Assembly == tb.Assembly;
}
- protected bool NestedAccessible (Type check_type)
+ protected bool NestedAccessible (Type tb, Type check_type)
{
string check_type_name = check_type.FullName;
string container = check_type_name.Substring (0, cio + 1);
// Ensure that type_name ends with a '+' so that it can match 'container', if necessary
- string type_name = TypeBuilder.FullName + "+";
+ string type_name = tb.FullName + "+";
// If the current class is nested inside the container of check_type,
// we can access check_type even if it is private or protected.
return type_name.StartsWith (container);
}
- protected bool FamilyAccessible (Type check_type)
+ protected bool FamilyAccessible (Type tb, Type check_type)
{
Type declaring = check_type.DeclaringType;
- if (TypeBuilder == declaring ||
- TypeBuilder.IsSubclassOf (declaring))
+ if (tb == declaring || TypeManager.IsFamilyAccessible (tb, declaring))
return true;
- return NestedAccessible (check_type);
+ return NestedAccessible (tb, check_type);
}
// Access level of a type.
return tc.DefineType ();
}
- Type LookupInterfaceOrClass (string ns, string name, out bool error)
+ FullNamedExpression LookupInterfaceOrClass (string ns, string name, out bool error)
{
DeclSpace parent;
+ FullNamedExpression result;
Type t;
object r;
error = false;
if (dh.Lookup (ns, name, out r))
- return (Type) r;
+ return (FullNamedExpression) r;
else {
if (ns != ""){
if (Namespace.IsNamespace (ns)){
}
if (t != null) {
- dh.Insert (ns, name, t);
- return t;
+ result = new TypeExpression (t, Location.Null);
+ dh.Insert (ns, name, result);
+ return result;
+ }
+
+ if (ns != "" && Namespace.IsNamespace (ns)) {
+ result = Namespace.LookupNamespace (ns, false).Lookup (this, name, Location.Null);
+ if (result != null) {
+ dh.Insert (ns, name, result);
+ return result;
+ }
+ }
+
+ if (ns == "" && Namespace.IsNamespace (name)) {
+ result = Namespace.LookupNamespace (name, false);
+ dh.Insert (ns, name, result);
+ return result;
}
//
ns = MakeFQN (ns, name.Substring (0, p));
name = name.Substring (p+1);
}
-
+
+ if (ns.IndexOf ('+') != -1)
+ ns = ns.Replace ('+', '.');
+
parent = RootContext.Tree.LookupByNamespace (ns, name);
if (parent == null) {
dh.Insert (ns, name, null);
return null;
}
- dh.Insert (ns, name, t);
- return t;
+ result = new TypeExpression (t, Location.Null);
+ dh.Insert (ns, name, result);
+ return result;
}
public static void Error_AmbiguousTypeReference (Location loc, string name, string t1, string t2)
public Type FindNestedType (Location loc, string name,
out DeclSpace containing_ds)
{
- Type t;
+ FullNamedExpression t;
bool error;
containing_ds = this;
if (error)
return null;
- if ((t != null) && containing_ds.CheckAccessLevel (t))
- return t;
+ if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
+ return t.Type;
current_type = current_type.BaseType;
}
/// during the tree resolution process and potentially define
/// recursively the type
/// </remarks>
- public Type FindType (Location loc, string name)
+ public FullNamedExpression FindType (Location loc, string name)
{
- Type t;
+ FullNamedExpression t;
bool error;
//
// For the case the type we are looking for is nested within this one
// or is in any base class
//
+
DeclSpace containing_ds = this;
while (containing_ds != null){
if (error)
return null;
- if ((t != null) && containing_ds.CheckAccessLevel (t))
- return t;
+ if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
+ return ResolveNestedType (t, loc);
current_type = current_type.BaseType;
}
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;
- }
+ t = ns.LookupAlias (name);
+ if (t != null)
+ return t;
//
// Now check the using clause list
//
- Type match = null;
+ FullNamedExpression match = null;
foreach (Namespace using_ns in ns.GetUsingTable ()) {
match = LookupInterfaceOrClass (using_ns.Name, name, out error);
if (error)
return null;
- if (match != null) {
- if (t != null){
- if (CheckAccessLevel (match)) {
- Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
- return null;
- }
+ if ((match != null) && (match is TypeExpr)) {
+ Type matched = ((TypeExpr) match).Type;
+ if (!CheckAccessLevel (matched))
continue;
+ if (t != null){
+ Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
+ return null;
}
-
t = match;
}
}
return null;
}
+ //
+ // Public function used to locate types, this can only
+ // be used after the ResolveTree function has been invoked.
+ //
+ // Returns: Type or null if they type can not be found.
+ //
+ // Come to think of it, this should be a DeclSpace
+ //
+ public FullNamedExpression LookupType (string name, bool silent, Location loc)
+ {
+ FullNamedExpression e;
+
+ if (Cache.Contains (name)) {
+ e = (FullNamedExpression) Cache [name];
+ } else {
+ //
+ // For the case the type we are looking for is nested within this one
+ // or is in any base class
+ //
+ DeclSpace containing_ds = this;
+ while (containing_ds != null){
+
+ // if the member cache has been created, lets use it.
+ // the member cache is MUCH faster.
+ if (containing_ds.MemberCache != null) {
+ Type t = containing_ds.MemberCache.FindNestedType (name);
+ if (t == null) {
+ containing_ds = containing_ds.Parent;
+ continue;
+ }
+
+ e = new TypeExpression (t, Location.Null);
+ e = ResolveNestedType (e, Location.Null);
+ Cache [name] = e;
+ return e;
+ }
+
+ // no member cache. Do it the hard way -- reflection
+ Type current_type = containing_ds.TypeBuilder;
+
+ while (current_type != null &&
+ current_type != TypeManager.object_type) {
+ //
+ // nested class
+ //
+ Type t = TypeManager.LookupType (current_type.FullName + "." + name);
+ if (t != null){
+ e = new TypeExpression (t, Location.Null);
+ e = ResolveNestedType (e, Location.Null);
+ Cache [name] = e;
+ return e;
+ }
+
+ current_type = current_type.BaseType;
+ }
+
+ containing_ds = containing_ds.Parent;
+ }
+
+ e = NamespaceEntry.LookupNamespaceOrType (this, name, loc);
+ if (!silent || e != null)
+ Cache [name] = e;
+ }
+
+ if (e == null && !silent)
+ Report.Error (246, loc, "Cannot find type `"+name+"'");
+
+ return e;
+ }
+
/// <remarks>
/// This function is broken and not what you're looking for. It should only
/// be used while the type is still being created since it doesn't use the cache
caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
if (OptAttributes != null) {
- EmitContext ec = new EmitContext (Parent, this, Location,
- null, null, ModFlags, false);
- Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+ Attribute cls_attribute = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, ec);
if (cls_attribute != null) {
caching_flags |= Flags.HasClsCompliantAttribute;
- if (cls_attribute.GetClsCompliantAttributeValue (this)) {
+ if (cls_attribute.GetClsCompliantAttributeValue (ec)) {
caching_flags |= Flags.ClsCompliantAttributeTrue;
return true;
}
type_params [i] = new TypeParameter (Parent, name, constraints, Location);
string full_name = Name + "." + name;
- AddToContainer (type_params [i], false, full_name, name);
+ AddToContainer (type_params [i], full_name, name);
}
}
get { return Name; }
}
- TypeExpr IAlias.Type
+ TypeExpr IAlias.ResolveAsType (EmitContext ec)
{
- get {
- if (TypeBuilder == null)
- throw new InvalidOperationException ();
-
- if (CurrentType != null)
- return CurrentType;
+ if (TypeBuilder == null)
+ throw new InvalidOperationException ();
+ if (CurrentType != null)
+ return new TypeExpression (CurrentType, Location);
+ else
return new TypeExpression (TypeBuilder, Location);
- }
}
public override string[] ValidAttributeTargets {
}
/// <summary>
- /// Returns the IMemberContainer of the parent class or null if this
+ /// 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 parent class.
+ /// members from the base class.
/// </summary>
- IMemberContainer ParentContainer {
+ MemberCache BaseCache {
get;
}
public readonly IMemberContainer Container;
protected Hashtable member_hash;
protected Hashtable method_hash;
-
+
/// <summary>
/// Create a new MemberCache for the given IMemberContainer `container'.
/// </summary>
Timer.IncrementCounter (CounterType.MemberCache);
Timer.StartTimer (TimerType.CacheInit);
-
-
- // If we have a parent class (we have a parent class unless we're
+ // 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.IsInterface) {
- MemberCache parent;
-
- if (Container.ParentContainer != null)
- parent = Container.ParentContainer.MemberCache;
- else
- parent = TypeHandle.ObjectType.MemberCache;
- member_hash = SetupCacheForInterface (parent);
- } else if (Container.ParentContainer != null)
- member_hash = SetupCache (Container.ParentContainer.MemberCache);
+ if (Container.BaseCache != null)
+ member_hash = SetupCache (Container.BaseCache);
else
member_hash = new Hashtable ();
Timer.StopTimer (TimerType.CacheInit);
}
+ public MemberCache (Type[] ifaces)
+ {
+ //
+ // The members of this cache all belong to other caches.
+ // So, 'Container' will not be used.
+ //
+ this.Container = null;
+
+ member_hash = new Hashtable ();
+ if (ifaces == null)
+ return;
+
+ foreach (Type itype in ifaces)
+ AddCacheContents (TypeManager.LookupMemberCache (itype));
+ }
+
/// <summary>
- /// Bootstrap this member cache by doing a deep-copy of our parent.
+ /// Bootstrap this member cache by doing a deep-copy of our base.
/// </summary>
- Hashtable SetupCache (MemberCache parent)
+ Hashtable SetupCache (MemberCache base_class)
{
Hashtable hash = new Hashtable ();
- IDictionaryEnumerator it = parent.member_hash.GetEnumerator ();
+ if (base_class == null)
+ return hash;
+
+ IDictionaryEnumerator it = base_class.member_hash.GetEnumerator ();
while (it.MoveNext ()) {
hash [it.Key] = ((ArrayList) it.Value).Clone ();
- }
+ }
return hash;
}
-
/// <summary>
- /// Add the contents of `new_hash' to `hash'.
+ /// Add the contents of `cache' to the member_hash.
/// </summary>
- void AddHashtable (Hashtable hash, MemberCache cache)
+ void AddCacheContents (MemberCache cache)
{
- Hashtable new_hash = cache.member_hash;
- IDictionaryEnumerator it = new_hash.GetEnumerator ();
+ IDictionaryEnumerator it = cache.member_hash.GetEnumerator ();
while (it.MoveNext ()) {
- ArrayList list = (ArrayList) hash [it.Key];
+ ArrayList list = (ArrayList) member_hash [it.Key];
if (list == null)
- hash [it.Key] = list = new ArrayList ();
+ member_hash [it.Key] = list = new ArrayList ();
+
+ ArrayList entries = (ArrayList) it.Value;
+ for (int i = entries.Count-1; i >= 0; i--) {
+ CacheEntry entry = (CacheEntry) entries [i];
- foreach (CacheEntry entry in (ArrayList) it.Value) {
if (entry.Container != cache.Container)
break;
list.Add (entry);
}
}
- /// <summary>
- /// Bootstrap the member cache for an interface type.
- /// Type.GetMembers() won't return any inherited members for interface types,
- /// so we need to do this manually. Interfaces also inherit from System.Object.
- /// </summary>
- Hashtable SetupCacheForInterface (MemberCache parent)
- {
- Hashtable hash = SetupCache (parent);
- Type [] ifaces = TypeManager.GetInterfaces (Container.Type);
-
- foreach (Type itype in ifaces) {
- IMemberContainer iface_container =
- TypeManager.LookupMemberContainer (itype);
-
- MemberCache iface_cache = iface_container.MemberCache;
-
- AddHashtable (hash, iface_cache);
- }
-
- return hash;
- }
-
/// <summary>
/// Add all members from class `container' to the cache.
/// </summary>
{
// 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);
}
// When this method is called for the current class, the list will
- // already contain all inherited members from our parent classes.
+ // 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).
this.Member = member;
this.EntryType = GetEntryType (mt, bf);
}
+
+ public override string ToString ()
+ {
+ return String.Format ("CacheEntry ({0}:{1}:{2})", Container.Name,
+ EntryType, Member);
+ }
}
/// <summary>
// `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
+ // 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 parent).
+ // things up, we're doing a deep-copy of our base).
for (int i = applicable.Count-1; i >= 0; i--) {
CacheEntry entry = (CacheEntry) applicable [i];
return copy;
}
+ // find the nested type @name in @this.
+ public Type FindNestedType (string name)
+ {
+ ArrayList applicable = (ArrayList) member_hash [name];
+ if (applicable == null)
+ return null;
+
+ for (int i = applicable.Count-1; i >= 0; i--) {
+ CacheEntry entry = (CacheEntry) applicable [i];
+ if ((entry.EntryType & EntryType.NestedType & EntryType.MaskType) != 0)
+ return (Type) entry.Member;
+ }
+
+ return null;
+ }
+
//
// This finds the method or property for us to override. invocationType is the type where
// the override is going to be declared, name is the name of the method/property, and
projects / mono.git / blobdiff