// class.cs: Class and Struct handlers
//
// Authors: Miguel de Icaza (miguel@gnu.org)
-// Martin Baulig (martin@gnome.org)
+// Martin Baulig (martin@ximian.com)
// Marek Safar (marek.safar@seznam.cz)
//
// Licensed under the terms of the GNU GPL
//
// (C) 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com)
+// (C) 2004 Novell, Inc
//
//
// 2002-10-11 Miguel de Icaza <miguel@ximian.com>
using System;
using System.Text;
using System.Collections;
+using System.Collections.Specialized;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Security;
+using System.Security.Permissions;
+using System.Xml;
using Mono.CompilerServices.SymbolWriter;
seen_normal_indexers = true;
if (class_indexer_name == null) {
- class_indexer_name = i.IndexerName;
+ class_indexer_name = i.ShortName;
continue;
}
- if (i.IndexerName != class_indexer_name)
+ if (i.ShortName != class_indexer_name)
Report.Error (668, i.Location, "Two indexers have different names; the IndexerName attribute must be used with the same name on every indexer within a type");
}
{
flags = f;
- ret_type = o.OperatorMethod.GetReturnType ();
+ ret_type = o.OperatorMethod.ReturnType;
Type [] pt = o.OperatorMethod.ParameterTypes;
type1 = pt [0];
type2 = pt [1];
"The operator `" + oe.op + "' requires a matching operator `" + s + "' to also be defined");
}
- if (has_equality_or_inequality && container.Methods == null && (RootContext.WarningLevel > 2)) {
- if (!container.Methods.HasEquals)
+ if (has_equality_or_inequality && (RootContext.WarningLevel > 2)) {
+ if (container.Methods == null || !container.Methods.HasEquals)
Report.Warning (660, container.Location, "'{0}' defines operator == or operator != but does not override Object.Equals(object o)", container.GetSignatureForError ());
- if (!container.Methods.HasGetHashCode)
+ if (container.Methods == null || !container.Methods.HasGetHashCode)
Report.Warning (661, container.Location, "'{0}' defines operator == or operator != but does not override Object.GetHashCode()", container.GetSignatureForError ());
}
}
MemberCoreArrayList delegates;
// Holds the list of constructors
- MemberCoreArrayList instance_constructors;
+ protected MemberCoreArrayList instance_constructors;
// Holds the list of fields
MemberCoreArrayList fields;
// Holds a list of fields that have initializers
- ArrayList initialized_fields;
+ protected ArrayList initialized_fields;
// Holds a list of static fields that have initializers
- ArrayList initialized_static_fields;
+ protected ArrayList initialized_static_fields;
// Holds the list of constants
MemberCoreArrayList constants;
MethodArrayList methods;
// Holds the events
- MemberCoreArrayList events;
+ protected MemberCoreArrayList events;
// Holds the indexers
IndexerArrayList indexers;
// Holds the parts of a partial class;
ArrayList parts;
- // The emit context for toplevel objects.
- EmitContext ec;
-
//
// Pointers to the default constructor and the default static constructor
//
- Constructor default_constructor;
- Constructor default_static_constructor;
-
- //
- // Whether we have seen a static constructor for this class or not
- //
- public bool UserDefinedStaticConstructor = false;
+ protected Constructor default_constructor;
+ protected Constructor default_static_constructor;
//
// Whether we have at least one non-static field
// This one is computed after we can distinguish interfaces
// from classes from the arraylist `type_bases'
//
- string base_class_name;
- TypeExpr parent_type;
+ string base_class_name;
+ TypeExpr parent_type;
ArrayList type_bases;
bool members_defined_ok;
// The interfaces we implement.
- Type[] ifaces;
+ protected Type[] ifaces;
+ protected Type ptype;
- // The parent member container and our member cache
- IMemberContainer parent_container;
+ // The parent member cache and our member cache
+ MemberCache parent_cache;
MemberCache member_cache;
public const string DefaultIndexerName = "Item";
Type GenericType;
- public TypeContainer (NamespaceEntry ns, TypeContainer parent,
- MemberName name, Attributes attrs, Kind kind, Location l)
+ public TypeContainer (NamespaceEntry ns, TypeContainer parent, MemberName name,
+ Attributes attrs, Kind kind, Location l)
: base (ns, parent, name, attrs, l)
{
this.Kind = kind;
base_class_name = null;
}
- // <summary>
- // Used to report back to the user the result of a declaration
- // in the current declaration space
- // </summary>
- public void CheckDef (AdditionResult result, string name, Location loc)
+ public bool AddToMemberContainer (MemberCore symbol, bool is_method)
{
- if (result == AdditionResult.Success)
- return;
-
- switch (result){
- case AdditionResult.NameExists:
- Report.Error (102, loc, "The container `{0}' already " +
- "contains a definition for `{1}'",
- Name, name);
- break;
-
- //
- // This is handled only for static Constructors, because
- // in reality we handle these by the semantic analysis later
- //
- case AdditionResult.MethodExists:
- Report.Error (111, loc, "Class `{0}' already defines a " +
- "member called '{1}' with the same parameter " +
- "types (more than one default constructor)",
- Name, name);
- break;
-
- case AdditionResult.EnclosingClash:
- Report.Error (542, loc, "Member names cannot be the same " +
- "as their enclosing type");
- break;
-
- case AdditionResult.NotAConstructor:
- Report.Error (1520, loc, "Class, struct, or interface method " +
- "must have a return type");
- break;
+ return AddToContainer (symbol, is_method, String.Concat (Name, '.', symbol.Name), symbol.Name);
+ }
- case AdditionResult.Error:
- // Error has already been reported.
- break;
- }
+ bool AddToTypeContainer (DeclSpace ds)
+ {
+ return AddToContainer (ds, false, ds.Name, ds.Basename);
}
- public AdditionResult AddConstant (Const constant)
+ public void AddConstant (Const constant)
{
- AdditionResult res;
- string basename = constant.Name;
- string fullname = Name + "." + basename;
+ if (!AddToMemberContainer (constant, false))
+ return;
- if ((res = IsValid (basename, fullname)) != AdditionResult.Success)
- return res;
-
if (constants == null)
constants = new MemberCoreArrayList ();
constants.Add (constant);
- DefineName (fullname, constant);
-
- return AdditionResult.Success;
}
- public AdditionResult AddEnum (Mono.CSharp.Enum e)
+ public void AddEnum (Mono.CSharp.Enum e)
{
- AdditionResult res;
-
- if ((res = IsValid (e.Basename, e.Name)) != AdditionResult.Success)
- return res;
+ if (!AddToTypeContainer (e))
+ return;
if (enums == null)
enums = new MemberCoreArrayList ();
enums.Add (e);
- DefineName (e.Name, e);
-
- return AdditionResult.Success;
}
- public AdditionResult AddClass (TypeContainer c)
+ public void AddClassOrStruct (TypeContainer c)
{
- AdditionResult res;
- string name = c.Basename;
-
- if ((res = IsValid (name, c.Name)) != AdditionResult.Success)
- return res;
+ if (!AddToTypeContainer (c))
+ return;
- DefineName (c.Name, c);
types.Add (c);
-
- return AdditionResult.Success;
- }
-
- public AdditionResult AddStruct (TypeContainer s)
- {
- AdditionResult res;
- string name = s.Basename;
-
- if ((res = IsValid (name, s.Name)) != AdditionResult.Success)
- return res;
-
- DefineName (s.Name, s);
- types.Add (s);
-
- return AdditionResult.Success;
}
- public AdditionResult AddDelegate (Delegate d)
+ public void AddDelegate (Delegate d)
{
- AdditionResult res;
- string name = d.Basename;
-
- if ((res = IsValid (name, d.Name)) != AdditionResult.Success)
- return res;
+ if (!AddToTypeContainer (d))
+ return;
if (delegates == null)
delegates = new MemberCoreArrayList ();
- DefineName (d.Name, d);
delegates.Add (d);
-
- return AdditionResult.Success;
}
- public AdditionResult AddMethod (Method method)
+ public void AddMethod (Method method)
{
- string basename = method.Name;
- string fullname = Name + "." + basename;
-
- Object value = defined_names [fullname];
-
- if (value != null && (!(value is Method)))
- return AdditionResult.NameExists;
-
- if (basename == Basename)
- return AdditionResult.EnclosingClash;
+ if (!AddToMemberContainer (method, true))
+ return;
if (methods == null)
methods = new MethodArrayList (this);
methods.Insert (0, method);
else
methods.Add (method);
-
- if (value == null)
- DefineName (fullname, method);
-
- return AdditionResult.Success;
}
- public AdditionResult AddConstructor (Constructor c)
+ public void AddConstructor (Constructor c)
{
- if (c.Name != Basename)
- return AdditionResult.NotAConstructor;
+ if (c.Name != Basename) {
+ Report.Error (1520, c.Location, "Class, struct, or interface method must have a return type");
+ }
bool is_static = (c.ModFlags & Modifiers.STATIC) != 0;
if (is_static){
- UserDefinedStaticConstructor = true;
- if (default_static_constructor != null)
- return AdditionResult.MethodExists;
+ if (default_static_constructor != null) {
+ Report.SymbolRelatedToPreviousError (default_static_constructor);
+ Report.Error (111, c.Location, "Type '{0}' already defines a member " +
+ "called '{1}' with the same parameter types", Name, c.Name);
+ return;
+ }
default_static_constructor = c;
} else {
if (c.IsDefault ()){
- if (default_constructor != null)
- return AdditionResult.MethodExists;
+ if (default_constructor != null) {
+ Report.SymbolRelatedToPreviousError (default_constructor);
+ Report.Error (111, c.Location, "Type '{0}' already defines a member " +
+ "called '{1}' with the same parameter types", Name, c.Name);
+ return;
+ }
default_constructor = c;
}
instance_constructors.Add (c);
}
-
- return AdditionResult.Success;
}
- public AdditionResult AddInterface (TypeContainer iface)
+ public void AddInterface (TypeContainer iface)
{
- AdditionResult res;
- string name = iface.Basename;
-
- if ((res = IsValid (name, iface.Name)) != AdditionResult.Success)
- return res;
-
- if (interfaces == null)
+ if (!AddToTypeContainer (iface))
+ return;
+
+ if (interfaces == null) {
interfaces = new MemberCoreArrayList ();
+ }
+
interfaces.Add (iface);
- DefineName (iface.Name, iface);
-
- return AdditionResult.Success;
}
- public AdditionResult AddField (Field field)
+ public void AddField (Field field)
{
- AdditionResult res;
- string basename = field.Name;
- string fullname = Name + "." + basename;
+ if (!AddToMemberContainer (field, false))
+ return;
- if ((res = IsValid (basename, fullname)) != AdditionResult.Success)
- return res;
-
if (fields == null)
fields = new MemberCoreArrayList ();
if ((field.ModFlags & Modifiers.STATIC) == 0)
have_nonstatic_fields = true;
-
- DefineName (fullname, field);
- return AdditionResult.Success;
}
- public AdditionResult AddProperty (Property prop)
+ public void AddProperty (Property prop)
{
- AdditionResult res;
-
- if ((res = AddProperty (prop, prop.Name)) != AdditionResult.Success)
- return res;
-
- if (prop.Get != null) {
- if ((res = AddProperty (prop, "get_" + prop.Name)) != AdditionResult.Success)
- return res;
- }
-
- if (prop.Set != null) {
- if ((res = AddProperty (prop, "set_" + prop.Name)) != AdditionResult.Success)
- return res;
- }
+ if (!AddToMemberContainer (prop, false) ||
+ !AddToMemberContainer (prop.Get, true) || !AddToMemberContainer (prop.Set, true))
+ return;
if (properties == null)
properties = new MemberCoreArrayList ();
properties.Insert (0, prop);
else
properties.Add (prop);
-
- return AdditionResult.Success;
}
- AdditionResult AddProperty (Property prop, string basename)
+ public void AddEvent (Event e)
{
- AdditionResult res;
- string fullname = Name + "." + basename;
-
- if ((res = IsValid (basename, fullname)) != AdditionResult.Success)
- return res;
-
- DefineName (fullname, prop);
-
- return AdditionResult.Success;
- }
+ if (!AddToMemberContainer (e, false))
+ return;
- public AdditionResult AddEvent (Event e)
- {
- AdditionResult res;
- string basename = e.Name;
- string fullname = Name + "." + basename;
+ if (e is EventProperty) {
+ if (!AddToMemberContainer (e.Add, true))
+ return;
- if ((res = IsValid (basename, fullname)) != AdditionResult.Success)
- return res;
+ if (!AddToMemberContainer (e.Remove, true))
+ return;
+ }
if (events == null)
events = new MemberCoreArrayList ();
-
- events.Add (e);
- DefineName (fullname, e);
- return AdditionResult.Success;
+ events.Add (e);
}
+ /// <summary>
+ /// Indexer has special handling in constrast to other AddXXX because the name can be driven by IndexerNameAttribute
+ /// </summary>
public void AddIndexer (Indexer i)
{
if (indexers == null)
indexers = new IndexerArrayList (this);
- if (i.MemberName.Left != null)
+ if (i.IsExplicitImpl)
indexers.Insert (0, i);
else
indexers.Add (i);
}
- public AdditionResult AddOperator (Operator op)
+ public void AddOperator (Operator op)
{
+ if (!AddToMemberContainer (op, true))
+ return;
+
if (operators == null)
operators = new OperatorArrayList (this);
operators.Add (op);
-
- string basename = op.Name;
- string fullname = Name + "." + basename;
- if (!defined_names.Contains (fullname))
- {
- DefineName (fullname, op);
- }
- return AdditionResult.Success;
}
public void AddIterator (Iterator i)
//
// Defines the default constructors
//
- void DefineDefaultConstructor (bool is_static)
+ protected void DefineDefaultConstructor (bool is_static)
{
Constructor c;
}
- public void ReportStructInitializedInstanceError ()
- {
- string n = TypeBuilder.FullName;
-
- foreach (Field f in initialized_fields){
- Report.Error (
- 573, Location,
- "`" + n + "." + f.Name + "': can not have " +
- "instance field initializers in structs");
- }
- }
-
/// <remarks>
/// The pending methods that need to be implemented
// (interfaces or abstract methods)
int start, i, j;
if (Kind == Kind.Class){
- TypeExpr name = ResolveTypeExpr (
- (Expression) Bases [0], false, Location);
+ TypeExpr name = ResolveTypeExpr ((Expression) Bases [0], Location);
if (name == null){
error = true;
for (i = start, j = 0; i < count; i++, j++){
Expression name = (Expression) Bases [i];
- TypeExpr resolved = ResolveTypeExpr (name, false, Location);
+ TypeExpr resolved = ResolveTypeExpr (name, Location);
if (resolved == null) {
error = true;
return null;
/// </summary>
TypeExpr [] GetClassBases (out TypeExpr parent, out bool error)
{
- ArrayList bases = Bases;
- int start, j, i;
+ int i;
error = false;
}
if (parent.IsSealed){
- string detail = "";
-
- if (parent.IsValueType)
- detail = " (a class can not inherit from a struct/enum)";
-
- Report.Error (509, "class `"+ Name +
- "': Cannot inherit from sealed class `"+
- parent.Name + "'" + detail);
error = true;
+ Report.SymbolRelatedToPreviousError (parent.Type);
+ if (parent.Type.IsAbstract) {
+ Report.Error (709, Location, "'{0}': Cannot derive from static class", GetSignatureForError ());
+ } else {
+ Report.Error (509, Location, "'{0}': Cannot derive from sealed class", GetSignatureForError ());
+ }
return null;
}
return null;
}
- if (!parent.AsAccessible (this, ModFlags))
- Report.Error (60, Location,
- "Inconsistent accessibility: base class `" +
- parent.Name + "' is less accessible than class `" +
- Name + "'");
+ if (!parent.AsAccessible (this, ModFlags)) {
+ Report.SymbolRelatedToPreviousError (parent.Type);
+ Report.Error (60, Location, "Inconsistent accessibility: base class '{0}' is less accessible than class '{1}'",
+ TypeManager.CSharpName (parent.Type), GetSignatureForError ());
+ }
}
if (parent != null)
}
if (iface.IsClass) {
- if (parent != null){
- Report.Error (527, Location,
+ if (parent != null)
+ Report.Error (1721, Location,
+ "In Class `{0}', `{1}' is not an interface, and a base class has already been defined",
+ Name, iface.Name);
+ else {
+ Report.Error (1722, Location,
"In Class `{0}', `{1}' is not " +
- "an interface", Name, iface.Name);
- error = true;
- return null;
+ "an interface, a base class must be listed first", Name, iface.Name);
}
+ error = true;
+ return null;
}
for (int x = 0; x < i; x++) {
if (iface == t)
continue;
- if (!TypeManager.MayBecomeEqualGenericInstances (iface, t))
+ Type[] infered = new Type [CountTypeParameters];
+ if (!TypeManager.MayBecomeEqualGenericInstances (iface, t, infered, null))
continue;
Report.Error (
{
TypeExpr parent;
- if (TypeBuilder != null)
- return TypeBuilder;
-
if (error)
return null;
-
- if (InTransit) {
- Report.Error (146, Location, "Class definition is circular: `{0}'", Name);
- error = true;
- return null;
- }
-
- InTransit = true;
+
+ if (TypeBuilder != null)
+ return TypeBuilder;
ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
TypeAttributes type_attributes = TypeAttr;
- if (IsTopLevel){
- if (TypeManager.NamespaceClash (Name, Location)) {
- error = true;
- return null;
- }
-
- ModuleBuilder builder = CodeGen.Module.Builder;
- TypeBuilder = builder.DefineType (
- Name, type_attributes, null, null);
- } else {
- TypeBuilder builder = Parent.DefineType ();
- if (builder == null) {
- error = true;
- return null;
- }
-
- TypeBuilder = builder.DefineNestedType (
- MemberName.Basename, type_attributes, null, null);
- }
+ try {
+ if (IsTopLevel){
+ if (TypeManager.NamespaceClash (Name, Location)) {
+ error = true;
+ return null;
+ }
- TypeManager.AddUserType (Name, TypeBuilder, this);
+ ModuleBuilder builder = CodeGen.Module.Builder;
+ TypeBuilder = builder.DefineType (
+ Name, type_attributes, null, null);
+ } else {
+ TypeBuilder builder;
+ if (Parent.TypeBuilder != null)
+ builder = Parent.TypeBuilder;
+ else
+ builder = Parent.DefineType ();
- if (IsGeneric) {
- foreach (TypeParameter type_param in TypeParameters) {
- if (!type_param.Resolve (this)) {
+ if (builder == null) {
error = true;
return null;
}
+
+ TypeBuilder = builder.DefineNestedType (
+ MemberName.Basename, type_attributes,
+ null, null);
}
+ }
+ catch (ArgumentException) {
+ Report.RuntimeMissingSupport (Location, "static classes");
+ return null;
+ }
- CurrentType = new ConstructedType (
- Name, TypeParameters, Location);
+ TypeManager.AddUserType (Name, TypeBuilder, this);
+
+ TypeExpr current_type = null;
+ if (IsGeneric) {
string[] param_names = new string [TypeParameters.Length];
for (int i = 0; i < TypeParameters.Length; i++)
param_names [i] = TypeParameters [i].Name;
GenericTypeParameterBuilder[] gen_params;
-
gen_params = TypeBuilder.DefineGenericParameters (param_names);
- for (int i = 0; i < gen_params.Length; i++)
- TypeParameters [i].Define (gen_params [i]);
+ int offset = CountTypeParameters - CurrentTypeParameters.Length;
+ for (int i = offset; i < gen_params.Length; i++)
+ CurrentTypeParameters [i - offset].Define (gen_params [i]);
+
+ foreach (TypeParameter type_param in CurrentTypeParameters) {
+ if (!type_param.Resolve (this)) {
+ error = true;
+ return null;
+ }
+ }
+
+ for (int i = offset; i < gen_params.Length; i++)
+ CurrentTypeParameters [i - offset].DefineConstraints ();
+
+ current_type = new ConstructedType (Name, TypeParameters, Location);
}
if (IsGeneric) {
}
}
- Type ptype;
- ConstructedType constructed = parent_type as ConstructedType;
- if ((constructed == null) && (parent_type != null))
- ptype = parent_type.ResolveType (ec);
- else
- ptype = null;
-
- if (constructed != null) {
- ptype = constructed.ResolveType (ec);
- if (ptype == null) {
+ if (parent_type != null) {
+ parent_type = parent_type.ResolveAsTypeTerminal (ec);
+ if (parent_type == null) {
error = true;
return null;
}
+
+ ptype = parent_type.Type;
+ }
+
+ if (!CheckRecursiveDefinition ()) {
+ error = true;
+ return null;
}
if (ptype != null)
}
}
+ if (current_type != null) {
+ current_type = current_type.ResolveAsTypeTerminal (ec);
+ if (current_type == null) {
+ error = true;
+ return null;
+ }
+
+ CurrentType = current_type.Type;
+ }
+
//
// Finish the setup for the EmitContext
//
return null;
}
- InTransit = false;
return TypeBuilder;
- }
+ }
protected virtual bool DefineNestedTypes ()
{
foreach (ClassPart part in Parts) {
part.TypeBuilder = TypeBuilder;
part.parent_type = parent_type;
+ part.ec = new EmitContext (part, Mono.CSharp.Location.Null, null, null, ModFlags);
}
}
return true;
}
+ protected bool CheckRecursiveDefinition ()
+ {
+ if (InTransit) {
+ Report.Error (146, Location,
+ "Class definition is circular: `{0}'",
+ GetSignatureForError ());
+ error = true;
+ return false;
+ }
+
+ InTransit = true;
+
+ Type parent = ptype;
+ if (parent != null) {
+ if (parent.IsGenericInstance)
+ parent = parent.GetGenericTypeDefinition ();
+
+ TypeContainer ptc = TypeManager.LookupTypeContainer (parent);
+ if ((ptc != null) && !ptc.CheckRecursiveDefinition ())
+ return false;
+ }
+
+ InTransit = false;
+ return true;
+ }
+
static void Error_KeywordNotAllowed (Location loc)
{
Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
return members_defined_ok;
}
- bool DoDefineMembers ()
+ protected virtual bool DoDefineMembers ()
{
//
// We need to be able to use the member cache while we are checking/defining
//
if (TypeBuilder.BaseType != null)
- parent_container = TypeManager.LookupMemberContainer (TypeBuilder.BaseType);
+ parent_cache = TypeManager.LookupMemberCache (TypeBuilder.BaseType);
- // TODO:
- //if (TypeBuilder.IsInterface) {
- // parent_container = TypeManager.LookupInterfaceContainer (base_inteface_types);
- //}
+ if (TypeBuilder.IsInterface)
+ parent_cache = TypeManager.LookupParentInterfacesCache (TypeBuilder);
if (IsTopLevel) {
if ((ModFlags & Modifiers.NEW) != 0)
}
}
- if (constants != null)
- constants.DefineContainerMembers ();
-
- if (fields != null)
- fields.DefineContainerMembers ();
+ DefineContainerMembers (constants);
+ DefineContainerMembers (fields);
- if ((Kind == Kind.Class) && !(this is ClassPart)){
- if (instance_constructors == null){
+ if ((Kind == Kind.Class) && !(this is ClassPart) && !(this is StaticClass)){
+ if ((instance_constructors == null) &&
+ !(this is StaticClass)) {
if (default_constructor == null)
DefineDefaultConstructor (false);
}
//
// Constructors are not in the defined_names array
//
- if (instance_constructors != null)
- instance_constructors.DefineContainerMembers ();
-
+ DefineContainerMembers (instance_constructors);
+
if (default_static_constructor != null)
default_static_constructor.Define ();
- if (methods != null)
- methods.DefineContainerMembers ();
-
- if (properties != null)
- properties.DefineContainerMembers ();
-
- if (events != null)
- events.DefineContainerMembers ();
-
- if (indexers != null)
- indexers.DefineContainerMembers ();
-
- if (operators != null)
- operators.DefineContainerMembers ();
-
- if (enums != null)
- enums.DefineContainerMembers ();
-
- if (delegates != null)
- delegates.DefineContainerMembers ();
+ DefineContainerMembers (properties);
+ DefineContainerMembers (events);
+ DefineContainerMembers (indexers);
+ DefineContainerMembers (methods);
+ DefineContainerMembers (operators);
+ DefineContainerMembers (enums);
+ DefineContainerMembers (delegates);
if (CurrentType != null) {
- GenericType = CurrentType.ResolveType (ec);
+ GenericType = CurrentType;
ec.ContainerType = GenericType;
}
#if CACHE
if (!(this is ClassPart))
- member_cache = new MemberCache (this);
+ member_cache = new MemberCache (this);
#endif
if (parts != null) {
return true;
}
+ void ReportStructInitializedInstanceError ()
+ {
+ string n = TypeBuilder.FullName;
+
+ foreach (Field f in initialized_fields){
+ Report.Error (
+ 573, Location,
+ "`" + n + "." + f.Name + "': can not have " +
+ "instance field initializers in structs");
+ }
+ }
+
+ protected virtual void DefineContainerMembers (MemberCoreArrayList mcal)
+ {
+ if (mcal != null)
+ mcal.DefineContainerMembers ();
+ }
+
public override bool Define ()
{
if (parts != null) {
public MemberInfo FindMemberWithSameName (string name, bool ignore_methods)
{
- return ParentContainer.MemberCache.FindMemberWithSameName (name, ignore_methods, null);
+ return ParentCache.FindMemberWithSameName (name, ignore_methods, null);
}
/// <summary>
return retMethods;
}
+ // Indicated whether container has StructLayout attribute set Explicit
+ public virtual bool HasExplicitLayout {
+ get {
+ return false;
+ }
+ }
+
/// <summary>
/// This method returns the members of this type just like Type.FindMembers would
/// Only, we need to use this for types which are _being_ defined because MS'
Report.Warning (649, f.Location, "Field '{0}' is never assigned to, and will always have its default value '{1}'", f.GetSignatureForError (), "");
}
}
-
- if ((events != null) && (RootContext.WarningLevel >= 3)) {
- foreach (Event e in events){
- if (e.status == 0)
- Report.Warning (67, e.Location, "The event '{0}' is never used", e.GetSignatureForError ());
- }
- }
}
}
}
}
+ EmitConstants ();
+
if (default_static_constructor != null)
default_static_constructor.Emit ();
type_bases = null;
OptAttributes = null;
ifaces = null;
- parent_container = null;
+ parent_cache = null;
member_cache = null;
}
return ok;
}
- Hashtable builder_and_args;
-
- public bool RegisterMethod (MethodBuilder mb, InternalParameters ip, Type [] args)
- {
- if (builder_and_args == null)
- builder_and_args = new Hashtable ();
- return true;
+ public bool UserDefinedStaticConstructor {
+ get {
+ return default_static_constructor != null;
+ }
+ }
+
+ public Constructor DefaultStaticConstructor {
+ get { return default_static_constructor; }
}
protected override bool VerifyClsCompliance (DeclSpace ds)
VerifyClsName ();
- // parent_container is null for System.Object
- if (parent_container != null && !AttributeTester.IsClsCompliant (parent_container.Type)) {
- Report.Error (3009, Location, "'{0}': base type '{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (parent_container.Type));
+ if (IsGeneric) {
+ Report.Error (3024, Location, "'{0}': type parameters are not CLS-compliant",
+ GetSignatureForError ());
+ return false;
+ }
+
+ Type base_type = TypeBuilder.BaseType;
+ if (base_type != null && !AttributeTester.IsClsCompliant (base_type)) {
+ Report.Error (3009, Location, "'{0}': base type '{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (base_type));
}
return true;
}
/// </summary>
void VerifyClsName ()
{
- Hashtable parent_members = parent_container == null ?
+ Hashtable parent_members = parent_cache == null ?
new Hashtable () :
- parent_container.MemberCache.GetPublicMembers ();
+ parent_cache.GetPublicMembers ();
Hashtable this_members = new Hashtable ();
foreach (DictionaryEntry entry in defined_names) {
return FindMembers (mt, new_bf, null, null);
}
- public virtual IMemberContainer ParentContainer {
+ //
+ // Generates xml doc comments (if any), and if required,
+ // handle warning report.
+ //
+ internal override void GenerateDocComment (DeclSpace ds)
+ {
+ DocUtil.GenerateTypeDocComment (this, ds);
+ }
+
+ public override string DocCommentHeader {
+ get { return "T:"; }
+ }
+
+ public virtual MemberCache ParentCache {
get {
- return parent_container;
+ return parent_cache;
}
}
public readonly TypeAttributes DefaultTypeAttributes;
static PartialContainer Create (NamespaceEntry ns, TypeContainer parent,
- MemberName name, int mod_flags, Kind kind,
+ MemberName member_name, int mod_flags, Kind kind,
Location loc)
{
PartialContainer pc;
- string full_name = name.GetName (true);
+ string full_name = member_name.GetName (true);
DeclSpace ds = (DeclSpace) RootContext.Tree.Decls [full_name];
if (ds != null) {
pc = ds as PartialContainer;
260, ds.Location, "Missing partial modifier " +
"on declaration of type `{0}'; another " +
"partial implementation of this type exists",
- name);
+ member_name.GetTypeName());
Report.LocationOfPreviousError (loc);
return null;
Report.Error (
261, loc, "Partial declarations of `{0}' " +
"must be all classes, all structs or " +
- "all interfaces", name);
+ "all interfaces", member_name.GetTypeName ());
return null;
}
Report.Error (
262, loc, "Partial declarations of `{0}' " +
"have conflicting accessibility modifiers",
- name);
+ member_name.GetTypeName ());
return null;
}
return pc;
}
- pc = new PartialContainer (ns, parent, name, mod_flags, kind, loc);
+ pc = new PartialContainer (ns, parent, member_name, mod_flags, kind, loc);
RootContext.Tree.RecordDecl (full_name, pc);
parent.AddType (pc);
pc.Register ();
{
if (Kind == Kind.Interface)
Parent.AddInterface (this);
- else if (Kind == Kind.Class)
- Parent.AddClass (this);
- else if (Kind == Kind.Struct)
- Parent.AddStruct (this);
+ else if (Kind == Kind.Class || Kind == Kind.Struct)
+ Parent.AddClassOrStruct (this);
else
throw new InvalidOperationException ();
}
interface_type, full, name, loc);
}
- public override IMemberContainer ParentContainer {
+ public override MemberCache ParentCache {
get {
- return PartialContainer.ParentContainer;
+ return PartialContainer.ParentCache;
}
}
}
public abstract class ClassOrStruct : TypeContainer {
bool hasExplicitLayout = false;
+ ListDictionary declarative_security;
public ClassOrStruct (NamespaceEntry ns, TypeContainer parent,
MemberName name, Attributes attrs, Kind kind,
return PendingImplementation.GetPendingImplementations (this);
}
- protected override void VerifyMembers (EmitContext ec)
- {
- if (Fields != null) {
- foreach (Field f in Fields) {
- if ((f.ModFlags & Modifiers.STATIC) != 0)
- continue;
- if (hasExplicitLayout) {
- if (f.OptAttributes == null
- || !f.OptAttributes.Contains (TypeManager.field_offset_attribute_type, ec)) {
- Report.Error (625, f.Location,
- "Instance field of type marked with"
- + " StructLayout(LayoutKind.Explicit) must have a"
- + " FieldOffset attribute.");
- }
- }
- else {
- if (f.OptAttributes != null
- && f.OptAttributes.Contains (TypeManager.field_offset_attribute_type, ec)) {
- Report.Error (636, f.Location,
- "The FieldOffset attribute can only be placed on members of "
- + "types marked with the StructLayout(LayoutKind.Explicit)");
- }
- }
+ public override bool HasExplicitLayout {
+ get {
+ return hasExplicitLayout;
}
}
+
+ protected override void VerifyMembers (EmitContext ec)
+ {
base.VerifyMembers (ec);
+
+ if ((events != null) && (RootContext.WarningLevel >= 3)) {
+ foreach (Event e in events){
+ if (e.status == 0)
+ Report.Warning (67, e.Location, "The event '{0}' is never used", e.GetSignatureForError ());
+ }
+ }
}
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+ if (declarative_security == null)
+ declarative_security = new ListDictionary ();
+
+ a.ExtractSecurityPermissionSet (declarative_security);
+ return;
+ }
+
if (a.Type == TypeManager.struct_layout_attribute_type
&& (LayoutKind) a.GetPositionalValue (0) == LayoutKind.Explicit)
hasExplicitLayout = true;
base.ApplyAttributeBuilder (a, cb);
}
+
+ public override void Emit()
+ {
+ base.Emit ();
+
+ if (declarative_security != null) {
+ foreach (DictionaryEntry de in declarative_security) {
+ TypeBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+ }
+ }
+ }
+
+ public override void Register ()
+ {
+ Parent.AddClassOrStruct (this);
+ }
+ }
+
+ /// <summary>
+ /// Class handles static classes declaration
+ /// </summary>
+ public sealed class StaticClass: Class {
+ public StaticClass (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
+ Attributes attrs, Location l)
+ : base (ns, parent, name, mod & ~Modifiers.STATIC, attrs, l)
+ {
+ if (RootContext.Version == LanguageVersion.ISO_1) {
+ Report.FeatureIsNotStandardized (l, "static classes");
+ Environment.Exit (1);
+ }
+ }
+
+ protected override void DefineContainerMembers (MemberCoreArrayList list)
+ {
+ if (list == null)
+ return;
+
+ foreach (MemberCore m in list) {
+ if (m is Operator) {
+ Report.Error (715, m.Location, "'{0}': static classes cannot contain user-defined operators", m.GetSignatureForError (this));
+ continue;
+ }
+
+ if ((m.ModFlags & Modifiers.STATIC) != 0)
+ continue;
+
+ if (m is Constructor) {
+ Report.Error (710, m.Location, "'{0}': Static classes cannot have instance constructors", GetSignatureForError ());
+ continue;
+ }
+
+ if (m is Destructor) {
+ Report.Error (711, m.Location, "'{0}': Static class cannot contain destructor", GetSignatureForError ());
+ continue;
+ }
+ Report.Error (708, m.Location, "'{0}': cannot declare instance members in a static class", m.GetSignatureForError (this));
+ }
+
+ base.DefineContainerMembers (list);
+ }
+
+ public override TypeBuilder DefineType()
+ {
+ TypeBuilder tb = base.DefineType ();
+ if (tb == null)
+ return null;
+
+ if ((ptype != null) && (ptype != TypeManager.object_type)) {
+ Report.Error (
+ 713, Location,
+ "Static class '{0}' cannot derive from type '{1}'. " +
+ "Static classes must derive from object",
+ GetSignatureForError (), ptype);
+ return null;
+ }
+
+ if (ifaces != null) {
+ foreach (Type t in ifaces)
+ Report.SymbolRelatedToPreviousError (t);
+ Report.Error (
+ 714, Location,
+ "'{0}': static classes cannot implement interfaces",
+ GetSignatureForError ());
+ }
+ return tb;
+ }
+
+ public override TypeAttributes TypeAttr {
+ get {
+ return base.TypeAttr | TypeAttributes.Abstract | TypeAttributes.Sealed;
+ }
+ }
}
public class Class : ClassOrStruct {
// Information in the case we are an attribute type
AttributeUsageAttribute attribute_usage;
- public Class (NamespaceEntry ns, TypeContainer parent, MemberName name,
- int mod, Attributes attrs, Location l)
+ public Class (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
+ Attributes attrs, Location l)
: base (ns, parent, name, attrs, Kind.Class, l)
{
int accmods;
public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
{
- if (a.UsageAttribute != null)
+ if (a.UsageAttribute != null) {
+ if (ptype != TypeManager.attribute_type &&
+ !ptype.IsSubclassOf (TypeManager.attribute_type) &&
+ TypeBuilder.FullName != "System.Attribute") {
+ Report.Error (641, a.Location, "Attribute '{0}' is only valid on classes derived from System.Attribute", a.Name);
+ }
attribute_usage = a.UsageAttribute;
+ }
base.ApplyAttributeBuilder (a, cb);
}
}
}
- public override void Register ()
- {
- CheckDef (Parent.AddClass (this), Name, Location);
- }
-
public const TypeAttributes DefaultTypeAttributes =
TypeAttributes.AutoLayout | TypeAttributes.Class;
}
}
- public override void Register ()
- {
- CheckDef (Parent.AddStruct (this), Name, Location);
- }
-
public const TypeAttributes DefaultTypeAttributes =
TypeAttributes.SequentialLayout |
TypeAttributes.Sealed |
public override void Register ()
{
- CheckDef (Parent.AddInterface (this), Name, Location);
+ Parent.AddInterface (this);
}
public override PendingImplementation GetPendingImplementations ()
public readonly Parameters Parameters;
public readonly GenericMethod GenericMethod;
public readonly DeclSpace ds;
- protected Block block;
+ protected ToplevelBlock block;
//
// Parameters, cached for semantic analysis.
}
}
- public Block Block {
+ public ToplevelBlock Block {
get {
return block;
}
if (!DoDefineParameters ())
return false;
+ if ((caching_flags & Flags.TestMethodDuplication) != 0 && !CheckForDuplications ())
+ return false;
+
if (IsExplicitImpl)
return true;
- // TODO: Is it correct ?
- if (!IsOperator) {
- if (!CheckForDuplications ())
- return false;
- }
-
// Is null for System.Object while compiling corlib and base interfaces
- if (Parent.ParentContainer == null) {
+ if (Parent.ParentCache == null) {
if ((RootContext.WarningLevel >= 4) && ((ModFlags & Modifiers.NEW) != 0)) {
Report.Warning (109, Location, "The member '{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError (Parent));
}
"change return type when overriding inherited member");
return false;
}
+ } else {
+ if (parent_method.IsAbstract && !IsInterface) {
+ Report.SymbolRelatedToPreviousError (parent_method);
+ Report.Error (533, Location, "'{0}' hides inherited abstract member", GetSignatureForError (Parent));
+ return false;
+ }
+ }
+
+ if (parent_method.IsSpecialName && !(this is PropertyBase)) {
+ Report.Error (561, Location, "'{0}': cannot override '{1}' because it is a special compiler-generated method", GetSignatureForError (Parent), TypeManager.GetFullNameSignature (parent_method));
+ return false;
}
if (RootContext.WarningLevel > 2) {
ObsoleteAttribute oa = AttributeTester.GetMethodObsoleteAttribute (parent_method);
if (oa != null) {
- Report.SymbolRelatedToPreviousError (parent_method);
- Report.Warning (672, Location, "Member '{0}' overrides obsolete member. Add the Obsolete attribute to '{0}'", GetSignatureForError (Parent));
+ EmitContext ec = new EmitContext (this.Parent, this.Parent, Location, null, null, ModFlags, false);
+ if (OptAttributes == null || !OptAttributes.Contains (TypeManager.obsolete_attribute_type, ec)) {
+ Report.SymbolRelatedToPreviousError (parent_method);
+ Report.Warning (672, 1, Location, "Member '{0}' overrides obsolete member. Add the Obsolete attribute to '{0}'", GetSignatureForError (Parent));
+ }
}
return true;
}
+ MemberInfo conflict_symbol = Parent.FindMemberWithSameName (Name, !(this is Property));
if ((ModFlags & Modifiers.OVERRIDE) != 0) {
+ if (conflict_symbol != null) {
+ Report.SymbolRelatedToPreviousError (conflict_symbol);
+ if (this is PropertyBase)
+ Report.Error (544, Location, "'{0}': cannot override because '{1}' is not a property", GetSignatureForError (Parent), TypeManager.GetFullNameSignature (conflict_symbol));
+ else
+ Report.Error (505, Location, "'{0}': cannot override because '{1}' is not a method", GetSignatureForError (Parent), TypeManager.GetFullNameSignature (conflict_symbol));
+ } else
Report.Error (115, Location, "'{0}': no suitable methods found to override", GetSignatureForError (Parent));
return false;
}
- MemberInfo conflict_symbol = Parent.FindMemberWithSameName (Name, !(this is Property));
if (conflict_symbol == null) {
if ((RootContext.WarningLevel >= 4) && ((ModFlags & Modifiers.NEW) != 0)) {
Report.Warning (109, Location, "The member '{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError (Parent));
MethodAttributes thisp = flags & MethodAttributes.MemberAccessMask;
MethodAttributes parentp = parent_method.Attributes & MethodAttributes.MemberAccessMask;
- //
- // special case for "protected internal"
- //
-
- if ((parentp & MethodAttributes.FamORAssem) == MethodAttributes.FamORAssem){
- //
- // when overriding protected internal, the method can be declared
- // protected internal only within the same assembly
- //
-
- if ((thisp & MethodAttributes.FamORAssem) == MethodAttributes.FamORAssem){
- if (Parent.TypeBuilder.Assembly != parent_method.DeclaringType.Assembly){
- //
- // assemblies differ - report an error
- //
-
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- } else if (thisp != parentp) {
- //
- // same assembly, but other attributes differ - report an error
- //
-
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- };
- } else if ((thisp & MethodAttributes.Family) != MethodAttributes.Family) {
- //
- // if it's not "protected internal", it must be "protected"
- //
-
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- } else if (Parent.TypeBuilder.Assembly == parent_method.DeclaringType.Assembly) {
- //
- // protected within the same assembly - an error
- //
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- } else if ((thisp & ~(MethodAttributes.Family | MethodAttributes.FamORAssem)) !=
- (parentp & ~(MethodAttributes.Family | MethodAttributes.FamORAssem))) {
- //
- // protected ok, but other attributes differ - report an error
- //
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- }
- } else {
- if (thisp != parentp){
- Error_CannotChangeAccessModifiers (Parent, parent_method, name);
- ok = false;
- }
+ if (!CheckAccessModifiers (thisp, parentp, parent_method)) {
+ Error_CannotChangeAccessModifiers (Parent, parent_method, name);
+ ok = false;
}
}
Report.SymbolRelatedToPreviousError (parent_method);
if (!IsInterface && (parent_method.IsVirtual || parent_method.IsAbstract)) {
if (RootContext.WarningLevel >= 2)
- Report.Warning (114, Location, "'{0}' hides inherited member '{1}'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword", GetSignatureForError (Parent), parent_method);
+ Report.Warning (114, Location, "'{0}' hides inherited member '{1}'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword", GetSignatureForError (Parent), TypeManager.CSharpSignature (parent_method));
} else
- Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member `{1}'", GetSignatureForError (Parent), parent_method);
+ Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member", GetSignatureForError (Parent));
}
return ok;
}
+
+ protected bool CheckAccessModifiers (MethodAttributes thisp, MethodAttributes parentp, MethodInfo base_method)
+ {
+ if ((parentp & MethodAttributes.FamORAssem) == MethodAttributes.FamORAssem){
+ //
+ // when overriding protected internal, the method can be declared
+ // protected internal only within the same assembly
+ //
+
+ if ((thisp & MethodAttributes.FamORAssem) == MethodAttributes.FamORAssem){
+ if (Parent.TypeBuilder.Assembly != base_method.DeclaringType.Assembly){
+ //
+ // assemblies differ - report an error
+ //
+
+ return false;
+ } else if (thisp != parentp) {
+ //
+ // same assembly, but other attributes differ - report an error
+ //
+
+ return false;
+ };
+ } else if ((thisp & MethodAttributes.Family) != MethodAttributes.Family) {
+ //
+ // if it's not "protected internal", it must be "protected"
+ //
+ return false;
+ } else if (Parent.TypeBuilder.Assembly == base_method.DeclaringType.Assembly) {
+ //
+ // protected within the same assembly - an error
+ //
+ return false;
+ } else if ((thisp & ~(MethodAttributes.Family | MethodAttributes.FamORAssem)) !=
+ (parentp & ~(MethodAttributes.Family | MethodAttributes.FamORAssem))) {
+ //
+ // protected ok, but other attributes differ - report an error
+ //
+ return false;
+ }
+ return true;
+ } else {
+ return (thisp == parentp);
+ }
+ }
+
void Error_CannotChangeAccessModifiers (TypeContainer parent, MethodInfo parent_method, string name)
{
//
"member `" + name + "'");
}
+ protected static string Error722 {
+ get {
+ return "'{0}': static types cannot be used as return types";
+ }
+ }
+
/// <summary>
/// For custom member duplication search in a container
/// </summary>
protected virtual bool DoDefineParameters ()
{
+ EmitContext ec = ds.EmitContext;
+ if (ec == null)
+ throw new InternalErrorException ("DoDefineParameters invoked too early");
+
+ bool old_unsafe = ec.InUnsafe;
+ ec.InUnsafe = InUnsafe;
// Check if arguments were correct
- parameter_types = Parameters.GetParameterInfo (ds);
+ parameter_types = Parameters.GetParameterInfo (ec);
+ ec.InUnsafe = old_unsafe;
+
if ((parameter_types == null) ||
!CheckParameters (ds, parameter_types))
return false;
- parameter_info = new InternalParameters (ds, Parameters);
+ TypeParameter[] tparam = ds.IsGeneric ? ds.TypeParameters : null;
+ parameter_info = new InternalParameters (parameter_types, Parameters, tparam);
Parameter array_param = Parameters.ArrayParameter;
if ((array_param != null) &&
return false;
}
- if (gc.HasConstructor != ogc.HasConstructor) {
- error_425 (ot, t, name);
- return false;
- }
-
- if (ogc.HasClassConstraint != gc.HasClassConstraint) {
+ if ((gc.Attributes != ogc.Attributes) ||
+ (gc.HasClassConstraint != ogc.HasClassConstraint)) {
error_425 (ot, t, name);
return false;
}
}
if (!AttributeTester.IsClsCompliant (MemberType)) {
- Report.Error (3002, Location, "Return type of '{0}' is not CLS-compliant", GetSignatureForError ());
+ if ((this is Property) || (this is Indexer))
+ Report.Error (3003, Location, "Type of `{0}' is not CLS-compliant",
+ GetSignatureForError ());
+ else
+ Report.Error (3002, Location, "Return type of '{0}' is not CLS-compliant",
+ GetSignatureForError ());
}
AttributeTester.AreParametersCompliant (Parameters.FixedParameters, Location);
return true;
}
+ bool MayUnify (MethodCore first, MethodCore second)
+ {
+ int a_type_params = 0;
+ if (first.GenericMethod != null)
+ a_type_params = first.GenericMethod.CountTypeParameters;
+
+ int b_type_params = 0;
+ if (second.GenericMethod != null)
+ b_type_params = second.GenericMethod.CountTypeParameters;
+
+ if (a_type_params != b_type_params)
+ return false;
+
+ Type[] class_infered, method_infered;
+ if (Parent.CountTypeParameters > 0)
+ class_infered = new Type [Parent.CountTypeParameters];
+ else
+ class_infered = null;
+
+ if (a_type_params > 0)
+ method_infered = new Type [a_type_params];
+ else
+ method_infered = null;
+
+ return TypeManager.MayBecomeEqualGenericInstances (
+ first.ParameterTypes, second.ParameterTypes, class_infered, method_infered);
+ }
+
protected bool IsDuplicateImplementation (MethodCore method)
{
- if ((method == this) || (method.Name != Name))
+ if ((method == this) ||
+ (method.MemberName.GetTypeName () != MemberName.GetTypeName ()))
return false;
Type[] param_types = method.ParameterTypes;
if (param_types.Length != ParameterTypes.Length)
return false;
- int type_params = 0;
- if (GenericMethod != null)
- type_params = GenericMethod.CountTypeParameters;
-
- int m_type_params = 0;
- if (method.GenericMethod != null)
- m_type_params = method.GenericMethod.CountTypeParameters;
-
- if (type_params != m_type_params)
- return false;
-
bool equal = true;
- bool may_unify;
-
- Type[] infered_types;
- if (type_params > 0)
- infered_types = new Type [type_params];
- else
- infered_types = null;
-
- may_unify = Invocation.InferTypeArguments (
- param_types, ParameterTypes, ref infered_types);
-
- if (!may_unify) {
- if (type_params > 0)
- infered_types = new Type [type_params];
- else
- infered_types = null;
-
- may_unify = Invocation.InferTypeArguments (
- ParameterTypes, param_types, ref infered_types);
- }
+ bool may_unify = MayUnify (this, method);
for (int i = 0; i < param_types.Length; i++) {
- Type a = param_types [i];
- Type b = ParameterTypes [i];
-
- if (a != b)
+ if (param_types [i] != ParameterTypes [i])
equal = false;
}
+ // TODO: make operator compatible with MethodCore to avoid this
+ if (this is Operator && method is Operator) {
+ if (MemberType != method.MemberType)
+ equal = may_unify = false;
+ }
+
if (equal) {
//
// Try to report 663: method only differs on out/ref
Report.Error (408, Location,
"`{0}' cannot define overload members that " +
"may unify for some type parameter substitutions",
- Parent.Name);
+ Parent.MemberName);
return true;
}
return false;
}
+ //
+ // Returns a string that represents the signature for this
+ // member which should be used in XML documentation.
+ //
+ public override string GetDocCommentName (DeclSpace ds)
+ {
+ return DocUtil.GetMethodDocCommentName (this, ds);
+ }
+
+ //
+ // Raised (and passed an XmlElement that contains the comment)
+ // when GenerateDocComment is writing documentation expectedly.
+ //
+ // FIXME: with a few effort, it could be done with XmlReader,
+ // that means removal of DOM use.
+ //
+ internal override void OnGenerateDocComment (DeclSpace ds, XmlElement el)
+ {
+ DocUtil.OnMethodGenerateDocComment (this, ds, el);
+ }
+
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { return "M:"; }
+ }
+
protected override void VerifyObsoleteAttribute()
{
base.VerifyObsoleteAttribute ();
public MethodBuilder MethodBuilder;
public MethodData MethodData;
ReturnParameter return_attributes;
+ ListDictionary declarative_security;
/// <summary>
/// Modifiers allowed in a class declaration
}
}
- //
- // Returns the `System.Type' for the ReturnType of this
- // function. Provides a nice cache. (used between semantic analysis
- // and actual code generation
- //
- public Type GetReturnType ()
- {
- return MemberType;
- }
-
public override string GetSignatureForError()
{
+ if (MethodBuilder == null) {
+ return GetSignatureForError (Parent);
+ }
return TypeManager.CSharpSignature (MethodBuilder);
}
/// </summary>
public override string GetSignatureForError (TypeContainer tc)
{
+ // TODO: get params from somewhere
+ if (parameter_info == null)
+ return base.GetSignatureForError (tc);
+
// TODO: move to parameters
System.Text.StringBuilder args = new System.Text.StringBuilder ();
if (parameter_info.Parameters.FixedParameters != null) {
return;
}
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+ if (declarative_security == null)
+ declarative_security = new ListDictionary ();
+ a.ExtractSecurityPermissionSet (declarative_security);
+ return;
+ }
+
if (a.Type == TypeManager.conditional_attribute_type) {
if (IsOperator || IsExplicitImpl) {
Report.Error (577, Location, "Conditional not valid on '{0}' because it is a destructor, operator, or explicit interface implementation", GetSignatureForError ());
Report.Error (629, Location, "Conditional member '{0}' cannot implement interface member", GetSignatureForError ());
return;
}
+
+ for (int i = 0; i < parameter_info.Count; ++i) {
+ if ((parameter_info.ParameterModifier (i) & Parameter.Modifier.OUT) != 0) {
+ Report.Error (685, Location, "Conditional method '{0}' cannot have an out parameter", GetSignatureForError ());
+ return;
+ }
+ }
}
MethodBuilder.SetCustomAttribute (cb);
protected override bool CheckForDuplications ()
{
ArrayList ar = Parent.Methods;
+ if (ar != null) {
+ int arLen = ar.Count;
+
+ for (int i = 0; i < arLen; i++) {
+ Method m = (Method) ar [i];
+ if (IsDuplicateImplementation (m))
+ return false;
+ }
+ }
+
+ ar = Parent.Properties;
if (ar != null) {
- int arLen = ar.Count;
+ for (int i = 0; i < ar.Count; ++i) {
+ PropertyBase pb = (PropertyBase) ar [i];
+ if (pb.AreAccessorsDuplicateImplementation (this))
+ return false;
+ }
+ }
- for (int i = 0; i < arLen; i++) {
- Method m = (Method) ar [i];
- if (IsDuplicateImplementation (m))
+ ar = Parent.Indexers;
+ if (ar != null) {
+ for (int i = 0; i < ar.Count; ++i) {
+ PropertyBase pb = (PropertyBase) ar [i];
+ if (pb.AreAccessorsDuplicateImplementation (this))
+ return false;
+ }
+ }
+
+ ar = Parent.Events;
+ if (ar != null) {
+ for (int i = 0; i < ar.Count; ++i) {
+ Event ev = (Event) ar [i];
+ if (ev.AreAccessorsDuplicateImplementation (this))
return false;
}
}
if (GenericMethod != null) {
string mname = MemberName.GetMethodName ();
mb = Parent.TypeBuilder.DefineGenericMethod (mname, flags);
- if (!GenericMethod.Define (mb))
+ if (!GenericMethod.Define (mb, ReturnType))
return false;
}
flags |= MethodAttributes.SpecialName | MethodAttributes.HideBySig;
MethodData = new MethodData (this, ParameterInfo, ModFlags, flags,
- this, mb, GenericMethod);
+ this, mb, GenericMethod, parent_method);
if (!MethodData.Define (Parent))
return false;
}
}
+ if (MemberType.IsAbstract && MemberType.IsSealed) {
+ Report.Error (722, Location, Error722, TypeManager.CSharpName (MemberType));
+ return false;
+ }
+
return true;
}
{
MethodData.Emit (Parent, this);
base.Emit ();
+
+ if (declarative_security != null) {
+ foreach (DictionaryEntry de in declarative_security) {
+ MethodBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+ }
+ }
+
Block = null;
MethodData = null;
}
protected override MethodInfo FindOutParentMethod (TypeContainer container, ref Type parent_ret_type)
{
- MethodInfo mi = (MethodInfo) container.ParentContainer.MemberCache.FindMemberToOverride (
+ MethodInfo mi = (MethodInfo) container.ParentCache.FindMemberToOverride (
container.TypeBuilder, Name, ParameterTypes, false);
if (mi == null)
}
}
- public string MethodName {
+ public MemberName MethodName {
get {
- return ShortName;
+ return MemberName;
}
}
return GenericMethod;
}
}
+
#endregion
}
}
if (parent_constructor == caller_builder){
- Report.Error (515, String.Format ("Constructor `{0}' can not call itself", TypeManager.CSharpSignature (caller_builder)));
+ Report.Error (516, String.Format ("Constructor `{0}' can not call itself", TypeManager.CSharpSignature (caller_builder)));
return false;
}
public class Constructor : MethodCore, IMethodData {
public ConstructorBuilder ConstructorBuilder;
public ConstructorInitializer Initializer;
+ ListDictionary declarative_security;
// <summary>
// Modifiers allowed for a constructor.
public override string GetSignatureForError()
{
+ if (ConstructorBuilder == null)
+ return GetSignatureForError (Parent);
+
return TypeManager.CSharpSignature (ConstructorBuilder);
}
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+ if (declarative_security == null) {
+ declarative_security = new ListDictionary ();
+ }
+ a.ExtractSecurityPermissionSet (declarative_security);
+ return;
+ }
+
ConstructorBuilder.SetCustomAttribute (cb);
}
}
}
if (Initializer != null) {
- Initializer.CheckObsoleteAttribute (Parent, Location);
+ if (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent.Parent) == null)
+ Initializer.CheckObsoleteAttribute (Parent, Location);
+ else
+ ec.TestObsoleteMethodUsage = false;
Initializer.Emit (ec);
}
base.Emit ();
+ if (declarative_security != null) {
+ foreach (DictionaryEntry de in declarative_security) {
+ ConstructorBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+ }
+ }
+
block = null;
}
}
}
- public string MethodName {
+ public MemberName MethodName {
get {
- return ShortName;
- }
+ return MemberName;
}
+ }
public Type ReturnType {
get {
return MemberType;
- }
- }
+ }
+ }
public EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig)
{
{
CallingConventions CallingConventions { get; }
Location Location { get; }
- string MethodName { get; }
+ MemberName MethodName { get; }
Type[] ParameterTypes { get; }
Type ReturnType { get; }
GenericMethod GenericMethod { get; }
Attributes OptAttributes { get; }
- Block Block { get; }
+ ToplevelBlock Block { get; }
EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig);
ObsoleteAttribute GetObsoleteAttribute ();
protected int modifiers;
protected MethodAttributes flags;
protected Type declaring_type;
+ protected MethodInfo parent_method;
EmitContext ec;
public MethodData (MemberBase member, InternalParameters parameters,
int modifiers, MethodAttributes flags,
IMethodData method, MethodBuilder builder,
- GenericMethod generic)
+ GenericMethod generic, MethodInfo parent_method)
: this (member, parameters, modifiers, flags, method)
{
this.builder = builder;
this.GenericMethod = generic;
+ this.parent_method = parent_method;
}
static string RemoveArity (string name)
public bool Define (TypeContainer container)
{
MethodInfo implementing = null;
- string prefix;
+ string prefix;
if (member.IsExplicitImpl)
- prefix = RemoveArity (member.InterfaceType.FullName) + ".";
+ prefix = member.InterfaceType.FullName + ".";
else
prefix = "";
- string name = method.MethodName;
+ string name = method.MethodName.Basename;
string method_name = prefix + name;
+
Type[] ParameterTypes = method.ParameterTypes;
if (container.Pending != null){
implementing = container.Pending.IsInterfaceMethod (
member.InterfaceType, name, method.ReturnType, ParameterTypes);
- if (member.InterfaceType != null && implementing == null){
- Report.Error (539, method.Location, "'{0}' in explicit interface declaration is not an interface", method_name);
- return false;
+ if (member.InterfaceType != null){
+ if (implementing == null){
+ Report.Error (539, method.Location,
+ "'{0}' in explicit interface declaration is not an interface", method_name);
+ return false;
+ }
}
}
if ((modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) == 0)
flags |= MethodAttributes.Final;
- // Get the method name from the explicit interface.
- if (member.InterfaceType != null) {
- name = implementing.Name;
- method_name = prefix + name;
- }
-
IsImplementing = true;
}
if (builder == null)
return false;
- if (GenericMethod != null) {
- if (!GenericMethod.DefineType (ec, builder))
- return false;
- }
-
if (container.CurrentType != null)
- declaring_type = container.CurrentType.ResolveType (ec);
+ declaring_type = container.CurrentType;
else
declaring_type = container.TypeBuilder;
if (member is Indexer) {
container.Pending.ImplementIndexer (
member.InterfaceType, builder, method.ReturnType,
- ParameterTypes, true);
+ ParameterTypes, member.IsExplicitImpl);
} else
container.Pending.ImplementMethod (
member.InterfaceType, name, method.ReturnType,
}
- if (!TypeManager.RegisterMethod (builder, ParameterInfo, ParameterTypes)) {
- Report.Error (111, method.Location,
- "Class `" + container.Name +
- "' already contains a definition with the " +
- "same return value and parameter types as the " +
- "'get' method of property `" + member.Name + "'");
- return false;
- }
-
+ TypeManager.RegisterMethod (builder, ParameterInfo, ParameterTypes);
TypeManager.AddMethod (builder, method);
+ if (GenericMethod != null) {
+ bool is_override = member.IsExplicitImpl |
+ ((modifiers & Modifiers.OVERRIDE) != 0);
+
+ if (implementing != null)
+ parent_method = implementing;
+
+ if (!GenericMethod.DefineType (ec, builder, parent_method, is_override))
+ return false;
+ }
+
return true;
}
else
ec = method.CreateEmitContext (container, null);
+ if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute (container.Parent) != null)
+ ec.TestObsoleteMethodUsage = false;
+
Location loc = method.Location;
Attributes OptAttributes = method.OptAttributes;
if (member is MethodCore)
((MethodCore) member).Parameters.LabelParameters (ec, MethodBuilder, loc);
- Block block = method.Block;
+ SymbolWriter sw = CodeGen.SymbolWriter;
+ ToplevelBlock block = method.Block;
//
// abstract or extern methods have no bodies
source.CloseMethod ();
}
- void EmitDestructor (EmitContext ec, Block block)
+ void EmitDestructor (EmitContext ec, ToplevelBlock block)
{
ILGenerator ig = ec.ig;
//
// The name of the interface we are explicitly implementing
//
- public Expression ExplicitInterfaceName = null;
+ public MemberName ExplicitInterfaceName = null;
//
// Whether this is an interface member.
explicit_mod_flags = mod;
Type = type;
ModFlags = Modifiers.Check (allowed_mod, mod, def_mod, loc);
+
+ // Check for explicit interface implementation
+ if (MemberName.Left != null) {
+ ExplicitInterfaceName = MemberName.Left;
+ ShortName = MemberName.Name;
+ IsExplicitImpl = true;
+ } else
+ ShortName = Name;
}
protected virtual bool CheckBase ()
protected virtual bool DoDefineBase ()
{
+ EmitContext ec = Parent.EmitContext;
+ if (ec == null)
+ throw new InternalErrorException ("MemberBase.DoDefine called too early");
+
if (Name == null)
- Name = "this";
+ throw new InternalErrorException ();
if (IsInterface) {
ModFlags = Modifiers.PUBLIC |
protected virtual bool DoDefine (DeclSpace decl)
{
+ EmitContext ec = decl.EmitContext;
+ if (ec == null)
+ throw new InternalErrorException ("MemberBase.DoDefine called too early");
+
+ ec.InUnsafe = InUnsafe;
+
// Lookup Type, verify validity
- MemberType = decl.ResolveType (Type, false, Location);
- if (MemberType == null)
+ bool old_unsafe = ec.InUnsafe;
+ ec.InUnsafe = InUnsafe;
+ TypeExpr texpr = Type.ResolveAsTypeTerminal (ec);
+ ec.InUnsafe = old_unsafe;
+
+ if (texpr == null)
return false;
+ MemberType = texpr.Type;
+
if ((Parent.ModFlags & Modifiers.SEALED) != 0){
if ((ModFlags & (Modifiers.VIRTUAL|Modifiers.ABSTRACT)) != 0){
Report.Error (549, Location, "Virtual method can not be contained in sealed class");
"Inconsistent accessibility: indexer return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
"accessible than indexer `" + Name + "'");
- else if (this is Method) {
- if (((Method) this).IsOperator)
+ else if (this is MethodCore) {
+ if (this is Operator)
Report.Error (56, Location,
"Inconsistent accessibility: return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
"Inconsistent accessibility: return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
"accessible than method `" + Name + "'");
- } else
+ } else {
Report.Error (52, Location,
"Inconsistent accessibility: field type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
"accessible than field `" + Name + "'");
+ }
return false;
}
if (MemberType.IsPointer && !UnsafeOK (Parent))
return false;
- //
- // Check for explicit interface implementation
- //
- if (MemberName.Left != null) {
- ExplicitInterfaceName = MemberName.Left.GetTypeExpression (Location);
- ShortName = MemberName.Name;
- } else
- ShortName = Name;
-
- if (ExplicitInterfaceName != null) {
- InterfaceType = Parent.ResolveType (
- ExplicitInterfaceName, false, Location);
- if (InterfaceType == null)
+ if (IsExplicitImpl) {
+ Expression expr = ExplicitInterfaceName.GetTypeExpression (Location);
+ TypeExpr iface_texpr = expr.ResolveAsTypeTerminal (ec);
+ if (iface_texpr == null)
return false;
- if (InterfaceType.IsClass) {
- Report.Error (538, Location, "'{0}' in explicit interface declaration is not an interface", ExplicitInterfaceName);
+ InterfaceType = iface_texpr.Type;
+
+ if (!InterfaceType.IsInterface) {
+ Report.Error (538, Location, "'{0}' in explicit interface declaration is not an interface", TypeManager.CSharpName (InterfaceType));
return false;
}
- // Compute the full name that we need to export.
- Name = InterfaceType.FullName + "." + ShortName;
-
if (!Parent.VerifyImplements (InterfaceType, ShortName, Name, Location))
return false;
Modifiers.Check (Modifiers.AllowedExplicitImplFlags, explicit_mod_flags, 0, Location);
-
- IsExplicitImpl = true;
- } else
- IsExplicitImpl = false;
+ }
return true;
}
/// <summary>
- /// Use this method when MethodBuilder is null
+ /// The name of the member can be changed during definition (see IndexerName attribute)
/// </summary>
- public virtual string GetSignatureForError (TypeContainer tc)
+ protected virtual void UpdateMemberName ()
+ {
+ MemberName.Name = ShortName;
+ }
+
+ public override string GetSignatureForError (TypeContainer tc)
{
- return String.Concat (tc.Name, '.', Name);
+ return String.Concat (tc.Name, '.', base.GetSignatureForError (tc));
+ }
+
+ protected bool IsTypePermitted ()
+ {
+ if (MemberType == TypeManager.arg_iterator_type || MemberType == TypeManager.typed_reference_type) {
+ Report.Error (610, Location, "Field or property cannot be of type '{0}'", TypeManager.CSharpName (MemberType));
+ return false;
+ }
+ return true;
}
protected override bool VerifyClsCompliance(DeclSpace ds)
public Status status;
[Flags]
- public enum Status : byte { ASSIGNED = 1, USED = 2 }
+ public enum Status : byte {
+ ASSIGNED = 1,
+ USED = 2,
+ HAS_OFFSET = 4 // Used by FieldMember.
+ }
static string[] attribute_targets = new string [] { "field" };
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
if (a.Type == TypeManager.marshal_as_attr_type) {
- UnmanagedMarshal marshal = a.GetMarshal ();
+ UnmanagedMarshal marshal = a.GetMarshal (this);
if (marshal != null) {
FieldBuilder.SetMarshal (marshal);
+ }
return;
}
- Report.Warning (-24, a.Location, "The Microsoft Runtime cannot set this marshal info. Please use the Mono runtime instead.");
+
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
+ a.Error_InvalidSecurityParent ();
return;
}
-
FieldBuilder.SetCustomAttribute (cb);
}
"Keyword 'void' cannot be used in this context");
return false;
}
-
- if (MemberType == TypeManager.arg_iterator_type || MemberType == TypeManager.typed_reference_type) {
- Report.Error (610, Location, "Field or property cannot be of type '{0}'", TypeManager.CSharpName (MemberType));
- return false;
- }
-
return true;
}
public override string GetSignatureForError ()
{
+ if (FieldBuilder == null) {
+ return base.GetSignatureForError (Parent);
+ }
return TypeManager.GetFullNameSignature (FieldBuilder);
}
}
}
+ public abstract class FieldMember: FieldBase
+ {
+
+
+ protected FieldMember (TypeContainer parent, Expression type, int mod,
+ int allowed_mod, MemberName name, object init, Attributes attrs, Location loc)
+ : base (parent, type, mod, allowed_mod, name, init, attrs, loc)
+ {
+ }
+
+ public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
+ {
+ if (a.Type == TypeManager.field_offset_attribute_type)
+ {
+ status |= Status.HAS_OFFSET;
+
+ if (!Parent.HasExplicitLayout) {
+ Report.Error (636, Location, "The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit)");
+ return;
+ }
+
+ if ((ModFlags & Modifiers.STATIC) != 0 || this is Const) {
+ Report.Error (637, Location, "The FieldOffset attribute is not allowed on static or const fields");
+ return;
+ }
+ }
+ base.ApplyAttributeBuilder (a, cb);
+ }
+
+
+ public override bool Define()
+ {
+ EmitContext ec = Parent.EmitContext;
+ if (ec == null)
+ throw new InternalErrorException ("FieldMember.Define called too early");
+
+ bool old_unsafe = ec.InUnsafe;
+ ec.InUnsafe = InUnsafe;
+ TypeExpr texpr = Type.ResolveAsTypeTerminal (ec);
+ ec.InUnsafe = old_unsafe;
+ if (texpr == null)
+ return false;
+
+ MemberType = texpr.Type;
+
+ if (!CheckBase ())
+ return false;
+
+ if (!Parent.AsAccessible (MemberType, ModFlags)) {
+ Report.Error (52, Location,
+ "Inconsistent accessibility: field type `" +
+ TypeManager.CSharpName (MemberType) + "' is less " +
+ "accessible than field `" + Name + "'");
+ return false;
+ }
+
+ if (!IsTypePermitted ())
+ return false;
+
+ if (MemberType.IsPointer && !UnsafeOK (Parent))
+ return false;
+
+ return true;
+ }
+
+ public override void Emit ()
+ {
+ if (Parent.HasExplicitLayout && ((status & Status.HAS_OFFSET) == 0) && (ModFlags & Modifiers.STATIC) == 0) {
+ Report.Error (625, Location, "'{0}': Instance field types marked with StructLayout(LayoutKind.Explicit) must have a FieldOffset attribute.", GetSignatureForError ());
+ }
+
+ base.Emit ();
+ }
+
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { return "F:"; }
+ }
+ }
+
//
// The Field class is used to represents class/struct fields during parsing.
//
- public class Field : FieldBase {
+ public class Field : FieldMember {
// <summary>
// Modifiers allowed in a class declaration
// </summary>
public override bool Define ()
{
- MemberType = Parent.ResolveType (Type, false, Location);
-
- if (MemberType == null)
+ if (!base.Define ())
return false;
- CheckBase ();
-
- if (!Parent.AsAccessible (MemberType, ModFlags)) {
- Report.Error (52, Location,
- "Inconsistent accessibility: field type `" +
- TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than field `" + Name + "'");
- return false;
- }
-
- if (MemberType.IsPointer && !UnsafeOK (Parent))
- return false;
-
if (RootContext.WarningLevel > 1){
Type ptype = Parent.TypeBuilder.BaseType;
//
// Null if the accessor is empty, or a Block if not
//
- public Block Block;
+ public const int AllowedModifiers =
+ Modifiers.PUBLIC |
+ Modifiers.PROTECTED |
+ Modifiers.INTERNAL |
+ Modifiers.PRIVATE;
+
+ public ToplevelBlock Block;
public Attributes Attributes;
+ public Location Location;
+ public int ModFlags;
- public Accessor (Block b, Attributes attrs)
+ public Accessor (ToplevelBlock b, int mod, Attributes attrs, Location loc)
{
Block = b;
Attributes = attrs;
+ Location = loc;
+ ModFlags = Modifiers.Check (AllowedModifiers, mod, 0, loc);
}
}
// Ooouh Martin, templates are missing here.
// When it will be possible move here a lot of child code and template method type.
- public abstract class AbstractPropertyEventMethod: Attributable, IMethodData
- {
+ public abstract class AbstractPropertyEventMethod: MemberCore, IMethodData {
protected MethodData method_data;
- protected Block block;
+ protected ToplevelBlock block;
+ protected ListDictionary declarative_security;
+
+ // The accessor are created event if they are not wanted.
+ // But we need them because their names are reserved.
+ // Field says whether accessor will be emited or not
+ public readonly bool IsDummy;
+
+ protected readonly string prefix;
ReturnParameter return_attributes;
- public AbstractPropertyEventMethod ():
- base (null)
+ public AbstractPropertyEventMethod (MemberBase member, string prefix)
+ : base (null, SetupName (prefix, member), null, member.Location)
{
+ this.prefix = prefix;
+ IsDummy = true;
}
- public AbstractPropertyEventMethod (Accessor accessor):
- base (accessor.Attributes)
+ public AbstractPropertyEventMethod (MemberBase member, Accessor accessor,
+ string prefix)
+ : base (null, SetupName (prefix, member),
+ accessor.Attributes, accessor.Location)
{
+ this.prefix = prefix;
this.block = accessor.Block;
}
+ static MemberName SetupName (string prefix, MemberBase member)
+ {
+ MemberName name = member.MemberName.Clone ();
+ name.Name = prefix + member.ShortName;
+ return name;
+ }
+
+ public void UpdateName (MemberBase member)
+ {
+ MemberName.Name = prefix + member.ShortName;
+ }
+
#region IMethodData Members
- public Block Block {
+ public ToplevelBlock Block {
get {
return block;
}
}
}
+ public MemberName MethodName {
+ get {
+ return MemberName;
+ }
+ }
+
public abstract ObsoleteAttribute GetObsoleteAttribute ();
- public abstract string GetSignatureForError (TypeContainer tc);
- public abstract Location Location { get; }
- public abstract string MethodName { get; }
public abstract Type[] ParameterTypes { get; }
public abstract Type ReturnType { get; }
public abstract EmitContext CreateEmitContext(TypeContainer tc, ILGenerator ig);
{
if (a.Type == TypeManager.cls_compliant_attribute_type || a.Type == TypeManager.obsolete_attribute_type ||
a.Type == TypeManager.conditional_attribute_type) {
- Report.Error (1667, a.Location, "'{0}' is not valid on property or event accessors. It is valid on '{1}' declarations only", TypeManager.CSharpName (a.Type), a.GetValidTargets ());
+ Report.Error (1667, a.Location, "'{0}' is not valid on property or event accessors. It is valid on {1} declarations only", TypeManager.CSharpName (a.Type), a.GetValidTargets ());
+ return;
+ }
+
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+ if (declarative_security == null)
+ declarative_security = new ListDictionary ();
+ a.ExtractSecurityPermissionSet (declarative_security);
return;
}
System.Diagnostics.Debug.Fail ("You forgot to define special attribute target handling");
}
+ public override bool Define()
+ {
+ throw new NotSupportedException ();
+ }
+
public virtual void Emit (TypeContainer container)
{
method_data.Emit (container, this);
+
+ if (declarative_security != null) {
+ foreach (DictionaryEntry de in declarative_security) {
+ method_data.MethodBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+ }
+ }
+
block = null;
}
+
+ public override bool IsClsCompliaceRequired(DeclSpace ds)
+ {
+ return false;
+ }
+
+ public bool IsDuplicateImplementation (MethodCore method)
+ {
+ if (Name != method.Name)
+ return false;
+
+ Type[] param_types = method.ParameterTypes;
+
+ if (param_types.Length != ParameterTypes.Length)
+ return false;
+
+ for (int i = 0; i < param_types.Length; i++)
+ if (param_types [i] != ParameterTypes [i])
+ return false;
+
+ Report.SymbolRelatedToPreviousError (method);
+ Report.Error (111, Location, "Type '{0}' already defines a member called '{1}' with " +
+ "the same parameter types", Parent.Name, Name);
+ return true;
+ }
+
+ public new Location Location {
+ get {
+ return base.Location;
+ }
+ }
+
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { throw new InvalidOperationException ("Unexpected attempt to get doc comment from " + this.GetType () + "."); }
+ }
+
+ protected override void VerifyObsoleteAttribute()
+ {
+ }
+
}
//
{
static string[] attribute_targets = new string [] { "method", "return" };
+ public GetMethod (MethodCore method):
+ base (method, "get_")
+ {
+ }
+
public GetMethod (MethodCore method, Accessor accessor):
- base (method, accessor)
+ base (method, accessor, "get_")
{
}
public override MethodBuilder Define(TypeContainer container)
{
- method_data = new MethodData (method, method.ParameterInfo, method.ModFlags, method.flags, this);
+ base.Define (container);
+
+ method_data = new MethodData (method, method.ParameterInfo, ModFlags, flags, this);
if (!method_data.Define (container))
return null;
return String.Concat (base.GetSignatureForError (tc), ".get");
}
- public override string MethodName
- {
- get {
- return "get_" + method.ShortName;
- }
- }
-
public override Type ReturnType {
get {
return method.MemberType;
static string[] attribute_targets = new string [] { "method", "param", "return" };
ImplicitParameter param_attr;
+ public SetMethod (MethodCore method):
+ base (method, "set_")
+ {
+ }
+
public SetMethod (MethodCore method, Accessor accessor):
- base (method, accessor)
+ base (method, accessor, "set_")
{
}
base.ApplyAttributeBuilder (a, cb);
}
- protected virtual InternalParameters GetParameterInfo (TypeContainer container)
+ protected virtual InternalParameters GetParameterInfo (EmitContext ec)
{
Parameter [] parms = new Parameter [1];
parms [0] = new Parameter (method.Type, "value", Parameter.Modifier.NONE, null);
- return new InternalParameters (
- container, new Parameters (parms, null, method.Location));
+ Parameters parameters = new Parameters (parms, null, method.Location);
+ Type [] types = parameters.GetParameterInfo (ec);
+ return new InternalParameters (types, parameters);
}
public override MethodBuilder Define(TypeContainer container)
{
- method_data = new MethodData (method, GetParameterInfo (container), method.ModFlags, method.flags, this);
+ if (container.EmitContext == null)
+ throw new InternalErrorException ("SetMethod.Define called too early");
+
+ base.Define (container);
+
+ method_data = new MethodData (method, GetParameterInfo (container.EmitContext), ModFlags, flags, this);
if (!method_data.Define (container))
return null;
return String.Concat (base.GetSignatureForError (tc), ".set");
}
- public override string MethodName {
- get {
- return "set_" + method.ShortName;
- }
- }
-
public override Type[] ParameterTypes {
get {
return new Type[] { method.MemberType };
public abstract class PropertyMethod: AbstractPropertyEventMethod {
protected readonly MethodCore method;
+ protected MethodAttributes flags;
- public PropertyMethod (MethodCore method, Accessor accessor):
- base (accessor)
+ public PropertyMethod (MethodCore method, string prefix)
+ : base (method, prefix)
{
this.method = method;
}
+ public PropertyMethod (MethodCore method, Accessor accessor, string prefix)
+ : base (method, accessor, prefix)
+ {
+ this.method = method;
+ this.ModFlags = accessor.ModFlags;
+
+ if (accessor.ModFlags != 0 && RootContext.Version == LanguageVersion.ISO_1) {
+ Report.FeatureIsNotStandardized (Location, "accessor modifiers");
+ Environment.Exit (1);
+ }
+ }
+
public override AttributeTargets AttributeTargets {
get {
return AttributeTargets.Method;
}
}
- public abstract MethodBuilder Define (TypeContainer container);
-
- public override Type[] ParameterTypes {
- get {
- return TypeManager.NoTypes;
+ public virtual MethodBuilder Define (TypeContainer container)
+ {
+ //
+ // Check for custom access modifier
+ //
+ if (ModFlags == 0) {
+ ModFlags = method.ModFlags;
+ flags = method.flags;
+ } else {
+ CheckModifiers (container, ModFlags);
+ ModFlags |= (method.ModFlags & (~Modifiers.Accessibility));
+ flags = Modifiers.MethodAttr (ModFlags);
+ flags |= (method.flags & (~MethodAttributes.MemberAccessMask));
}
+
+ return null;
+
}
- public override Location Location {
+ public override Type[] ParameterTypes {
get {
- return method.Location;
+ return TypeManager.NoTypes;
}
}
{
return String.Concat (tc.Name, '.', method.Name);
}
+
+ void CheckModifiers (TypeContainer container, int modflags)
+ {
+ int flags = 0;
+ int mflags = method.ModFlags & Modifiers.Accessibility;
+
+ if ((mflags & Modifiers.PUBLIC) != 0) {
+ flags |= Modifiers.PROTECTED | Modifiers.INTERNAL | Modifiers.PRIVATE;
+ }
+ else if ((mflags & Modifiers.PROTECTED) != 0) {
+ if ((mflags & Modifiers.INTERNAL) != 0)
+ flags |= Modifiers.PROTECTED | Modifiers.INTERNAL;
+
+ flags |= Modifiers.PRIVATE;
+ }
+ else if ((mflags & Modifiers.INTERNAL) != 0)
+ flags |= Modifiers.PRIVATE;
+
+ if ((mflags == modflags) || (modflags & (~flags)) != 0)
+ Report.Error (273, Location, "{0}: accessibility modifier must be more restrictive than the property or indexer",
+ GetSignatureForError (container));
+ }
}
public PropertyMethod Get, Set;
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
+ a.Error_InvalidSecurityParent ();
+ return;
+ }
+
PropertyBuilder.SetCustomAttribute (cb);
}
}
}
- protected override bool DoDefine (DeclSpace decl)
+ public override bool Define ()
{
- if (!base.DoDefine (decl))
+ if (!DoDefine (Parent))
return false;
- if (MemberType == TypeManager.arg_iterator_type || MemberType == TypeManager.typed_reference_type) {
- Report.Error (610, Location, "Field or property cannot be of type '{0}'", TypeManager.CSharpName (MemberType));
+ if (!IsTypePermitted ())
+ return false;
+
+ return true;
+ }
+
+ protected override bool DoDefine (DeclSpace ds)
+ {
+ if (!base.DoDefine (ds))
+ return false;
+
+ //
+ // Accessors modifiers check
+ //
+ if (Get.ModFlags != 0 && Set.ModFlags != 0) {
+ Report.Error (274, Location, "'{0}': cannot specify accessibility modifiers for both accessors of the property or indexer.",
+ GetSignatureForError ());
return false;
}
- ec = new EmitContext (Parent, Location, null, MemberType, ModFlags);
+ if ((Get.IsDummy || Set.IsDummy)
+ && (Get.ModFlags != 0 || Set.ModFlags != 0) && (ModFlags & Modifiers.OVERRIDE) == 0) {
+ Report.Error (276, Location,
+ "'{0}': accessibility modifiers on accessors may only be used if the property or indexer has both a get and a set accessor.",
+ GetSignatureForError ());
+ return false;
+ }
+
+ if (MemberType.IsAbstract && MemberType.IsSealed) {
+ Report.Error (722, Location, Error722, TypeManager.CSharpName (MemberType));
+ return false;
+ }
+ ec = new EmitContext (Parent, Location, null, MemberType, ModFlags);
return true;
}
public override string GetSignatureForError()
{
+ if (PropertyBuilder == null)
+ return GetSignatureForError (Parent);
+
return TypeManager.CSharpSignature (PropertyBuilder, false);
}
protected override bool CheckForDuplications ()
{
- ArrayList ar = Parent.Properties;
+ ArrayList ar = Parent.Indexers;
if (ar != null) {
int arLen = ar.Count;
for (int i = 0; i < arLen; i++) {
- Property m = (Property) ar [i];
+ Indexer m = (Indexer) ar [i];
if (IsDuplicateImplementation (m))
return false;
}
}
- return true;
+
+ ar = Parent.Properties;
+ if (ar != null) {
+ int arLen = ar.Count;
+
+ for (int i = 0; i < arLen; i++) {
+ Property m = (Property) ar [i];
+ if (IsDuplicateImplementation (m))
+ return false;
+ }
}
+ return true;
+ }
+
+ // TODO: rename to Resolve......
protected override MethodInfo FindOutParentMethod (TypeContainer container, ref Type parent_ret_type)
{
- PropertyInfo parent_property = container.ParentContainer.MemberCache.FindMemberToOverride (
+ PropertyInfo parent_property = container.ParentCache.FindMemberToOverride (
container.TypeBuilder, Name, ParameterTypes, true) as PropertyInfo;
if (parent_property == null)
return null;
parent_ret_type = parent_property.PropertyType;
+ MethodInfo get_accessor = parent_property.GetGetMethod (true);
+ MethodInfo set_accessor = parent_property.GetSetMethod (true);
+ MethodAttributes get_accessor_access, set_accessor_access;
- MethodInfo temp_m;
- temp_m = parent_property.GetGetMethod (true);
- if (temp_m != null)
- return temp_m;
+ if ((ModFlags & Modifiers.OVERRIDE) != 0) {
+ if (Get != null && !Get.IsDummy && get_accessor == null) {
+ Report.SymbolRelatedToPreviousError (parent_property);
+ Report.Error (545, Location, "'{0}': cannot override because '{1}' does not have an overridable get accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (parent_property));
+ }
- System.Diagnostics.Debug.Assert (parent_property.GetSetMethod (true) != null, "Internal error property without get/set");
- return parent_property.GetSetMethod (true);
+ if (Set != null && !Set.IsDummy && set_accessor == null) {
+ Report.SymbolRelatedToPreviousError (parent_property);
+ Report.Error (546, Location, "'{0}': cannot override because '{1}' does not have an overridable set accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (parent_property));
+ }
+ }
+
+ //
+ // Check parent accessors access
+ //
+ get_accessor_access = set_accessor_access = 0;
+ if ((ModFlags & Modifiers.NEW) == 0) {
+ if (get_accessor != null) {
+ MethodAttributes get_flags = Modifiers.MethodAttr (Get.ModFlags != 0 ? Get.ModFlags : ModFlags);
+ get_accessor_access = (get_accessor.Attributes & MethodAttributes.MemberAccessMask);
+
+ if (!Get.IsDummy && !CheckAccessModifiers (get_flags & MethodAttributes.MemberAccessMask, get_accessor_access, get_accessor))
+ Report.Error (507, Location, "'{0}' can't change the access modifiers when overriding inherited member '{1}'",
+ GetSignatureForError (), TypeManager.GetFullNameSignature (parent_property));
+ }
+
+ if (set_accessor != null) {
+ MethodAttributes set_flags = Modifiers.MethodAttr (Set.ModFlags != 0 ? Set.ModFlags : ModFlags);
+ set_accessor_access = (set_accessor.Attributes & MethodAttributes.MemberAccessMask);
+
+ if (!Set.IsDummy && !CheckAccessModifiers (set_flags & MethodAttributes.MemberAccessMask, set_accessor_access, set_accessor))
+ Report.Error (507, Location, "'{0}' can't change the access modifiers when overriding inherited member '{1}'",
+ GetSignatureForError (container), TypeManager.GetFullNameSignature (parent_property));
+ }
+ }
+
+ //
+ // Get the less restrictive access
+ //
+ return get_accessor_access > set_accessor_access ? get_accessor : set_accessor;
}
public override void Emit ()
if (PropertyBuilder != null && OptAttributes != null)
OptAttributes.Emit (ec, this);
- if (Get != null)
+ if (!Get.IsDummy)
Get.Emit (Parent);
- if (Set != null)
+ if (!Set.IsDummy)
Set.Emit (Parent);
base.Emit ();
}
+ /// <summary>
+ /// Tests whether accessors are not in collision with some method (CS0111)
+ /// </summary>
+ public bool AreAccessorsDuplicateImplementation (MethodCore mc)
+ {
+ return Get.IsDuplicateImplementation (mc) || Set.IsDuplicateImplementation (mc);
+ }
+
+ protected override void UpdateMemberName ()
+ {
+ base.UpdateMemberName ();
+
+ Get.UpdateName (this);
+ Set.UpdateName (this);
+ }
+
+
public override string[] ValidAttributeTargets {
get {
return attribute_targets;
}
}
+
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { return "P:"; }
+ }
}
public class Property : PropertyBase, IIteratorContainer {
is_iface, name, Parameters.EmptyReadOnlyParameters, attrs,
loc)
{
- if (get_block != null)
+ if (get_block == null)
+ Get = new GetMethod (this);
+ else
Get = new GetMethod (this, get_block);
- if (set_block != null)
+ if (set_block == null)
+ Set = new SetMethod (this);
+ else
Set = new SetMethod (this, set_block);
}
if (!DoDefineBase ())
return false;
- if (!DoDefine (Parent))
+ if (!base.Define ())
return false;
if (!CheckBase ())
flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
- if (Get != null) {
+ if (!Get.IsDummy) {
GetBuilder = Get.Define (Parent);
if (GetBuilder == null)
}
}
- if (Set != null) {
+ if (!Set.IsDummy) {
SetBuilder = Set.Define (Parent);
if (SetBuilder == null)
return false;
prop_attr |= PropertyAttributes.RTSpecialName |
PropertyAttributes.SpecialName;
- if (!IsExplicitImpl){
PropertyBuilder = Parent.TypeBuilder.DefineProperty (
Name, prop_attr, MemberType, null);
- if (Get != null)
+ if (!Get.IsDummy)
PropertyBuilder.SetGetMethod (GetBuilder);
- if (Set != null)
+ if (!Set.IsDummy)
PropertyBuilder.SetSetMethod (SetBuilder);
- //
- // HACK for the reasons exposed above
- //
- if (!TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder)) {
- Report.Error (
- 111, Location,
- "Class `" + Parent.Name +
- "' already contains a definition for the property `" +
- Name + "'");
- return false;
- }
- }
+ TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
return true;
}
{
Add = new AddDelegateMethod (this, add);
Remove = new RemoveDelegateMethod (this, remove);
+
+ // For this event syntax we don't report error CS0067
+ // because it is hard to do it.
+ SetAssigned ();
}
public override string[] ValidAttributeTargets {
public class EventField: Event {
static string[] attribute_targets = new string [] { "event", "field", "method" };
+ static string[] attribute_targets_interface = new string[] { "event", "method" };
public EventField (TypeContainer parent, Expression type, int mod_flags,
bool is_iface, MemberName name, Object init,
}
if (a.Target == AttributeTargets.Method) {
- AddBuilder.SetCustomAttribute (cb);
- RemoveBuilder.SetCustomAttribute (cb);
+ Add.ApplyAttributeBuilder (a, cb);
+ Remove.ApplyAttributeBuilder (a, cb);
return;
}
public override string[] ValidAttributeTargets {
get {
- return attribute_targets;
+ return IsInterface ? attribute_targets_interface : attribute_targets;
}
}
}
protected sealed class AddDelegateMethod: DelegateMethod
{
+
public AddDelegateMethod (Event method):
- base (method)
+ base (method, "add_")
{
}
public AddDelegateMethod (Event method, Accessor accessor):
- base (method, accessor)
+ base (method, accessor, "add_")
{
}
- public override string MethodName {
- get {
- return "add_" + method.ShortName;
- }
- }
-
protected override MethodInfo DelegateMethodInfo {
get {
return TypeManager.delegate_combine_delegate_delegate;
protected sealed class RemoveDelegateMethod: DelegateMethod
{
public RemoveDelegateMethod (Event method):
- base (method)
+ base (method, "remove_")
{
}
public RemoveDelegateMethod (Event method, Accessor accessor):
- base (method, accessor)
+ base (method, accessor, "remove_")
{
}
- public override string MethodName {
- get {
- return "remove_" + method.ShortName;
- }
- }
-
protected override MethodInfo DelegateMethodInfo {
get {
return TypeManager.delegate_remove_delegate_delegate;
static string[] attribute_targets = new string [] { "method", "param", "return" };
- public DelegateMethod (Event method)
+ public DelegateMethod (Event method, string prefix)
+ : base (method, prefix)
{
this.method = method;
}
- public DelegateMethod (Event method, Accessor accessor):
- base (accessor)
+ public DelegateMethod (Event method, Accessor accessor, string prefix)
+ : base (method, accessor, prefix)
{
this.method = method;
}
}
}
- public override Location Location {
- get {
- return method.Location;
- }
- }
-
public override EmitContext CreateEmitContext (TypeContainer tc,
ILGenerator ig)
{
const int AllowedInterfaceModifiers =
Modifiers.NEW;
- protected DelegateMethod Add, Remove;
+ public DelegateMethod Add, Remove;
public MyEventBuilder EventBuilder;
public MethodBuilder AddBuilder, RemoveBuilder;
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type)) {
+ a.Error_InvalidSecurityParent ();
+ return;
+ }
+
EventBuilder.SetCustomAttribute (cb);
}
+ public bool AreAccessorsDuplicateImplementation (MethodCore mc)
+ {
+ return Add.IsDuplicateImplementation (mc) || Remove.IsDuplicateImplementation (mc);
+ }
+
public override AttributeTargets AttributeTargets {
get {
return AttributeTargets.Event;
{
EventAttributes e_attr;
e_attr = EventAttributes.None;
-;
+
if (!DoDefineBase ())
return false;
return false;
}
+ EmitContext ec = Parent.EmitContext;
+ if (ec == null)
+ throw new InternalErrorException ("Event.Define called too early?");
+ bool old_unsafe = ec.InUnsafe;
+ ec.InUnsafe = InUnsafe;
+
Parameter [] parms = new Parameter [1];
parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
- InternalParameters ip = new InternalParameters (
- Parent, new Parameters (parms, null, Location));
+ Parameters parameters = new Parameters (parms, null, Location);
+ Type [] types = parameters.GetParameterInfo (ec);
+ InternalParameters ip = new InternalParameters (types, parameters);
+
+ ec.InUnsafe = old_unsafe;
if (!CheckBase ())
return false;
if (RemoveBuilder == null)
return false;
- if (!IsExplicitImpl){
- EventBuilder = new MyEventBuilder (this,
- Parent.TypeBuilder, Name, e_attr, MemberType);
+ EventBuilder = new MyEventBuilder (this, Parent.TypeBuilder, Name, e_attr, MemberType);
- if (Add.Block == null && Remove.Block == null &&
- !IsInterface) {
+ if (Add.Block == null && Remove.Block == null && !IsInterface) {
FieldBuilder = Parent.TypeBuilder.DefineField (
Name, MemberType,
FieldAttributes.Private | ((ModFlags & Modifiers.STATIC) != 0 ? FieldAttributes.Static : 0));
EventBuilder.SetAddOnMethod (AddBuilder);
EventBuilder.SetRemoveOnMethod (RemoveBuilder);
- if (!TypeManager.RegisterEvent (EventBuilder, AddBuilder, RemoveBuilder)) {
- Report.Error (111, Location,
- "Class `" + Parent.Name +
- "' already contains a definition for the event `" +
- Name + "'");
- return false;
- }
- }
-
+ TypeManager.RegisterEvent (EventBuilder, AddBuilder, RemoveBuilder);
return true;
}
public override string GetSignatureForError ()
{
+ if (EventBuilder == null)
+ return base.GetSignatureForError (Parent);
+
return TypeManager.GetFullNameSignature (EventBuilder);
}
+
+ //
+ // Represents header string for documentation comment.
+ //
+ public override string DocCommentHeader {
+ get { return "E:"; }
+ }
}
- //
- // FIXME: This does not handle:
- //
- // int INTERFACENAME [ args ]
- // Does not
- //
- // Only:
- //
- // int this [ args ]
public class Indexer : PropertyBase {
class GetIndexerMethod: GetMethod
{
+ public GetIndexerMethod (MethodCore method):
+ base (method)
+ {
+ }
+
public GetIndexerMethod (MethodCore method, Accessor accessor):
base (method, accessor)
{
{
readonly Parameters parameters;
+ public SetIndexerMethod (MethodCore method):
+ base (method)
+ {
+ }
+
public SetIndexerMethod (MethodCore method, Parameters parameters, Accessor accessor):
base (method, accessor)
{
}
}
- protected override InternalParameters GetParameterInfo (TypeContainer container)
+ protected override InternalParameters GetParameterInfo (EmitContext ec)
{
Parameter [] fixed_parms = parameters.FixedParameters;
method.Type, "value", Parameter.Modifier.NONE, null);
Parameters set_formal_params = new Parameters (tmp, null, method.Location);
+ Type [] types = set_formal_params.GetParameterInfo (ec);
- return new InternalParameters (container, set_formal_params);
+ return new InternalParameters (types, set_formal_params);
}
-
}
-
const int AllowedModifiers =
Modifiers.NEW |
Modifiers.PUBLIC |
const int AllowedInterfaceModifiers =
Modifiers.NEW;
- public string IndexerName = TypeContainer.DefaultIndexerName;
- public string InterfaceIndexerName;
-
//
// Are we implementing an interface ?
//
- public Indexer (TypeContainer parent, Expression type, int mod_flags,
- bool is_iface, MemberName name, Parameters parameters,
- Attributes attrs, Accessor get_block, Accessor set_block,
- Location loc)
- : base (parent, type, mod_flags,
+ public Indexer (TypeContainer parent, Expression type, MemberName name, int mod,
+ bool is_iface, Parameters parameters, Attributes attrs,
+ Accessor get_block, Accessor set_block, Location loc)
+ : base (parent, type, mod,
is_iface ? AllowedInterfaceModifiers : AllowedModifiers,
is_iface, name, parameters, attrs, loc)
{
- if (get_block != null)
+ if (get_block == null)
+ Get = new GetIndexerMethod (this);
+ else
Get = new GetIndexerMethod (this, get_block);
- if (set_block != null)
+ if (set_block == null)
+ Set = new SetIndexerMethod (this);
+ else
Set = new SetIndexerMethod (this, parameters, set_block);
}
if (!DoDefineBase ())
return false;
- if (!DoDefine (Parent))
+ if (!base.Define ())
return false;
if (OptAttributes != null) {
- Attribute indexer_attr = OptAttributes.GetIndexerNameAttribute (ec);
+ Attribute indexer_attr = OptAttributes.Search (TypeManager.indexer_name_type, ec);
if (indexer_attr != null) {
- IndexerName = indexer_attr.GetIndexerAttributeValue (ec);
+ // Remove the attribute from the list because it is not emitted
+ OptAttributes.Attrs.Remove (indexer_attr);
+
+ ShortName = indexer_attr.GetIndexerAttributeValue (ec);
+
if (IsExplicitImpl) {
- // The 'IndexerName' attribute is valid only on an indexer that is not an explicit interface member declaration
- Report.Error (415, indexer_attr.Location, "The 'IndexerName' attribute is valid only on an indexer that is not an explicit interface member declaration");
+ Report.Error (415, indexer_attr.Location,
+ "The 'IndexerName' attribute is valid only on an" +
+ "indexer that is not an explicit interface member declaration");
return false;
}
if ((ModFlags & Modifiers.OVERRIDE) != 0) {
- Report.Error (609, indexer_attr.Location, "Cannot set the 'IndexerName' attribute on an indexer marked override");
+ Report.Error (609, indexer_attr.Location,
+ "Cannot set the 'IndexerName' attribute on an indexer marked override");
return false;
}
- if (!Tokenizer.IsValidIdentifier (IndexerName)) {
- // The argument to the 'IndexerName' attribute must be a valid identifier
- Report.Error (633, indexer_attr.Location, "The argument to the 'IndexerName' attribute must be a valid identifier");
+ if (!Tokenizer.IsValidIdentifier (ShortName)) {
+ Report.Error (633, indexer_attr.Location,
+ "The argument to the 'IndexerName' attribute must be a valid identifier");
return false;
}
+
+ UpdateMemberName ();
}
}
- ShortName = IndexerName;
- if (IsExplicitImpl) {
- InterfaceIndexerName = TypeManager.IndexerPropertyName (InterfaceType);
- Name = InterfaceType.FullName + "." + IndexerName;
- } else {
- InterfaceIndexerName = IndexerName;
- Name = ShortName;
+ if (InterfaceType != null) {
+ string parent_IndexerName = TypeManager.IndexerPropertyName (InterfaceType);
+ if (parent_IndexerName != Name)
+ ShortName = parent_IndexerName;
+ UpdateMemberName ();
}
- if (!CheckNameCollision (Parent))
+ if (!Parent.AddToMemberContainer (this, true) ||
+ !Parent.AddToMemberContainer (Get, true) || !Parent.AddToMemberContainer (Set, true))
return false;
if (!CheckBase ())
return false;
flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
- if (Get != null){
+ if (!Get.IsDummy){
GetBuilder = Get.Define (Parent);
if (GetBuilder == null)
return false;
}
- if (Set != null){
+ if (!Set.IsDummy){
SetBuilder = Set.Define (Parent);
if (SetBuilder == null)
return false;
//
Parameter [] p = Parameters.FixedParameters;
if (p != null) {
+ if ((p [0].ModFlags & Parameter.Modifier.ISBYREF) != 0) {
+ Report.Error (631, Location, "ref and out are not valid in this context");
+ return false;
+ }
+
int i;
for (i = 0; i < p.Length; ++i) {
- if (Get != null)
+ if (!Get.IsDummy)
GetBuilder.DefineParameter (
i + 1, p [i].Attributes, p [i].Name);
- if (Set != null)
+ if (!Set.IsDummy)
SetBuilder.DefineParameter (
i + 1, p [i].Attributes, p [i].Name);
}
- if (Set != null)
+ if (!Set.IsDummy)
SetBuilder.DefineParameter (
i + 1, ParameterAttributes.None, "value");
}
}
- //
- // Define the PropertyBuilder if one of the following conditions are met:
- // a) we're not implementing an interface indexer.
- // b) the indexer has a different IndexerName and this is no
- // explicit interface implementation.
- //
- if (!IsExplicitImpl) {
PropertyBuilder = Parent.TypeBuilder.DefineProperty (
- IndexerName, prop_attr, MemberType, ParameterTypes);
+ Name, prop_attr, MemberType, ParameterTypes);
- if (Get != null)
+ if (!Get.IsDummy)
PropertyBuilder.SetGetMethod (GetBuilder);
- if (Set != null)
+ if (!Set.IsDummy)
PropertyBuilder.SetSetMethod (SetBuilder);
- TypeManager.RegisterIndexer (PropertyBuilder, GetBuilder, SetBuilder,
- ParameterTypes);
- }
-
- return true;
- }
-
- bool CheckNameCollision (TypeContainer container) {
- switch (VerifyName (container)){
- case DeclSpace.AdditionResult.NameExists:
- Report.Error (102, Location, "The container '{0}' already contains a definition for '{1}'", container.GetSignatureForError (), Name);
- return false;
-
- case DeclSpace.AdditionResult.Success:
- return true;
- }
- throw new NotImplementedException ();
- }
-
- DeclSpace.AdditionResult VerifyName (TypeContainer container) {
- if (!AddIndexer (container, container.Name + "." + Name))
- return DeclSpace.AdditionResult.NameExists;
+ TypeManager.RegisterIndexer (PropertyBuilder, GetBuilder, SetBuilder, ParameterTypes);
- if (Get != null) {
- if (!AddIndexer (container, container.Name + ".get_" + Name))
- return DeclSpace.AdditionResult.NameExists;
- }
-
- if (Set != null) {
- if (!AddIndexer (container, container.Name + ".set_" + Name))
- return DeclSpace.AdditionResult.NameExists;
- }
- return DeclSpace.AdditionResult.Success;
- }
-
- bool AddIndexer (TypeContainer container, string fullname)
- {
- object value = container.GetDefinition (fullname);
-
- if (value != null) {
- return value.GetType () != GetType () ? false : true;
- }
-
- container.DefineName (fullname, this);
return true;
}
public override string GetSignatureForError ()
{
+ if (PropertyBuilder == null)
+ return GetSignatureForError (Parent);
+
return TypeManager.CSharpSignature (PropertyBuilder, true);
}
public override string GetSignatureForError(TypeContainer tc)
{
- return String.Concat (tc.Name, ".this[", TypeManager.CSharpName (ParameterTypes [0]), ']');
+ return String.Concat (tc.Name, ".this[", Parameters.FixedParameters [0].TypeName.ToString (), ']');
}
}
- public class Operator : MemberBase, IIteratorContainer {
+ public class Operator : MethodCore, IIteratorContainer {
const int AllowedModifiers =
Modifiers.PUBLIC |
Modifiers.EXTERN |
Modifiers.STATIC;
- const int RequiredModifiers =
- Modifiers.PUBLIC |
- Modifiers.STATIC;
-
public enum OpType : byte {
// Unary operators
};
public readonly OpType OperatorType;
- public readonly Expression ReturnType;
- public readonly Expression FirstArgType, SecondArgType;
- public readonly string FirstArgName, SecondArgName;
- public Block Block;
public MethodBuilder OperatorMethodBuilder;
- public string MethodName;
public Method OperatorMethod;
static string[] attribute_targets = new string [] { "method", "return" };
public Operator (TypeContainer parent, OpType type, Expression ret_type,
- int mod_flags, Expression arg1type, string arg1name,
- Expression arg2type, string arg2name,
- Block block, Attributes attrs, Location loc)
- : base (parent, ret_type, mod_flags, AllowedModifiers,
- Modifiers.PUBLIC, MemberName.Null, attrs, loc)
+ int mod_flags, Parameters parameters,
+ ToplevelBlock block, Attributes attrs, Location loc)
+ : base (parent, null, ret_type, mod_flags, AllowedModifiers, false,
+ new MemberName ("op_" + type), attrs, parameters, loc)
{
OperatorType = type;
- Name = "op_" + OperatorType;
- ReturnType = ret_type;
- FirstArgType = arg1type;
- FirstArgName = arg1name;
- SecondArgType = arg2type;
- SecondArgName = arg2name;
Block = block;
}
- string Prototype (TypeContainer container)
- {
- return container.Name + ".operator " + OperatorType + " (" + FirstArgType + "," +
- SecondArgType + ")";
- }
-
public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
{
OperatorMethod.ApplyAttributeBuilder (a, cb);
return true;
}
- public override bool Define ()
+ protected override bool CheckForDuplications()
{
- int length = 1;
- MethodName = "op_" + OperatorType;
-
- if (SecondArgType != null)
- length = 2;
-
- Parameter [] param_list = new Parameter [length];
+ ArrayList ar = Parent.Operators;
+ if (ar != null) {
+ int arLen = ar.Count;
+ for (int i = 0; i < arLen; i++) {
+ Operator o = (Operator) ar [i];
+ if (IsDuplicateImplementation (o))
+ return false;
+ }
+ }
+
+ ar = Parent.Methods;
+ if (ar != null) {
+ int arLen = ar.Count;
+
+ for (int i = 0; i < arLen; i++) {
+ Method m = (Method) ar [i];
+ if (IsDuplicateImplementation (m))
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public override bool Define ()
+ {
+ const int RequiredModifiers = Modifiers.PUBLIC | Modifiers.STATIC;
if ((ModFlags & RequiredModifiers) != RequiredModifiers){
- Report.Error (
- 558, Location,
- "User defined operators `" +
- Prototype (Parent) +
- "' must be declared static and public");
+ Report.Error (558, Location, "User defined operators '{0}' must be declared static and public", GetSignatureForError (Parent));
return false;
}
- param_list[0] = new Parameter (FirstArgType, FirstArgName,
- Parameter.Modifier.NONE, null);
- if (SecondArgType != null)
- param_list[1] = new Parameter (SecondArgType, SecondArgName,
- Parameter.Modifier.NONE, null);
-
+ if (!DoDefine (ds))
+ return false;
+
OperatorMethod = new Method (
- Parent, null, ReturnType, ModFlags, false,
- new MemberName (MethodName),
- new Parameters (param_list, null, Location),
- OptAttributes, Location);
+ Parent, null, Type, ModFlags, false, MemberName,
+ Parameters, OptAttributes, Location);
OperatorMethod.Block = Block;
OperatorMethod.IsOperator = true;
OperatorMethodBuilder = OperatorMethod.MethodBuilder;
- Type [] param_types = OperatorMethod.ParameterTypes;
+ parameter_types = OperatorMethod.ParameterTypes;
Type declaring_type = OperatorMethod.MethodData.DeclaringType;
- Type return_type = OperatorMethod.GetReturnType ();
- Type first_arg_type = param_types [0];
+ Type return_type = OperatorMethod.ReturnType;
+ Type first_arg_type = parameter_types [0];
+
+ if (!CheckBase ())
+ return false;
// Rules for conversion operators
Report.Error (554, Location, "'{0}' : user defined conversion to/from derived class", GetSignatureForError ());
return false;
}
- } else if (SecondArgType == null) {
+ } else if (OperatorType == OpType.LeftShift || OperatorType == OpType.RightShift) {
+ if (first_arg_type != declaring_type || parameter_types [1] != TypeManager.int32_type) {
+ Report.Error (564, Location, "Overloaded shift operator must have the type of the first operand be the containing type, and the type of the second operand must be int");
+ return false;
+ }
+ } else if (Parameters.FixedParameters.Length == 1) {
// Checks for Unary operators
+ if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
+ if (return_type != declaring_type && !return_type.IsSubclassOf (declaring_type)) {
+ Report.Error (448, Location,
+ "The return type for ++ or -- operator must be the containing type or derived from the containing type");
+ return false;
+ }
if (first_arg_type != declaring_type){
Report.Error (
- 562, Location,
- "The parameter of a unary operator must be the " +
- "containing type");
+ 559, Location, "The parameter type for ++ or -- operator must be the containing type");
return false;
}
+ }
- if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
- if (return_type != declaring_type){
+ if (first_arg_type != declaring_type){
Report.Error (
- 559, Location,
- "The parameter and return type for ++ and -- " +
- "must be the containing type");
+ 562, Location,
+ "The parameter of a unary operator must be the " +
+ "containing type");
return false;
- }
-
}
if (OperatorType == OpType.True || OperatorType == OpType.False) {
// Checks for Binary operators
if (first_arg_type != declaring_type &&
- param_types [1] != declaring_type){
+ parameter_types [1] != declaring_type){
Report.Error (
563, Location,
"One of the parameters of a binary operator must " +
Block = null;
}
+ // Operator cannot be override
+ protected override MethodInfo FindOutParentMethod (TypeContainer container, ref Type parent_ret_type)
+ {
+ return null;
+ }
+
public static string GetName (OpType ot)
{
switch (ot){
}
}
- public override string GetSignatureForError(TypeContainer tc)
+ public override string GetSignatureForError (TypeContainer tc)
{
- return ToString ();
+ StringBuilder sb = new StringBuilder ();
+ sb.AppendFormat ("{0}.operator {1} {2}({3}", tc.Name, GetName (OperatorType), Type.Type == null ? Type.ToString () : TypeManager.CSharpName (Type.Type),
+ Parameters.FixedParameters [0].GetSignatureForError ());
+
+ if (Parameters.FixedParameters.Length > 1) {
+ sb.Append (",");
+ sb.Append (Parameters.FixedParameters [1].GetSignatureForError ());
+ }
+ sb.Append (")");
+ return sb.ToString ();
}
- public override string GetSignatureForError()
+ public override string GetSignatureForError ()
{
return ToString ();
}
public override string ToString ()
{
- Type return_type = OperatorMethod.GetReturnType();
+ if (OperatorMethod == null)
+ return Name;
+
+ Type return_type = OperatorMethod.ReturnType;
Type [] param_types = OperatorMethod.ParameterTypes;
- if (SecondArgType == null)
+ if (Parameters.FixedParameters.Length == 1)
return String.Format (
"{0} operator {1}({2})",
TypeManager.CSharpName (return_type),
projects / mono.git / blobdiff