namespace Mono.CSharp {
public class MemberName {
- public string Name;
+ public readonly string Name;
public readonly TypeArguments TypeArguments;
public readonly MemberName Left;
this.TypeArguments = args;
}
+ public MemberName (MemberName left, string name)
+ : this (left, name, null)
+ {
+ }
+
public MemberName (MemberName left, string name, TypeArguments args)
: this (name, args)
{
public MemberName (MemberName left, MemberName right)
: this (left, right.Name, right.TypeArguments)
{
+ Name = right.Name;
+ Left = (right.Left == null) ? left : new MemberName (left, right.Left);
+ TypeArguments = right.TypeArguments;
+ }
+
+ static readonly char [] dot_array = { '.' };
+
+ public static MemberName FromDotted (string name)
+ {
+ string [] elements = name.Split (dot_array);
+ int count = elements.Length;
+ int i = 0;
+ MemberName n = new MemberName (elements [i++]);
+ while (i < count)
+ n = new MemberName (n, elements [i++]);
+ return n;
}
public string GetName ()
return new MemberAccess (lexpr, Name, TypeArguments, loc);
} else {
if (TypeArguments != null)
- return new ConstructedType (Name, TypeArguments, loc);
+ return new SimpleName (Basename, TypeArguments, loc);
else
return new SimpleName (Name, loc);
}
else
return full_name;
}
+
+ public override bool Equals (object other)
+ {
+ return Equals (other as MemberName);
+ }
+
+ public bool Equals (MemberName other)
+ {
+ if (this == other)
+ return true;
+ if (other == null || Name != other.Name)
+ return false;
+
+ if ((TypeArguments != null) &&
+ (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count))
+ return false;
+
+ if ((TypeArguments == null) && (other.TypeArguments != null))
+ return false;
+
+ if (Left == null)
+ return other.Left == null;
+
+ return Left.Equals (other.Left);
+ }
+
+ public override int GetHashCode ()
+ {
+ int hash = Name.GetHashCode ();
+ for (MemberName n = Left; n != null; n = n.Left)
+ hash ^= n.Name.GetHashCode ();
+
+ if (TypeArguments != null)
+ hash ^= TypeArguments.Count << 5;
+
+ return hash & 0x7FFFFFFF;
+ }
}
/// <summary>
/// <summary>
/// Public name
/// </summary>
+
+ protected string cached_name;
public string Name {
get {
- return MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+ if (cached_name == null)
+ cached_name = MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+ return cached_name;
}
}
// Is not readonly because of IndexerName attribute
- public MemberName MemberName;
+ private MemberName member_name;
+ public MemberName MemberName {
+ get { return member_name; }
+ }
/// <summary>
/// Modifier flags that the user specified in the source code
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
+ TestMethodDuplication = 1 << 10, // Test for duplication must be performed
+ IsUsed = 1 << 11
}
/// <summary>
Location loc)
: base (attrs)
{
+ if (parent is PartialContainer && !(this is PartialContainer))
+ throw new InternalErrorException ("A PartialContainer cannot be the direct parent of a member");
+
Parent = parent;
- MemberName = name;
+ member_name = name;
Location = loc;
caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
}
+ protected virtual void SetMemberName (MemberName new_name)
+ {
+ member_name = new_name;
+ cached_name = null;
+ }
+
/// <summary>
/// Tests presence of ObsoleteAttribute and report proper error
/// </summary>
}
}
+ public virtual bool IsUsed {
+ get {
+ return (caching_flags & Flags.IsUsed) != 0;
+ }
+ }
+
+ public void SetMemberIsUsed ()
+ {
+ caching_flags |= Flags.IsUsed;
+ }
+
//
// Whehter is it ok to use an unsafe pointer in this type container
//
private Hashtable Cache = new Hashtable ();
- public string Basename;
+ public readonly string Basename;
protected Hashtable defined_names;
readonly bool is_generic;
readonly int count_type_params;
+ readonly int count_current_type_params;
// The emit context for toplevel objects.
protected EmitContext ec;
: base (parent, name, attrs, l)
{
NamespaceEntry = ns;
- Basename = name.Name;
+ Basename = name.Basename;
defined_names = new Hashtable ();
if (name.TypeArguments != null) {
is_generic = true;
- count_type_params = name.TypeArguments.Count;
+ count_type_params = count_current_type_params = name.TypeArguments.Count;
}
if (parent != null)
count_type_params += parent.count_type_params;
/// <summary>
/// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
/// </summary>
- protected bool AddToContainer (MemberCore symbol, string fullname, string basename)
+ protected bool AddToContainer (MemberCore symbol, string name)
{
- if (basename == Basename && !(this is Interface)) {
+ if (name == Basename && !(this is Interface) && !(this is Enum)) {
if (symbol is TypeParameter)
Report.Error (694, "Type parameter `{0}' has same name as " +
- "containing type or method", basename);
+ "containing type or method", name);
else {
Report.SymbolRelatedToPreviousError (this);
Report.Error (542, "'{0}': member names cannot be the same as their " +
return false;
}
- MemberCore mc = (MemberCore)defined_names [fullname];
+ MemberCore mc = (MemberCore) defined_names [name];
if (mc == null) {
- defined_names.Add (fullname, symbol);
+ defined_names.Add (name, symbol);
return true;
}
return true;
if (symbol is TypeParameter)
- Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", basename);
+ Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", name);
else {
Report.SymbolRelatedToPreviousError (mc);
Report.Error (102, symbol.Location,
"The type '{0}' already contains a definition for '{1}'",
- GetSignatureForError (), basename);
+ GetSignatureForError (), name);
}
return false;
}
return (MemberCore)defined_names [name];
}
- bool in_transit = false;
-
- /// <summary>
- /// This function is used to catch recursive definitions
- /// in declarations.
- /// </summary>
- public bool InTransit {
- get {
- return in_transit;
- }
-
- set {
- in_transit = value;
- }
- }
-
//
// root_types contains all the types. All TopLevel types
// hence have a parent that points to `root_types', that is
}
}
+ protected virtual TypeAttributes TypeAttr {
+ get {
+ return CodeGen.Module.DefaultCharSetType;
+ }
+ }
+
/// <remarks>
/// Should be overriten by the appropriate declaration space
/// </remarks>
}
}
- public static string MakeFQN (string nsn, string name)
- {
- if (nsn == "")
- return name;
- return String.Concat (nsn, ".", name);
- }
-
EmitContext type_resolve_ec;
-
- public FullNamedExpression ResolveNestedType (FullNamedExpression t, Location loc)
- {
- TypeContainer tc = TypeManager.LookupTypeContainer (t.Type);
- if ((tc != null) && tc.IsGeneric) {
- if (!IsGeneric) {
- int tnum = TypeManager.GetNumberOfTypeArguments (t.Type);
- Report.Error (305, loc,
- "Using the generic type `{0}' " +
- "requires {1} type arguments",
- TypeManager.GetFullName (t.Type), tnum);
- return null;
+ protected EmitContext TypeResolveEmitContext {
+ get {
+ 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, Location.Null, null, null, ModFlags, false);
}
-
- TypeParameter[] args;
- if (this is GenericMethod)
- args = Parent.TypeParameters;
- else
- args = TypeParameters;
-
- TypeExpr ctype = new ConstructedType (t.Type, args, loc);
- return ctype.ResolveAsTypeTerminal (ec);
+ return type_resolve_ec;
}
-
- return t;
}
// <summary>
// </summary>
public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location 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;
+ TypeResolveEmitContext.loc = loc;
+ TypeResolveEmitContext.ContainerType = TypeBuilder;
if (this is GenericMethod)
- type_resolve_ec.ContainerType = Parent.TypeBuilder;
+ TypeResolveEmitContext.ContainerType = Parent.TypeBuilder;
else
- type_resolve_ec.ContainerType = TypeBuilder;
+ TypeResolveEmitContext.ContainerType = TypeBuilder;
- return e.ResolveAsTypeTerminal (type_resolve_ec);
+ return e.ResolveAsTypeTerminal (TypeResolveEmitContext);
}
public bool CheckAccessLevel (Type check_type)
protected bool NestedAccessible (Type tb, Type check_type)
{
- string check_type_name = check_type.FullName;
-
- // At this point, we already know check_type is a nested class.
- int cio = check_type_name.LastIndexOf ('+');
-
- // Ensure that the string 'container' has a '+' in it to avoid false matches
- 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 = 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);
+ Type declaring = check_type.DeclaringType;
+ return TypeBuilder == declaring ||
+ TypeManager.IsNestedChildOf (TypeBuilder, declaring);
}
protected bool FamilyAccessible (Type tb, Type check_type)
return ~ (~ mAccess | pAccess) == 0;
}
-
- static DoubleHash dh = new DoubleHash (1000);
-
- Type DefineTypeAndParents (DeclSpace tc)
- {
- DeclSpace container = tc.Parent;
-
- if (container.TypeBuilder == null && container.Name != "")
- DefineTypeAndParents (container);
-
- return tc.DefineType ();
- }
-
- 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 (FullNamedExpression) r;
- else {
- if (ns != ""){
- if (Namespace.IsNamespace (ns)){
- string fullname = (ns != "") ? ns + "." + name : name;
- t = TypeManager.LookupType (fullname);
- } else
- t = null;
- } else
- t = TypeManager.LookupType (name);
- }
-
- if (t != null) {
- 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;
- }
-
- //
- // In case we are fed a composite name, normalize it.
- //
- int p = name.LastIndexOf ('.');
- if (p != -1){
- 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;
- }
-
- t = DefineTypeAndParents (parent);
- if (t == null){
- error = true;
- return null;
- }
-
- 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)
{
name, t1, t2);
}
- public Type FindNestedType (Location loc, string name,
- out DeclSpace containing_ds)
+ //
+ // Return the nested type with name @name. Ensures that the nested type
+ // is defined if necessary. Do _not_ use this when you have a MemberCache handy.
+ //
+ public virtual Type FindNestedType (string name)
{
- FullNamedExpression t;
- bool error;
-
- containing_ds = this;
- while (containing_ds != null){
- Type container_type = containing_ds.TypeBuilder;
- Type current_type = container_type;
-
- while (current_type != null && current_type != TypeManager.object_type) {
- string pre = current_type.FullName;
-
- t = LookupInterfaceOrClass (pre, name, out error);
- if (error)
- return null;
-
- if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
- return t.Type;
-
- current_type = current_type.BaseType;
- }
- containing_ds = containing_ds.Parent;
- }
-
return null;
}
- /// <summary>
- /// GetType is used to resolve type names at the DeclSpace level.
- /// Use this to lookup class/struct bases, interface bases or
- /// delegate type references
- /// </summary>
- ///
- /// <remarks>
- /// Contrast this to LookupType which is used inside method bodies to
- /// lookup types that have already been defined. GetType is used
- /// during the tree resolution process and potentially define
- /// recursively the type
- /// </remarks>
- public FullNamedExpression FindType (Location loc, string name)
+ private Type LookupNestedTypeInHierarchy (string name)
{
- 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){
- Type container_type = containing_ds.TypeBuilder;
- Type current_type = container_type;
-
- while (current_type != null && current_type != TypeManager.object_type) {
- string pre = current_type.FullName;
-
- t = LookupInterfaceOrClass (pre, name, out error);
- if (error)
- return 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 ((t != null) && containing_ds.CheckAccessLevel (t.Type))
- return ResolveNestedType (t, loc);
-
- current_type = current_type.BaseType;
+ // 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) {
+ if (current_type is TypeBuilder) {
+ DeclSpace decl = this;
+ if (current_type != TypeBuilder)
+ decl = TypeManager.LookupDeclSpace (current_type);
+ t = decl.FindNestedType (name);
+ } else {
+ t = TypeManager.GetNestedType (current_type, name);
}
- containing_ds = containing_ds.Parent;
- }
-
- //
- // Attempt to lookup the class on our namespace and all it's implicit parents
- //
- for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.ImplicitParent) {
- t = LookupInterfaceOrClass (ns.FullName, name, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
- }
-
- //
- // Attempt to do a direct unqualified lookup
- //
- t = LookupInterfaceOrClass ("", name, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
-
- //
- // Attempt to lookup the class on any of the `using'
- // namespaces
- //
-
- for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.Parent){
-
- t = LookupInterfaceOrClass (ns.FullName, name, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
-
- if (name.IndexOf ('.') > 0)
- continue;
- t = ns.LookupAlias (name);
- if (t != null)
- return t;
-
- //
- // Now check the using clause list
- //
- 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) && (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;
- }
- }
- if (t != null)
+ if (t != null && CheckAccessLevel (t))
return t;
}
- //Report.Error (246, Location, "Can not find type `"+name+"'");
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.
+ // Set 'ignore_cs0104' to true if you want to ignore cs0104 errors.
//
- // Come to think of it, this should be a DeclSpace
+ // Returns: Type or null if they type can not be found.
//
- public FullNamedExpression LookupType (string name, bool silent, Location loc)
+ public FullNamedExpression LookupType (string name, Location loc, bool ignore_cs0104)
{
- FullNamedExpression e;
+ if (this is PartialContainer)
+ throw new InternalErrorException ("Should not get here");
- 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;
- }
+ if (Cache.Contains (name))
+ return (FullNamedExpression) Cache [name];
- 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;
- }
+ FullNamedExpression e;
+ Type t = LookupNestedTypeInHierarchy (name);
+ if (t != null)
+ e = new TypeExpression (t, Location.Null);
+ else if (Parent != null && Parent != RootContext.Tree.Types)
+ e = Parent.LookupType (name, loc, ignore_cs0104);
+ else
+ e = NamespaceEntry.LookupNamespaceOrType (this, name, loc, ignore_cs0104);
- if (e == null && !silent)
- Report.Error (246, loc, "Cannot find type `"+name+"'");
-
+ Cache [name] = e;
return e;
}
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);
+ if (a.Type == TypeManager.required_attr_type) {
+ Report.Error (1608, a.Location, "The RequiredAttribute attribute is not permitted on C# types");
+ return;
}
+ TypeBuilder.SetCustomAttribute (cb);
}
/// <summary>
type_params [i] = new TypeParameter (Parent, name, constraints, Location);
- string full_name = Name + "." + name;
- AddToContainer (type_params [i], full_name, name);
+ AddToContainer (type_params [i], name);
}
}
}
}
+ public int CountCurrentTypeParameters {
+ get {
+ return count_current_type_params;
+ }
+ }
+
public TypeParameterExpr LookupGeneric (string name, Location loc)
{
if (!IsGeneric)
// If this is neither a dynamic type nor an interface, create a special
// method cache with all declared and inherited methods.
Type type = container.Type;
- if (!(type is TypeBuilder) && !type.IsInterface && !type.IsGenericParameter) {
+ if (!(type is TypeBuilder) && !type.IsInterface &&
+ // !(type.IsGenericInstance && (type.GetGenericTypeDefinition () is TypeBuilder)) &&
+ !type.IsGenericInstance &&
+ (Container.BaseCache == null || Container.BaseCache.method_hash != null)) {
method_hash = new Hashtable ();
AddMethods (type);
}
return hash;
}
+ void ClearDeclaredOnly (Hashtable hash)
+ {
+ IDictionaryEnumerator it = hash.GetEnumerator ();
+ while (it.MoveNext ()) {
+ foreach (CacheEntry ce in (ArrayList) it.Value)
+ ce.EntryType &= ~EntryType.Declared;
+ }
+ }
+
/// <summary>
/// Add the contents of `cache' to the member_hash.
/// </summary>
void AddMethods (BindingFlags bf, Type type)
{
- MemberInfo [] members = type.GetMethods (bf);
+ //
+ // Consider the case:
+ //
+ // class X { public virtual int f() {} }
+ // class Y : X {}
+ //
+ // When processing 'Y', the method_cache will already have a copy of 'f',
+ // with ReflectedType == X. However, we want to ensure that its ReflectedType == Y
+ //
+ MethodBase [] members = type.GetMethods (bf);
Array.Reverse (members);
method_hash.Add (name, list);
}
+ MethodInfo curr = (MethodInfo) member;
+ while (curr.IsVirtual && (curr.Attributes & MethodAttributes.NewSlot) == 0) {
+ MethodInfo base_method = curr.GetBaseDefinition ();
+
+ if (base_method == curr) {
+ //
+ // Both mcs and CSC 1.1 seem to emit a somewhat broken
+ // ...Invoke () function for delegates: it's missing a 'newslot'.
+ // CSC 2.0 emits a 'newslot' for a delegate's Invoke.
+ //
+ // Also, CSC 1.1 appears to emit 'Finalize' without a newslot.
+ //
+ if ((curr.Name == "Invoke" && TypeManager.IsDelegateType (curr.DeclaringType)) ||
+ (curr.Name == "Finalize" && curr.GetParameters().Length == 0 && curr.DeclaringType == TypeManager.object_type))
+ break;
+
+ Report.SymbolRelatedToPreviousError (base_method);
+ Report.Warning (-28,
+ "The method '{0}' is marked 'override'," +
+ " but doesn't appear to override any virtual or abstract method:" +
+ " it may be ignored during overload resolution",
+ TypeManager.CSharpSignature (base_method));
+ break;
+ }
+
+ list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
+ curr = base_method;
+ }
+
// Unfortunately, the elements returned by Type.GetMethods() aren't
// sorted so we need to do this check for every member.
BindingFlags new_bf = bf;
MaskType = Constructor|Event|Field|Method|Property|NestedType
}
- protected struct CacheEntry {
+ protected class CacheEntry {
public readonly IMemberContainer Container;
- public readonly EntryType EntryType;
- public readonly MemberInfo Member;
+ public EntryType EntryType;
+ public MemberInfo Member;
public CacheEntry (IMemberContainer container, MemberInfo member,
MemberTypes mt, BindingFlags bf)
projects / mono.git / blobdiff