X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fdecl.cs;h=f743f27ede616e2139c489a850fb6d2fc41f56b1;hb=209eae257ac9c28f1c8361fd78b2933744dd19af;hp=75ab49272b0bff81263bd161a7c196c0f05e59d2;hpb=1972473723234d8c6c144eddc949e1cb702e5825;p=mono.git
diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
index 75ab49272b0..f743f27ede6 100644
--- a/mcs/mcs/decl.cs
+++ b/mcs/mcs/decl.cs
@@ -4,12 +4,11 @@
// Author: Miguel de Icaza (miguel@gnu.org)
// Marek Safar (marek.safar@seznam.cz)
//
-// Licensed under the terms of the GNU GPL
+// Dual licensed under the terms of the MIT X11 or GNU GPL
//
-// (C) 2001 Ximian, Inc (http://www.ximian.com)
-// (C) 2004 Novell, Inc
+// Copyright 2001 Ximian, Inc (http://www.ximian.com)
+// Copyright 2004-2008 Novell, Inc
//
-// TODO: Move the method verification stuff from the class.cs and interface.cs here
//
using System;
@@ -19,7 +18,7 @@ using System.Globalization;
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;
@@ -27,6 +26,9 @@ using System.Xml;
namespace Mono.CSharp {
+ //
+ // Better name would be DottenName
+ //
public class MemberName {
public readonly string Name;
public readonly TypeArguments TypeArguments;
@@ -79,8 +81,8 @@ namespace Mono.CSharp {
: 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)
@@ -95,6 +97,7 @@ namespace Mono.CSharp {
this.Left = (right.Left == null) ? left : new MemberName (left, right.Left);
}
+ // TODO: Remove
public string GetName ()
{
return GetName (false);
@@ -114,38 +117,25 @@ namespace Mono.CSharp {
public string GetName (bool is_generic)
{
string name = is_generic ? Basename : Name;
- string connect = is_double_colon ? "::" : ".";
if (Left != null)
- return Left.GetName (is_generic) + connect + name;
- else
- return name;
- }
+ return Left.GetName (is_generic) + (is_double_colon ? "::" : ".") + name;
- public string GetTypeName ()
- {
- string connect = is_double_colon ? "::" : ".";
- if (Left != null)
- return Left.GetTypeName () + connect + MakeName (Name, TypeArguments);
- else
- return MakeName (Name, TypeArguments);
+ return name;
}
- public Expression GetTypeExpression ()
+ public ATypeNameExpression GetTypeExpression ()
{
if (Left == null) {
if (TypeArguments != null)
return new SimpleName (Basename, TypeArguments, Location);
- if (RootContext.Version == LanguageVersion.LINQ && Name == "var")
- return new VarExpr (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, Name, TypeArguments, Location);
}
Expression lexpr = Left.GetTypeExpression ();
@@ -162,37 +152,17 @@ namespace Mono.CSharp {
get {
if (TypeArguments != null)
return MakeName (Name, TypeArguments);
- else
- return Name;
- }
- }
-
- public string FullName {
- get {
- if (TypeArguments != null)
- return Name + "<" + TypeArguments + ">";
- else
- return Name;
- }
- }
-
- public string MethodName {
- get {
- string connect = is_double_colon ? "::" : ".";
- if (Left != null)
- return Left.FullName + connect + Name;
- else
- return Name;
+ return Name;
}
}
- public override string ToString ()
+ public string GetSignatureForError ()
{
+ string append = TypeArguments == null ? "" : "<" + TypeArguments.GetSignatureForError () + ">";
+ if (Left == null)
+ return Name + append;
string connect = is_double_colon ? "::" : ".";
- if (Left != null)
- return Left.FullName + connect + FullName;
- else
- return FullName;
+ return Left.GetSignatureForError () + connect + Name + append;
}
public override bool Equals (object other)
@@ -251,8 +221,8 @@ namespace Mono.CSharp {
{
if (args == null)
return name;
- else
- return name + "`" + args.Count;
+
+ return name + "`" + args.Count;
}
public static string MakeName (string name, int count)
@@ -271,6 +241,7 @@ namespace Mono.CSharp {
///
protected string cached_name;
+ // TODO: Remove in favor of MemberName
public string Name {
get {
if (cached_name == null)
@@ -336,7 +307,8 @@ namespace Mono.CSharp {
IsUsed = 1 << 11,
IsAssigned = 1 << 12, // Field is assigned
HasExplicitLayout = 1 << 13,
- PartialDefinitionExists = 1 << 14 // Set when corresponding partial method definition exists
+ PartialDefinitionExists = 1 << 14, // Set when corresponding partial method definition exists
+ HasStructLayout = 1 << 15 // Has StructLayoutAttribute
}
///
@@ -357,7 +329,7 @@ namespace Mono.CSharp {
member_name = new_name;
cached_name = null;
}
-
+
protected bool CheckAbstractAndExtern (bool has_block)
{
if (Parent.PartialContainer.Kind == Kind.Interface)
@@ -377,19 +349,52 @@ namespace Mono.CSharp {
}
} 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 ());
+ if (RootContext.Version >= LanguageVersion.LINQ) {
+ Property.PropertyMethod pm = this as Property.PropertyMethod;
+ if (pm is Indexer.GetIndexerMethod || pm is Indexer.SetIndexerMethod)
+ pm = null;
+
+ if (pm != null && (pm.Property.Get.IsDummy || pm.Property.Set.IsDummy)) {
+ 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 ());
+ return false;
+ }
}
+
+ Report.Error (501, Location, "`{0}' must have a body because it is not marked abstract, extern, or partial",
+ GetSignatureForError ());
return false;
}
}
return true;
- }
+ }
+
+ public void CheckProtectedModifier ()
+ {
+ if ((ModFlags & Modifiers.PROTECTED) == 0)
+ return;
+
+ if (Parent.PartialContainer.Kind == Kind.Struct) {
+ Report.Error (666, Location, "`{0}': Structs cannot contain protected members",
+ GetSignatureForError ());
+ return;
+ }
+
+ if ((Parent.ModFlags & Modifiers.STATIC) != 0) {
+ Report.Error (1057, Location, "`{0}': Static classes cannot contain protected members",
+ GetSignatureForError ());
+ return;
+ }
+
+ if (((Parent.ModFlags & Modifiers.SEALED) != 0) &&
+ ((ModFlags & Modifiers.OVERRIDE) == 0) && (Name != "Finalize")) {
+ Report.Warning (628, 4, Location, "`{0}': new protected member declared in sealed class",
+ GetSignatureForError ());
+ return;
+ }
+ }
public abstract bool Define ();
@@ -408,9 +413,9 @@ namespace Mono.CSharp {
public virtual string GetSignatureForError ()
{
if (Parent == null || Parent.Parent == null)
- return member_name.ToString ();
+ return member_name.GetSignatureForError ();
- return String.Concat (Parent.GetSignatureForError (), '.', member_name.ToString ());
+ return Parent.GetSignatureForError () + "." + member_name.GetSignatureForError ();
}
///
@@ -421,7 +426,17 @@ namespace Mono.CSharp {
if (!RootContext.VerifyClsCompliance)
return;
- VerifyClsCompliance ();
+ if (Report.WarningLevel > 0)
+ VerifyClsCompliance ();
+ }
+
+ public bool IsCompilerGenerated {
+ get {
+ if ((mod_flags & Modifiers.COMPILER_GENERATED) != 0)
+ return true;
+
+ return Parent == null ? false : Parent.IsCompilerGenerated;
+ }
}
public virtual bool IsUsed {
@@ -438,26 +453,24 @@ namespace Mono.CSharp {
///
public virtual ObsoleteAttribute GetObsoleteAttribute ()
{
- // ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
- if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
+ if ((caching_flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0)
return null;
- }
caching_flags &= ~Flags.Obsolete_Undetected;
- if (OptAttributes == null)
+ if (OptAttributes == null || TypeManager.obsolete_attribute_type == null)
return null;
- Attribute obsolete_attr = OptAttributes.Search (
- TypeManager.obsolete_attribute_type);
+ Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type);
if (obsolete_attr == null)
return null;
+ caching_flags |= Flags.Obsolete;
+
ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute ();
if (obsolete == null)
return null;
- caching_flags |= Flags.Obsolete;
return obsolete;
}
@@ -466,15 +479,162 @@ namespace Mono.CSharp {
///
public virtual void CheckObsoleteness (Location loc)
{
- if (Parent != null)
- Parent.CheckObsoleteness (loc);
-
ObsoleteAttribute oa = GetObsoleteAttribute ();
- if (oa == null) {
- return;
+ if (oa != null)
+ AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+ }
+
+ // Access level of a type.
+ const int X = 1;
+ enum AccessLevel
+ { // Each column represents `is this scope larger or equal to Blah scope'
+ // Public Assembly Protected
+ Protected = (0 << 0) | (0 << 1) | (X << 2),
+ Public = (X << 0) | (X << 1) | (X << 2),
+ Private = (0 << 0) | (0 << 1) | (0 << 2),
+ Internal = (0 << 0) | (X << 1) | (0 << 2),
+ ProtectedOrInternal = (0 << 0) | (X << 1) | (X << 2),
+ }
+
+ static AccessLevel GetAccessLevelFromModifiers (int flags)
+ {
+ if ((flags & Modifiers.INTERNAL) != 0) {
+
+ if ((flags & Modifiers.PROTECTED) != 0)
+ return AccessLevel.ProtectedOrInternal;
+ else
+ return AccessLevel.Internal;
+
+ } else if ((flags & Modifiers.PROTECTED) != 0)
+ return AccessLevel.Protected;
+ else if ((flags & Modifiers.PRIVATE) != 0)
+ return AccessLevel.Private;
+ else
+ return AccessLevel.Public;
+ }
+
+ //
+ // Returns the access level for type `t'
+ //
+ static AccessLevel GetAccessLevelFromType (Type t)
+ {
+ if (t.IsPublic)
+ return AccessLevel.Public;
+ if (t.IsNestedPrivate)
+ return AccessLevel.Private;
+ if (t.IsNotPublic)
+ return AccessLevel.Internal;
+
+ if (t.IsNestedPublic)
+ return AccessLevel.Public;
+ if (t.IsNestedAssembly)
+ return AccessLevel.Internal;
+ if (t.IsNestedFamily)
+ return AccessLevel.Protected;
+ if (t.IsNestedFamORAssem)
+ return AccessLevel.ProtectedOrInternal;
+ if (t.IsNestedFamANDAssem)
+ throw new NotImplementedException ("NestedFamANDAssem not implemented, cant make this kind of type from c# anyways");
+
+ // nested private is taken care of
+
+ throw new Exception ("I give up, what are you?");
+ }
+
+ //
+ // Checks whether the type P is as accessible as this member
+ //
+ public bool IsAccessibleAs (Type p)
+ {
+ //
+ // if M is private, its accessibility is the same as this declspace.
+ // we already know that P is accessible to T before this method, so we
+ // may return true.
+ //
+ if ((mod_flags & Modifiers.PRIVATE) != 0)
+ return true;
+
+ while (TypeManager.HasElementType (p))
+ p = TypeManager.GetElementType (p);
+
+#if GMCS_SOURCE
+ if (p.IsGenericParameter)
+ return true;
+
+ if (TypeManager.IsGenericType (p)) {
+ foreach (Type t in p.GetGenericArguments ()) {
+ if (!IsAccessibleAs (t))
+ return false;
+ }
+ }
+#endif
+
+ for (Type p_parent = null; p != null; p = p_parent) {
+ p_parent = p.DeclaringType;
+ AccessLevel pAccess = GetAccessLevelFromType (p);
+ if (pAccess == AccessLevel.Public)
+ continue;
+
+ bool same_access_restrictions = false;
+ for (MemberCore mc = this; !same_access_restrictions && mc != null && mc.Parent != null; mc = mc.Parent) {
+ AccessLevel al = GetAccessLevelFromModifiers (mc.ModFlags);
+ switch (pAccess) {
+ case AccessLevel.Internal:
+ if (al == AccessLevel.Private || al == AccessLevel.Internal)
+ same_access_restrictions = TypeManager.IsThisOrFriendAssembly (p.Assembly);
+
+ break;
+
+ case AccessLevel.Protected:
+ if (al == AccessLevel.Protected) {
+ same_access_restrictions = mc.Parent.IsBaseType (p_parent);
+ break;
+ }
+
+ if (al == AccessLevel.Private) {
+ //
+ // When type is private and any of its parents derives from
+ // protected type then the type is accessible
+ //
+ while (mc.Parent != null) {
+ if (mc.Parent.IsBaseType (p_parent))
+ same_access_restrictions = true;
+ mc = mc.Parent;
+ }
+ }
+
+ break;
+
+ case AccessLevel.ProtectedOrInternal:
+ if (al == AccessLevel.Protected)
+ same_access_restrictions = mc.Parent.IsBaseType (p_parent);
+ else if (al == AccessLevel.Internal)
+ same_access_restrictions = TypeManager.IsThisOrFriendAssembly (p.Assembly);
+ else if (al == AccessLevel.ProtectedOrInternal)
+ same_access_restrictions = mc.Parent.IsBaseType (p_parent) &&
+ TypeManager.IsThisOrFriendAssembly (p.Assembly);
+
+ break;
+
+ case AccessLevel.Private:
+ //
+ // Both are private and share same parent
+ //
+ if (al == AccessLevel.Private)
+ same_access_restrictions = TypeManager.IsEqual (mc.Parent.TypeBuilder, p_parent);
+
+ break;
+
+ default:
+ throw new InternalErrorException (al.ToString ());
+ }
+ }
+
+ if (!same_access_restrictions)
+ return false;
}
- AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+ return true;
}
///
@@ -523,7 +683,7 @@ namespace Mono.CSharp {
caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
- if (OptAttributes != null) {
+ if (OptAttributes != null && TypeManager.cls_compliant_attribute_type != null) {
Attribute cls_attribute = OptAttributes.Search (
TypeManager.cls_compliant_attribute_type);
if (cls_attribute != null) {
@@ -586,7 +746,7 @@ namespace Mono.CSharp {
if (HasClsCompliantAttribute) {
if (CodeGen.Assembly.ClsCompliantAttribute == null && !CodeGen.Assembly.IsClsCompliant) {
- Report.Error (3014, Location,
+ Report.Warning (3014, 1, Location,
"`{0}' cannot be marked as CLS-compliant because the assembly is not marked as CLS-compliant",
GetSignatureForError ());
return false;
@@ -600,7 +760,7 @@ namespace Mono.CSharp {
}
if (member_name.Name [0] == '_') {
- Report.Error (3008, Location, "Identifier `{0}' is not CLS-compliant", GetSignatureForError () );
+ Report.Warning (3008, 1, Location, "Identifier `{0}' is not CLS-compliant", GetSignatureForError () );
}
return true;
}
@@ -631,7 +791,11 @@ namespace Mono.CSharp {
//
internal virtual void GenerateDocComment (DeclSpace ds)
{
- DocUtil.GenerateDocComment (this, ds);
+ try {
+ DocUtil.GenerateDocComment (this, ds);
+ } catch (Exception e) {
+ throw new InternalErrorException (this, e);
+ }
}
public override IResolveContext ResolveContext {
@@ -705,9 +869,10 @@ namespace Mono.CSharp {
public TypeContainer PartialContainer;
- readonly bool is_generic;
+ protected readonly bool is_generic;
readonly int count_type_params;
- readonly int count_current_type_params;
+ protected TypeParameter[] type_params;
+ TypeParameter[] type_param_list;
//
// Whether we are Generic
@@ -735,7 +900,7 @@ namespace Mono.CSharp {
PartialContainer = null;
if (name.TypeArguments != null) {
is_generic = true;
- count_type_params = count_current_type_params = name.TypeArguments.Count;
+ count_type_params = name.TypeArguments.Count;
}
if (parent != null)
count_type_params += parent.count_type_params;
@@ -772,7 +937,7 @@ namespace Mono.CSharp {
((DeclSpace)symbol).NamespaceEntry.GetSignatureForError (), symbol.MemberName.Name);
} else if (symbol is TypeParameter) {
Report.Error (692, symbol.Location,
- "Duplicate type parameter `{0}'", name);
+ "Duplicate type parameter `{0}'", symbol.GetSignatureForError ());
} else {
Report.Error (102, symbol.Location,
"The type `{0}' already contains a definition for `{1}'",
@@ -782,6 +947,11 @@ namespace Mono.CSharp {
return false;
}
+ protected void RemoveFromContainer (string name)
+ {
+ defined_names.Remove (name);
+ }
+
///
/// Returns the MemberCore associated with a given name in the declaration
/// space. It doesn't return method based symbols !!
@@ -805,6 +975,11 @@ namespace Mono.CSharp {
get { return (Parent != null && Parent.Parent == null); }
}
+ public virtual bool IsUnmanagedType ()
+ {
+ return false;
+ }
+
public virtual void CloseType ()
{
if ((caching_flags & Flags.CloseTypeCreated) == 0){
@@ -835,19 +1010,6 @@ namespace Mono.CSharp {
///
public abstract TypeBuilder DefineType ();
- ///
- /// Define all members, but don't apply any attributes or do anything which may
- /// access not-yet-defined classes. This method also creates the MemberCache.
- ///
- public virtual bool DefineMembers ()
- {
- if (((ModFlags & Modifiers.NEW) != 0) && IsTopLevel) {
- Report.Error (1530, Location, "Keyword `new' is not allowed on namespace elements");
- return false;
- }
- return true;
- }
-
protected void Error_MissingPartialModifier (MemberCore type)
{
Report.Error (260, type.Location,
@@ -855,32 +1017,49 @@ namespace Mono.CSharp {
type.GetSignatureForError ());
}
+ public override void Emit ()
+ {
+#if GMCS_SOURCE
+ if (type_params != null) {
+ int offset = count_type_params - type_params.Length;
+ for (int i = offset; i < type_params.Length; i++)
+ CurrentTypeParameters [i - offset].Emit ();
+ }
+
+ if ((ModFlags & Modifiers.COMPILER_GENERATED) != 0 && !Parent.IsCompilerGenerated)
+ TypeBuilder.SetCustomAttribute (TypeManager.GetCompilerGeneratedAttribute (Location));
+#endif
+
+ base.Emit ();
+ }
+
public override string GetSignatureForError ()
{
- if (IsGeneric) {
- return SimpleName.RemoveGenericArity (Name) + TypeParameter.GetSignatureForError (CurrentTypeParameters);
- }
- // Parent.GetSignatureForError
- return Name;
+ return MemberName.GetSignatureForError ();
}
public bool CheckAccessLevel (Type check_type)
{
- TypeBuilder tb;
- if (this is GenericMethod)
+ Type tb = TypeBuilder;
+#if GMCS_SOURCE
+ if (this is GenericMethod) {
tb = Parent.TypeBuilder;
- else
- tb = TypeBuilder;
+
+ // FIXME: Generic container does not work with nested generic
+ // anonymous method stories
+ if (TypeBuilder == null)
+ return true;
+ }
+#endif
check_type = TypeManager.DropGenericTypeArguments (check_type);
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;
+
+ // TODO: When called from LocalUsingAliasEntry tb is null
+ // because we are in RootDeclSpace
+ if (tb == null)
+ tb = typeof (RootDeclSpace);
//
// Broken Microsoft runtime, return public for arrays, no matter what
@@ -890,9 +1069,6 @@ namespace Mono.CSharp {
if (check_type.IsArray || check_type.IsPointer)
return CheckAccessLevel (TypeManager.GetElementType (check_type));
- if (TypeManager.IsGenericParameter(check_type))
- return true; // FIXME
-
TypeAttributes check_attr = check_type.Attributes & TypeAttributes.VisibilityMask;
switch (check_attr){
@@ -900,23 +1076,14 @@ namespace Mono.CSharp {
return true;
case TypeAttributes.NotPublic:
-
- 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 check_type.Assembly == TypeBuilder.Assembly ||
- TypeManager.IsFriendAssembly (check_type.Assembly);
+ return TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
case TypeAttributes.NestedPublic:
- return true;
+ return CheckAccessLevel (check_type.DeclaringType);
case TypeAttributes.NestedPrivate:
- return NestedAccessible (tb, check_type);
+ Type declaring = check_type.DeclaringType;
+ return tb == declaring || TypeManager.IsNestedChildOf (tb, declaring);
case TypeAttributes.NestedFamily:
//
@@ -925,145 +1092,40 @@ namespace Mono.CSharp {
return FamilyAccessible (tb, check_type);
case TypeAttributes.NestedFamANDAssem:
- return ((check_type.Assembly == tb.Assembly) ||
- TypeManager.IsFriendAssembly (check_type.Assembly)) &&
+ return TypeManager.IsThisOrFriendAssembly (check_type.Assembly) &&
FamilyAccessible (tb, check_type);
case TypeAttributes.NestedFamORAssem:
- return (check_type.Assembly == tb.Assembly) ||
- FamilyAccessible (tb, check_type) ||
- TypeManager.IsFriendAssembly (check_type.Assembly);
+ return FamilyAccessible (tb, check_type) ||
+ TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
case TypeAttributes.NestedAssembly:
- return check_type.Assembly == tb.Assembly ||
- TypeManager.IsFriendAssembly (check_type.Assembly);
+ return TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
}
- Console.WriteLine ("HERE: " + check_attr);
- return false;
-
+ throw new NotImplementedException (check_attr.ToString ());
}
- protected bool NestedAccessible (Type tb, Type check_type)
+ static bool FamilyAccessible (Type tb, Type check_type)
{
Type declaring = check_type.DeclaringType;
- return TypeBuilder == declaring ||
- TypeManager.IsNestedChildOf (TypeBuilder, declaring);
+ return TypeManager.IsNestedFamilyAccessible (tb, declaring);
}
- protected bool FamilyAccessible (Type tb, Type check_type)
+ public bool IsBaseType (Type baseType)
{
- Type declaring = check_type.DeclaringType;
- return TypeManager.IsNestedFamilyAccessible (TypeBuilder, declaring);
- }
+ if (TypeManager.IsInterfaceType (baseType))
+ throw new NotImplementedException ();
- // Access level of a type.
- const int X = 1;
- enum AccessLevel { // Each column represents `is this scope larger or equal to Blah scope'
- // Public Assembly Protected
- Protected = (0 << 0) | (0 << 1) | (X << 2),
- Public = (X << 0) | (X << 1) | (X << 2),
- Private = (0 << 0) | (0 << 1) | (0 << 2),
- Internal = (0 << 0) | (X << 1) | (0 << 2),
- ProtectedOrInternal = (0 << 0) | (X << 1) | (X << 2),
- }
-
- static AccessLevel GetAccessLevelFromModifiers (int flags)
- {
- if ((flags & Modifiers.INTERNAL) != 0) {
-
- if ((flags & Modifiers.PROTECTED) != 0)
- return AccessLevel.ProtectedOrInternal;
- else
- return AccessLevel.Internal;
-
- } else if ((flags & Modifiers.PROTECTED) != 0)
- return AccessLevel.Protected;
- else if ((flags & Modifiers.PRIVATE) != 0)
- return AccessLevel.Private;
- else
- return AccessLevel.Public;
- }
+ Type type = TypeBuilder;
+ while (type != null) {
+ if (TypeManager.IsEqual (type, baseType))
+ return true;
- // What is the effective access level of this?
- // TODO: Cache this?
- AccessLevel EffectiveAccessLevel {
- get {
- AccessLevel myAccess = GetAccessLevelFromModifiers (ModFlags);
- if (!IsTopLevel && (Parent != null))
- return myAccess & Parent.EffectiveAccessLevel;
- return myAccess;
+ type = type.BaseType;
}
- }
-
- // Return the access level for type `t'
- static AccessLevel TypeEffectiveAccessLevel (Type t)
- {
- if (t.IsPublic)
- return AccessLevel.Public;
- if (t.IsNestedPrivate)
- return AccessLevel.Private;
- if (t.IsNotPublic)
- return AccessLevel.Internal;
-
- // By now, it must be nested
- AccessLevel parent_level = TypeEffectiveAccessLevel (t.DeclaringType);
-
- if (t.IsNestedPublic)
- return parent_level;
- if (t.IsNestedAssembly)
- return parent_level & AccessLevel.Internal;
- if (t.IsNestedFamily)
- return parent_level & AccessLevel.Protected;
- if (t.IsNestedFamORAssem)
- return parent_level & AccessLevel.ProtectedOrInternal;
- if (t.IsNestedFamANDAssem)
- throw new NotImplementedException ("NestedFamANDAssem not implemented, cant make this kind of type from c# anyways");
-
- // nested private is taken care of
-
- throw new Exception ("I give up, what are you?");
- }
- //
- // This answers `is the type P, as accessible as a member M which has the
- // accessability @flags which is declared as a nested member of the type T, this declspace'
- //
- public bool AsAccessible (Type p, int flags)
- {
- //
- // 1) if M is private, its accessability is the same as this declspace.
- // we already know that P is accessible to T before this method, so we
- // may return true.
- //
-
- if ((flags & Modifiers.PRIVATE) != 0)
- return true;
-
- while (p.IsArray || p.IsPointer || p.IsByRef)
- p = TypeManager.GetElementType (p);
-
-#if GMCS_SOURCE
- if (p.IsGenericParameter)
- return true;
-
- if (TypeManager.IsGenericType (p)) {
- foreach (Type t in p.GetGenericArguments ()) {
- if (!AsAccessible (t, flags))
- return false;
- }
- }
-#endif
- AccessLevel pAccess = TypeEffectiveAccessLevel (p);
- AccessLevel mAccess = this.EffectiveAccessLevel &
- GetAccessLevelFromModifiers (flags);
-
- // for every place from which we can access M, we must
- // be able to access P as well. So, we want
- // For every bit in M and P, M_i -> P_1 == true
- // or, ~ (M -> P) == 0 <-> ~ ( ~M | P) == 0
-
- return ~ (~ mAccess | pAccess) == 0;
+ return false;
}
private Type LookupNestedTypeInHierarchy (string name)
@@ -1122,7 +1184,7 @@ namespace Mono.CSharp {
return null;
}
- public virtual ExtensionMethodGroupExpr LookupExtensionMethod (Type extensionType, string name)
+ public virtual ExtensionMethodGroupExpr LookupExtensionMethod (Type extensionType, string name, Location loc)
{
return null;
}
@@ -1140,6 +1202,7 @@ namespace Mono.CSharp {
return (FullNamedExpression) Cache [name];
FullNamedExpression e;
+ int errors = Report.Errors;
Type t = LookupNestedTypeInHierarchy (name);
if (t != null)
e = new TypeExpression (t, Location.Null);
@@ -1148,7 +1211,9 @@ namespace Mono.CSharp {
else
e = NamespaceEntry.LookupNamespaceOrType (this, name, loc, ignore_cs0104);
- Cache [name] = e;
+ if (errors == Report.Errors)
+ Cache [name] = e;
+
return e;
}
@@ -1182,45 +1247,6 @@ namespace Mono.CSharp {
TypeBuilder.SetCustomAttribute (cb);
}
- //
- // Extensions for generics
- //
- TypeParameter[] type_params;
- TypeParameter[] type_param_list;
-
- protected string GetInstantiationName ()
- {
- StringBuilder sb = new StringBuilder (Name);
- sb.Append ("<");
- for (int i = 0; i < type_param_list.Length; i++) {
- if (i > 0)
- sb.Append (",");
- sb.Append (type_param_list [i].Name);
- }
- sb.Append (">");
- return sb.ToString ();
- }
-
- bool check_type_parameter (ArrayList list, int start, string name)
- {
- for (int i = 0; i < start; i++) {
- TypeParameter param = (TypeParameter) list [i];
-
- if (param.Name != name)
- continue;
-
- Report.SymbolRelatedToPreviousError (Parent);
- // TODO: Location is wrong (parent instead of child)
- Report.Warning (693, 3, Location,
- "Type parameter `{0}' has the same name as the type parameter from outer type `{1}'",
- name, Parent.GetSignatureForError ());
-
- return false;
- }
-
- return true;
- }
-
TypeParameter[] initialize_type_params ()
{
if (type_param_list != null)
@@ -1230,20 +1256,28 @@ namespace Mono.CSharp {
if (this is GenericMethod)
the_parent = null;
- int start = 0;
ArrayList list = new ArrayList ();
if (the_parent != null && the_parent.IsGeneric) {
// FIXME: move generics info out of DeclSpace
TypeParameter[] parent_params = the_parent.PartialContainer.TypeParameters;
- start = parent_params.Length;
list.AddRange (parent_params);
}
int count = type_params != null ? type_params.Length : 0;
for (int i = 0; i < count; i++) {
TypeParameter param = type_params [i];
- check_type_parameter (list, start, param.Name);
list.Add (param);
+ if (Parent.IsGeneric) {
+ foreach (TypeParameter tp in Parent.PartialContainer.CurrentTypeParameters) {
+ if (tp.Name != param.Name)
+ continue;
+
+ Report.SymbolRelatedToPreviousError (tp.Location, null);
+ Report.Warning (693, 3, param.Location,
+ "Type parameter `{0}' has the same name as the type parameter from outer type `{1}'",
+ param.Name, Parent.GetSignatureForError ());
+ }
+ }
}
type_param_list = new TypeParameter [list.Count];
@@ -1323,12 +1357,12 @@ namespace Mono.CSharp {
get {
if (!IsGeneric)
throw new InvalidOperationException ();
- if ((PartialContainer != null) && (PartialContainer != this))
- return PartialContainer.CurrentTypeParameters;
- if (type_params != null)
- return type_params;
- else
+
+ // TODO: Something is seriously broken here
+ if (type_params == null)
return new TypeParameter [0];
+
+ return type_params;
}
}
@@ -1338,12 +1372,6 @@ namespace Mono.CSharp {
}
}
- public int CountCurrentTypeParameters {
- get {
- return count_current_type_params;
- }
- }
-
public TypeParameterExpr LookupGeneric (string name, Location loc)
{
if (!IsGeneric)
@@ -1411,11 +1439,8 @@ namespace Mono.CSharp {
else {
Report.SymbolRelatedToPreviousError ((DeclSpace)val);
}
-#if GMCS_SOURCE
+
Report.Warning (3005, 1, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
-#else
- Report.Error (3005, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
-#endif
return true;
}
}
@@ -1813,9 +1838,10 @@ namespace Mono.CSharp {
AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mi.Name, mi);
}
- public void AddGenericMember (MemberInfo mi, MemberCore mc)
+ public void AddGenericMember (MemberInfo mi, InterfaceMemberBase mc)
{
- AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mc.MemberName.Basename, mi);
+ AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container,
+ MemberName.MakeName (mc.GetFullName (mc.MemberName), mc.MemberName.TypeArguments), mi);
}
public void AddNestedType (DeclSpace type)
@@ -1836,7 +1862,7 @@ namespace Mono.CSharp {
// We use a name-based hash table of ArrayList's.
ArrayList list = (ArrayList) member_hash [name];
if (list == null) {
- list = new ArrayList ();
+ list = new ArrayList (1);
member_hash.Add (name, list);
}
@@ -1897,7 +1923,7 @@ namespace Mono.CSharp {
// We use a name-based hash table of ArrayList's.
ArrayList list = (ArrayList) method_hash [name];
if (list == null) {
- list = new ArrayList ();
+ list = new ArrayList (1);
method_hash.Add (name, list);
}
@@ -2285,7 +2311,7 @@ namespace Mono.CSharp {
MethodBase mb = (MethodBase)entry.Member;
IMethodData md = TypeManager.GetMethod (mb);
- ParameterData pd = md == null ?
+ AParametersCollection pd = md == null ?
TypeManager.GetParameterData (mb) : md.ParameterInfo;
Type ex_type = pd.ExtensionMethodType;
@@ -2313,7 +2339,7 @@ namespace Mono.CSharp {
// Because the MemberCache holds members from this class and all the base classes,
// we can avoid tons of reflection stuff.
//
- public MemberInfo FindMemberToOverride (Type invocation_type, string name, Type [] param_types, GenericMethod generic_method, bool is_property)
+ public MemberInfo FindMemberToOverride (Type invocation_type, string name, AParametersCollection parameters, GenericMethod generic_method, bool is_property)
{
ArrayList applicable;
if (method_hash != null && !is_property)
@@ -2335,22 +2361,19 @@ namespace Mono.CSharp {
PropertyInfo pi = null;
MethodInfo mi = null;
FieldInfo fi = null;
- Type [] cmp_attrs = null;
+ AParametersCollection cmp_attrs;
if (is_property) {
if ((entry.EntryType & EntryType.Field) != 0) {
fi = (FieldInfo)entry.Member;
-
- // TODO: For this case we ignore member type
- //fb = TypeManager.GetField (fi);
- //cmp_attrs = new Type[] { fb.MemberType };
+ cmp_attrs = Parameters.EmptyReadOnlyParameters;
} else {
pi = (PropertyInfo) entry.Member;
- cmp_attrs = TypeManager.GetArgumentTypes (pi);
+ cmp_attrs = TypeManager.GetParameterData (pi);
}
} else {
mi = (MethodInfo) entry.Member;
- cmp_attrs = TypeManager.GetParameterData (mi).Types;
+ cmp_attrs = TypeManager.GetParameterData (mi);
}
if (fi != null) {
@@ -2383,14 +2406,23 @@ namespace Mono.CSharp {
//
// Check the arguments
//
- if (cmp_attrs.Length != param_types.Length)
+ if (cmp_attrs.Count != parameters.Count)
continue;
int j;
- for (j = 0; j < cmp_attrs.Length; ++j)
- if (!TypeManager.IsEqual (param_types [j], cmp_attrs [j]))
+ for (j = 0; j < cmp_attrs.Count; ++j) {
+ //
+ // LAMESPEC: No idea why `params' modifier is ignored
+ //
+ if ((parameters.FixedParameters [j].ModFlags & ~Parameter.Modifier.PARAMS) !=
+ (cmp_attrs.FixedParameters [j].ModFlags & ~Parameter.Modifier.PARAMS))
break;
- if (j < cmp_attrs.Length)
+
+ if (!TypeManager.IsEqual (parameters.Types [j], cmp_attrs.Types [j]))
+ break;
+ }
+
+ if (j < cmp_attrs.Count)
continue;
//
@@ -2398,9 +2430,9 @@ namespace Mono.CSharp {
//
if (mi != null) {
Type [] cmpGenArgs = TypeManager.GetGenericArguments (mi);
- if (generic_method == null && cmpGenArgs.Length != 0)
+ if (generic_method == null && cmpGenArgs != null && cmpGenArgs.Length != 0)
continue;
- if (generic_method != null && cmpGenArgs.Length != generic_method.TypeParameters.Length)
+ if (generic_method != null && cmpGenArgs != null && cmpGenArgs.Length != generic_method.TypeParameters.Length)
continue;
}
@@ -2433,7 +2465,7 @@ namespace Mono.CSharp {
//
// Check for assembly methods
//
- if (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
+ if (!TypeManager.IsThisOrFriendAssembly (mi.DeclaringType.Assembly))
continue;
break;
}
@@ -2478,8 +2510,8 @@ namespace Mono.CSharp {
// Does exist easier way how to detect indexer ?
if ((entry.EntryType & EntryType.Property) != 0) {
- Type[] arg_types = TypeManager.GetArgumentTypes ((PropertyInfo)entry.Member);
- if (arg_types.Length > 0)
+ AParametersCollection arg_types = TypeManager.GetParameterData ((PropertyInfo)entry.Member);
+ if (arg_types.Count > 0)
continue;
}
}
@@ -2511,31 +2543,31 @@ namespace Mono.CSharp {
// TODO: Does anyone know easier way how to detect that member is internal ?
switch (member_entry.EntryType & EntryType.MaskType) {
- case EntryType.Constructor:
- continue;
-
- case EntryType.Field:
- if ((((FieldInfo)member_entry.Member).Attributes & (FieldAttributes.Assembly | FieldAttributes.Public)) == FieldAttributes.Assembly)
- continue;
- break;
-
- case EntryType.Method:
- if ((((MethodInfo)member_entry.Member).Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
- continue;
- break;
-
- case EntryType.Property:
- PropertyInfo pi = (PropertyInfo)member_entry.Member;
- if (pi.GetSetMethod () == null && pi.GetGetMethod () == null)
- continue;
- break;
-
- case EntryType.Event:
- EventInfo ei = (EventInfo)member_entry.Member;
- MethodInfo mi = ei.GetAddMethod ();
- if ((mi.Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
- continue;
- break;
+ case EntryType.Constructor:
+ continue;
+
+ case EntryType.Field:
+ if ((((FieldInfo)member_entry.Member).Attributes & (FieldAttributes.Assembly | FieldAttributes.Public)) == FieldAttributes.Assembly)
+ continue;
+ break;
+
+ case EntryType.Method:
+ if ((((MethodInfo)member_entry.Member).Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
+ continue;
+ break;
+
+ case EntryType.Property:
+ PropertyInfo pi = (PropertyInfo)member_entry.Member;
+ if (pi.GetSetMethod () == null && pi.GetGetMethod () == null)
+ continue;
+ break;
+
+ case EntryType.Event:
+ EventInfo ei = (EventInfo)member_entry.Member;
+ MethodInfo mi = ei.GetAddMethod ();
+ if ((mi.Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
+ continue;
+ break;
}
string lcase = ((string)entry.Key).ToLower (System.Globalization.CultureInfo.InvariantCulture);
locase_table [lcase] = member_entry.Member;
@@ -2572,7 +2604,7 @@ namespace Mono.CSharp {
MethodBase method_to_compare = (MethodBase)entry.Member;
AttributeTester.Result result = AttributeTester.AreOverloadedMethodParamsClsCompliant (
- method.ParameterTypes, TypeManager.GetParameterData (method_to_compare).Types);
+ method.Parameters, TypeManager.GetParameterData (method_to_compare));
if (result == AttributeTester.Result.Ok)
continue;
@@ -2586,12 +2618,16 @@ namespace Mono.CSharp {
Report.SymbolRelatedToPreviousError (entry.Member);
switch (result) {
- case AttributeTester.Result.RefOutArrayError:
- Report.Error (3006, method.Location, "Overloaded method `{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
- continue;
- case AttributeTester.Result.ArrayArrayError:
- Report.Error (3007, method.Location, "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant", method.GetSignatureForError ());
- continue;
+ case AttributeTester.Result.RefOutArrayError:
+ Report.Warning (3006, 1, method.Location,
+ "Overloaded method `{0}' differing only in ref or out, or in array rank, is not CLS-compliant",
+ method.GetSignatureForError ());
+ continue;
+ case AttributeTester.Result.ArrayArrayError:
+ Report.Warning (3007, 1, method.Location,
+ "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant",
+ method.GetSignatureForError ());
+ continue;
}
throw new NotImplementedException (result.ToString ());
@@ -2612,11 +2648,19 @@ namespace Mono.CSharp {
return true;
Type [] p_types;
- ParameterData pd = null;
+ AParametersCollection pd;
if ((ce.EntryType & EntryType.Property) != 0) {
- p_types = TypeManager.GetArgumentTypes ((PropertyInfo) ce.Member);
+ pd = TypeManager.GetParameterData ((PropertyInfo) ce.Member);
+ p_types = pd.Types;
} else {
- pd = TypeManager.GetParameterData ((MethodBase)ce.Member);
+ 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;
}
@@ -2627,8 +2671,9 @@ namespace Mono.CSharp {
int ii = method_param_count - 1;
Type type_a, type_b;
do {
- type_a = parameters.ParameterType (ii);
+ type_a = parameters.Types [ii];
type_b = p_types [ii];
+
#if GMCS_SOURCE
if (type_a.IsGenericParameter && type_a.DeclaringMethod != null)
type_a = null;
@@ -2636,6 +2681,10 @@ namespace Mono.CSharp {
if (type_b.IsGenericParameter && type_b.DeclaringMethod != null)
type_b = null;
#endif
+ if ((pd.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF) !=
+ (parameters.FixedParameters [ii].ModFlags & Parameter.Modifier.ISBYREF))
+ type_a = null;
+
} while (type_a == type_b && ii-- != 0);
if (ii >= 0)
@@ -2653,9 +2702,9 @@ namespace Mono.CSharp {
//
// Report difference in parameter modifiers only
//
- if (pd != null && !(member is AbstractPropertyEventMethod)) {
+ if (pd != null && member is MethodCore) {
ii = method_param_count;
- while (ii-- != 0 && parameters.ParameterModifier (ii) == pd.ParameterModifier (ii) &&
+ while (ii-- != 0 && parameters.FixedParameters [ii].ModFlags == pd.FixedParameters [ii].ModFlags &&
parameters.ExtensionMethodType == pd.ExtensionMethodType);
if (ii >= 0) {