/// </summary>
public abstract class TypeContainer : DeclSpace, IMemberContainer {
- protected class CircularDepException: Exception
- {
- public TypeContainer Container;
- public CircularDepException (TypeContainer tc)
- {
- Container = tc;
- }
- }
-
public class MemberCoreArrayList: ArrayList
{
/// <summary>
}
}
- public class MethodArrayList: MemberCoreArrayList
+ public class MethodArrayList : MemberCoreArrayList
{
[Flags]
enum CachedMethods {
{
base.DefineContainerMembers ();
- if ((RootContext.WarningLevel >= 3) && HasEquals && !HasGetHashCode) {
- Report.Warning (659, container.Location, "'{0}' overrides Object.Equals(object) but does not override Object.GetHashCode()", container.GetSignatureForError ());
+ if (HasEquals && !HasGetHashCode) {
+ Report.Warning (659, 3, container.Location, "`{0}' overrides Object.Equals(object) but does not override Object.GetHashCode()", container.GetSignatureForError ());
}
}
}
- public sealed class IndexerArrayList: MemberCoreArrayList
+ public sealed class IndexerArrayList : MemberCoreArrayList
{
/// <summary>
/// The indexer name for this container
//
void CheckPairedOperators ()
{
- Hashtable pairs = new Hashtable (null, null);
+ IDictionary pairs = new HybridDictionary ();
Operator true_op = null;
Operator false_op = null;
bool has_equality_or_inequality = false;
if (true_op != null){
if (false_op == null)
- Report.Error (216, true_op.Location, "operator true requires a matching operator false");
+ Report.Error (216, true_op.Location, "The operator `{0}' requires a matching operator `false' to also be defined",
+ true_op.GetSignatureForError ());
} else if (false_op != null)
- Report.Error (216, false_op.Location, "operator false requires a matching operator true");
+ Report.Error (216, false_op.Location, "The operator `{0}' requires a matching operator `true' to also be defined",
+ false_op.GetSignatureForError ());
//
// Look for the mistakes.
break;
}
Report.Error (216, oe.op.Location,
- "The operator `" + oe.op + "' requires a matching operator `" + s + "' to also be defined");
+ "The operator `{0}' requires a matching operator `{1}' to also be defined",
+ oe.op.GetSignatureForError (), s);
}
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 ());
+ Report.Warning (660, 2, container.Location, "`{0}' defines operator == or operator != but does not override Object.Equals(object o)", container.GetSignatureForError ());
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 ());
+ Report.Warning (661, 2, container.Location, "`{0}' defines operator == or operator != but does not override Object.GetHashCode()", container.GetSignatureForError ());
}
}
protected Constructor default_static_constructor;
//
- // Whether we have at least one non-static field
+ // Points to the first non-static field added to the container.
//
- bool have_nonstatic_fields = false;
-
+ // This is an arbitrary choice. We are interested in looking at _some_ non-static field,
+ // and the first one's as good as any.
+ //
+ FieldBase first_nonstatic_field = null;
+
//
// This one is computed after we can distinguish interfaces
// from classes from the arraylist `type_bases'
Type GenericType;
GenericTypeParameterBuilder[] gen_params;
- // This is used to catch recursive definitions in declarations.
- protected bool InTransit;
-
public TypeContainer (NamespaceEntry ns, TypeContainer parent, MemberName name,
- Attributes attrs, Kind kind, Location l)
- : base (ns, parent, name, attrs, l)
+ Attributes attrs, Kind kind)
+ : base (ns, parent, name, attrs)
{
if (parent != null && parent != RootContext.Tree.Types && parent.NamespaceEntry != ns)
throw new InternalErrorException ("A nested type should be in the same NamespaceEntry as its enclosing class");
public bool AddToMemberContainer (MemberCore symbol)
{
- return AddToContainer (symbol, symbol.Name);
+ return AddToContainer (symbol, symbol.MemberName.MethodName);
}
- bool AddToTypeContainer (DeclSpace ds)
+ protected virtual bool AddToTypeContainer (DeclSpace ds)
{
- // Parent == null ==> this == RootContext.Tree.Types
- return AddToContainer (ds, (Parent == null) ? ds.Name : ds.Basename);
+ return AddToContainer (ds, ds.Basename);
}
public void AddConstant (Const constant)
enums.Add (e);
}
- public void AddClassOrStruct (TypeContainer c)
+ public bool AddClassOrStruct (TypeContainer c)
{
if (!AddToTypeContainer (c))
- return;
+ return false;
types.Add (c);
+ return true;
}
public void AddDelegate (Delegate d)
methods.Add (method);
}
+ //
+ // Do not use this method: use AddMethod.
+ //
+ // This is only used by iterators.
+ //
+ public void AppendMethod (Method method)
+ {
+ if (!AddToMemberContainer (method))
+ return;
+
+ if (methods == null)
+ methods = new MethodArrayList (this);
+
+ methods.Add (method);
+ }
+
public void AddConstructor (Constructor c)
{
if (c.Name != MemberName.Name) {
if (is_static){
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);
+ Report.Error (111, c.Location, Error111, c.GetSignatureForError ());
return;
}
if (c.IsDefault ()){
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);
+ Report.Error (111, c.Location, Error111, c.GetSignatureForError ());
return;
}
default_constructor = c;
instance_constructors.Add (c);
}
}
+
+ internal static string Error111 {
+ get {
+ return "`{0}' is already defined. Rename this member or use different parameter types";
+ }
+ }
- public void AddInterface (TypeContainer iface)
+ public bool AddInterface (TypeContainer iface)
{
if (!AddToTypeContainer (iface))
- return;
+ return false;
if (interfaces == null) {
interfaces = new MemberCoreArrayList ();
}
interfaces.Add (iface);
+ return true;
}
public void AddField (FieldMember field)
if (fields == null)
fields = new MemberCoreArrayList ();
-
+
fields.Add (field);
- if (field.HasInitializer){
- if ((field.ModFlags & Modifiers.STATIC) != 0){
- if (initialized_static_fields == null)
- initialized_static_fields = new ArrayList ();
-
- initialized_static_fields.Add (field);
+ if ((field.ModFlags & Modifiers.STATIC) != 0)
+ return;
- } else {
- if (initialized_fields == null)
- initialized_fields = new ArrayList ();
-
- initialized_fields.Add (field);
- }
+ if (first_nonstatic_field == null) {
+ first_nonstatic_field = field;
+ return;
}
- if ((field.ModFlags & Modifiers.STATIC) == 0)
- have_nonstatic_fields = true;
+ if (Kind == Kind.Struct &&
+ first_nonstatic_field.Parent != field.Parent &&
+ RootContext.WarningLevel >= 3) {
+ Report.SymbolRelatedToPreviousError (first_nonstatic_field.Parent);
+ Report.Warning (282, 3, field.Location,
+ "struct instance field `{0}' found in different declaration from instance field `{1}'",
+ field.GetSignatureForError (), first_nonstatic_field.GetSignatureForError ());
+ }
}
public void AddProperty (Property prop)
{
if (a.Type == TypeManager.default_member_type) {
if (Indexers != null) {
- Report.Error (646, a.Location,
- "Cannot specify the DefaultMember attribute on" +
- " a type containing an indexer");
+ Report.Error (646, a.Location, "Cannot specify the `DefaultMember' attribute on type containing an indexer");
return;
}
}
}
}
+ public bool IsComImport {
+ get {
+ if (OptAttributes == null)
+ return false;
+
+ return OptAttributes.Contains (TypeManager.comimport_attr_type, EmitContext);
+ }
+ }
+
+ public virtual void RegisterFieldForInitialization (FieldBase field)
+ {
+ if ((field.ModFlags & Modifiers.STATIC) != 0){
+ if (initialized_static_fields == null)
+ initialized_static_fields = new ArrayList (4);
+
+ initialized_static_fields.Add (field);
+ } else {
+ if (initialized_fields == null)
+ initialized_fields = new ArrayList (4);
+
+ initialized_fields.Add (field);
+ }
+ }
+
//
// Emits the instance field initializers
//
public virtual bool EmitFieldInitializers (EmitContext ec)
{
ArrayList fields;
- Expression instance_expr;
if (ec.IsStatic){
fields = initialized_static_fields;
- instance_expr = null;
} else {
fields = initialized_fields;
- instance_expr = new This (Location.Null).Resolve (ec);
}
if (fields == null)
return true;
- foreach (Field f in fields){
- Expression e = f.GetInitializerExpression (ec);
- if (e == null)
- return false;
-
- Location l = f.Location;
- FieldExpr fe = new FieldExpr (f.FieldBuilder, l, true);
- fe.InstanceExpression = instance_expr;
-
- ExpressionStatement a = new Assign (fe, e, l);
-
- a = a.ResolveStatement (ec);
- if (a == null)
- return false;
-
- Constant c = e as Constant;
- if (c != null) {
- if (c.IsDefaultValue)
- continue;
- }
-
- a.EmitStatement (ec);
+ foreach (FieldBase f in fields) {
+ f.EmitInitializer (ec);
}
-
return true;
}
c = new Constructor (constructor_parent, MemberName.Name, mods,
Parameters.EmptyReadOnlyParameters,
- new ConstructorBaseInitializer (null, Location),
+ new GeneratedBaseInitializer (Location),
Location);
AddConstructor (c);
ArrayList ifaces = new ArrayList ();
base_class = null;
- Location base_loc = Location.Null;
foreach (ClassPart part in parts) {
TypeExpr new_base_class;
TypeExpr[] new_ifaces;
new_ifaces = part.GetClassBases (out new_base_class);
- if (new_ifaces == null && base_type != null)
+ if (new_ifaces == null && new_base_class != null)
return null;
if ((base_class != null) && (new_base_class != null) &&
!base_class.Equals (new_base_class)) {
+ Report.SymbolRelatedToPreviousError (base_class.Location, "");
Report.Error (263, part.Location,
"Partial declarations of `{0}' must " +
"not specify different base classes",
Name);
- if (!Location.IsNull (base_loc))
- Report.LocationOfPreviousError (base_loc);
-
return null;
}
if ((base_class == null) && (new_base_class != null)) {
base_class = new_base_class;
- base_loc = part.Location;
}
if (new_ifaces == null)
/// The @base_class argument is set to the base object or null
/// if this is `System.Object'.
/// </summary>
- TypeExpr [] GetClassBases (out TypeExpr base_class)
+ protected virtual TypeExpr [] GetClassBases (out TypeExpr base_class)
{
int i;
if (base_class is TypeParameterExpr){
Report.Error (
689, base_class.Location,
- "Type parameter `{0}' can not be used as a " +
- "base class or interface", base_class.Name);
- error = true;
- return null;
- }
-
- if (IsGeneric && base_class.Type.IsSubclassOf (TypeManager.attribute_type)){
- Report.Error (
- 698, base_class.Location,
- "A generic type cannot derive from `{0}' " +
- "because it is an attribute class",
- base_class.Name);
+ "Cannot derive from `{0}' because it is a type parameter",
+ base_class.GetSignatureForError ());
error = true;
return null;
}
if (base_class.IsSealed){
Report.SymbolRelatedToPreviousError (base_class.Type);
if (base_class.Type.IsAbstract) {
- Report.Error (709, Location, "'{0}': Cannot derive from static class", GetSignatureForError ());
+ Report.Error (709, Location, "`{0}': Cannot derive from static class `{1}'",
+ GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
} else {
- Report.Error (509, Location, "'{0}': Cannot derive from sealed class", GetSignatureForError ());
+ Report.Error (509, Location, "`{0}': cannot derive from sealed class `{1}'",
+ GetSignatureForError (), TypeManager.CSharpName (base_class.Type));
}
return null;
}
if (!base_class.CanInheritFrom ()){
- Report.Error (644, Location,
- "`{0}' cannot inherit from special class `{1}'",
- Name, base_class.Name);
+ Report.Error (644, Location, "`{0}' cannot derive from special class `{1}'",
+ GetSignatureForError (), base_class.GetSignatureForError ());
return null;
}
if (!base_class.AsAccessible (this, ModFlags)) {
Report.SymbolRelatedToPreviousError (base_class.Type);
- Report.Error (60, Location, "Inconsistent accessibility: base class '{0}' is less accessible than class '{1}'",
+ Report.Error (60, Location, "Inconsistent accessibility: base class `{0}' is less accessible than class `{1}'",
TypeManager.CSharpName (base_class.Type), GetSignatureForError ());
}
}
Error_TypeInListIsNotInterface (Location, iface.FullName);
}
else if (base_class != null)
- Report.Error (1721, Location,
- "In Class `{0}', `{1}' is not an interface, and a base class has already been defined",
- Name, iface.Name);
+ Report.Error (1721, Location, "`{0}': Classes cannot have multiple base classes (`{1}' and `{2}')",
+ GetSignatureForError (), base_class.GetSignatureForError (), iface.GetSignatureForError ());
else {
- Report.Error (1722, Location,
- "In Class `{0}', `{1}' is not " +
- "an interface, a base class must be listed first", Name, iface.Name);
+ Report.Error (1722, Location, "`{0}': Base class `{1}' must be specified as first",
+ GetSignatureForError (), iface.GetSignatureForError ());
}
return null;
}
if (!TypeManager.MayBecomeEqualGenericInstances (iface, t, infered, null))
continue;
- Report.Error (
- 695, Location,
+ Report.Error (695, Location,
"`{0}' cannot implement both `{1}' and `{2}' " +
- "because they may unify for some type " +
- "parameter substitutions",
- TypeManager.GetFullName (TypeBuilder),
- iface, t);
+ "because they may unify for some type parameter substitutions",
+ TypeManager.CSharpName (TypeBuilder), TypeManager.CSharpName (iface),
+ TypeManager.CSharpName (t));
return false;
}
protected void Error_TypeInListIsNotInterface (Location loc, string type)
{
- Report.Error (527, loc, "'{0}': type in interface list is not an interface", type);
+ Report.Error (527, loc, "Type `{0}' in interface list is not an interface", type);
}
//
try {
if (IsTopLevel){
if (TypeManager.NamespaceClash (Name, Location)) {
- InTransit = false;
+ error = true;
return null;
}
} else {
TypeBuilder builder = Parent.TypeBuilder;
if (builder == null) {
- InTransit = false;
+ error = true;
return null;
}
}
} catch (ArgumentException) {
Report.RuntimeMissingSupport (Location, "static classes");
- InTransit = false;
+ error = true;
return null;
}
- TypeManager.AddUserType (Name, TypeBuilder, this);
+ TypeManager.AddUserType (this);
if (Parts != null) {
ec = null;
foreach (ClassPart part in Parts) {
part.TypeBuilder = TypeBuilder;
- part.ptype = ptype;
part.ec = new EmitContext (part, Mono.CSharp.Location.Null, null, null, ModFlags);
part.ec.ContainerType = TypeBuilder;
}
} else {
- ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+ //
+ // Normally, we create the EmitContext here.
+ // The only exception is if we're an Iterator - in this case,
+ // we already have the `ec', so we don't want to create a new one.
+ //
+ if (ec == null)
+ ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
ec.ContainerType = TypeBuilder;
}
iface_exprs = GetClassBases (out base_type);
if (iface_exprs == null && base_type != null) {
- InTransit = false;
+ error = true;
return null;
}
+ //
+ // GetClassBases calls ResolveBaseTypeExpr() on the various type expressions involved,
+ // which in turn should have called DefineType()s on base types if necessary.
+ //
+ // None of the code below should trigger DefineType()s on classes that we depend on.
+ // Thus, we are eligible to be on the topological sort `type_container_resolve_order'.
+ //
+ // Let's do it as soon as possible, since code below can call DefineType() on classes
+ // that depend on us to be populated before they are.
+ //
+ if (!(this is Iterator))
+ RootContext.RegisterOrder (this);
+
if (base_type == null) {
if (Kind == Kind.Class){
if (RootContext.StdLib)
}
}
+ // Avoid attributes check when parent is not set
+ TypeResolveEmitContext.TestObsoleteMethodUsage = false;
+
if (base_type != null) {
// FIXME: I think this should be ...ResolveType (Parent.EmitContext).
// However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
- ptype = base_type.ResolveType (TypeResolveEmitContext);
- if (ptype == null) {
- InTransit = false;
+ FullNamedExpression fne = base_type.ResolveAsTypeStep (TypeResolveEmitContext);
+ if ((fne == null) || (fne.Type == null)) {
+ error = true;
return null;
}
- ptype = base_type.Type;
+ ptype = fne.Type;
+
+ if (IsGeneric && TypeManager.IsAttributeType (ptype)) {
+ Report.Error (698, base_type.Location,
+ "A generic type cannot derive from `{0}' " +
+ "because it is an attribute class",
+ base_type.Name);
+ error = true;
+ return null;
+ }
}
- if (!CheckRecursiveDefinition ()) {
- InTransit = false;
+ if (!CheckRecursiveDefinition (this)) {
+ error = true;
return null;
}
- if (ptype != null)
+ if (ptype != null) {
TypeBuilder.SetParent (ptype);
+ }
+
+ // Attribute is undefined at the begining of corlib compilation
+ if (TypeManager.obsolete_attribute_type != null) {
+ TypeResolveEmitContext.TestObsoleteMethodUsage = GetObsoleteAttribute () == null;
+ if (ptype != null && TypeResolveEmitContext.TestObsoleteMethodUsage) {
+ CheckObsoleteType (base_type);
+ }
+ }
// add interfaces that were not added at type creation
if (iface_exprs != null) {
TypeResolveEmitContext.ContainerType = TypeBuilder;
ifaces = TypeManager.ExpandInterfaces (TypeResolveEmitContext, iface_exprs);
if (ifaces == null) {
- InTransit = false;
+ error = true;
return null;
}
TypeManager.RegisterBuilder (TypeBuilder, ifaces);
}
- if (!(this is Iterator))
- RootContext.RegisterOrder (this);
- else if (!ResolveType ())
+ if (this is Iterator && !ResolveType ()) {
+ error = true;
return null;
-
- InTransit = false;
+ }
if (!DefineNestedTypes ()) {
+ error = true;
return null;
}
public bool ResolveType ()
{
+ if ((base_type != null) &&
+ (base_type.ResolveType (TypeResolveEmitContext) == null)) {
+ error = true;
+ return false;
+ }
+
if (!IsGeneric)
return true;
}
}
- int offset = CountTypeParameters - CurrentTypeParameters.Length;
- for (int i = offset; i < gen_params.Length; i++)
- CurrentTypeParameters [i - offset].DefineConstraints ();
-
foreach (TypeParameter type_param in TypeParameters) {
if (!type_param.DefineType (ec)) {
error = true;
return false;
}
- CurrentType = current_type.Type;
+ CurrentType = current_type.ResolveType (ec);
}
return true;
return true;
}
- protected bool CheckRecursiveDefinition ()
+ TypeContainer InTransit;
+
+ protected bool CheckRecursiveDefinition (TypeContainer tc)
{
- if (InTransit) {
- Report.Error (146, Location,
- "Class definition is circular: `{0}'",
- GetSignatureForError ());
- error = true;
+ if (InTransit != null) {
+ Report.SymbolRelatedToPreviousError (this);
+ if (this is Interface)
+ Report.Error (
+ 529, tc.Location, "Inherited interface `{0}' causes a " +
+ "cycle in the interface hierarchy of `{1}'",
+ GetSignatureForError (), tc.GetSignatureForError ());
+ else
+ Report.Error (
+ 146, tc.Location, "Circular base class dependency " +
+ "involving `{0}' and `{1}'",
+ tc.GetSignatureForError (), GetSignatureForError ());
return false;
}
- InTransit = true;
+ InTransit = tc;
Type parent = ptype;
if (parent != null) {
- if (parent.IsGenericInstance)
- parent = parent.GetGenericTypeDefinition ();
-
+ parent = TypeManager.DropGenericTypeArguments (parent);
TypeContainer ptc = TypeManager.LookupTypeContainer (parent);
- if ((ptc != null) && !ptc.CheckRecursiveDefinition ())
+ if ((ptc != null) && !ptc.CheckRecursiveDefinition (this))
return false;
}
- InTransit = false;
+ if (iface_exprs != null) {
+ foreach (TypeExpr iface in iface_exprs) {
+ Type itype = TypeManager.DropGenericTypeArguments (iface.Type);
+ TypeContainer ptc = TypeManager.LookupTypeContainer (itype);
+ if ((ptc != null) && !ptc.CheckRecursiveDefinition (this))
+ return false;
+ }
+ }
+
+ InTransit = null;
return true;
}
- static void Error_KeywordNotAllowed (Location loc)
+ public static void Error_KeywordNotAllowed (Location loc)
{
- Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
+ Report.Error (1530, loc, "Keyword `new' is not allowed on namespace elements");
}
/// <summary>
/// Populates our TypeBuilder with fields and methods
/// </summary>
- public override bool DefineMembers (TypeContainer container)
+ public override bool DefineMembers ()
{
if (members_defined)
return members_defined_ok;
+ if (!base.DefineMembers ())
+ return false;
+
members_defined_ok = DoDefineMembers ();
members_defined = true;
return false;
}
- if (IsTopLevel) {
- if ((ModFlags & Modifiers.NEW) != 0)
- Error_KeywordNotAllowed (Location);
- } else {
- MemberInfo conflict_symbol = Parent.MemberCache.FindMemberWithSameName (Basename, false, TypeBuilder);
- 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 ());
- } else {
- if ((ModFlags & Modifiers.NEW) == 0) {
- Report.SymbolRelatedToPreviousError (conflict_symbol);
- Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member", GetSignatureForError ());
- }
- }
- }
+ if (!IsTopLevel) {
+ MemberInfo conflict_symbol = Parent.MemberCache.FindMemberWithSameName (Basename, false, TypeBuilder);
+ if (conflict_symbol == null) {
+ if ((RootContext.WarningLevel >= 4) && ((ModFlags & Modifiers.NEW) != 0))
+ Report.Warning (109, 4, Location, "The member `{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError ());
+ } else {
+ if ((ModFlags & Modifiers.NEW) == 0) {
+ Report.SymbolRelatedToPreviousError (conflict_symbol);
+ Report.Warning (108, 2, Location, "`{0}' hides inherited member `{1}'. Use the new keyword if hiding was intended",
+ GetSignatureForError (), TypeManager.GetFullNameSignature (conflict_symbol));
+ }
+ }
+ }
DefineContainerMembers (constants);
DefineContainerMembers (fields);
if (parts != null) {
foreach (ClassPart part in parts) {
- if (!part.DefineMembers (this))
+ if (!part.DefineMembers ())
return false;
}
}
}
foreach (Iterator iterator in iterators) {
- if (!iterator.DefineMembers (this))
+ if (!iterator.DefineMembers ())
return false;
}
}
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");
+ Report.Error (573, Location,
+ "`{0}': Structs cannot have instance field initializers",
+ f.GetSignatureForError ());
}
}
}
}
+ if (iterators != null) {
+ foreach (Iterator iterator in iterators) {
+ if (!iterator.Define ())
+ return false;
+ }
+ }
+
return true;
}
{
ArrayList members = new ArrayList ();
- DefineMembers (null);
+ DefineMembers ();
if (methods != null) {
int len = methods.Count;
continue;
if (!mc.IsUsed) {
- Report.Warning (169, mc.Location, "The private {0} '{1}' is never used", member_type, mc.GetSignatureForError ());
+ Report.Warning (169, 3, mc.Location, "The private {0} `{1}' is never used", member_type, mc.GetSignatureForError ());
}
}
}
continue;
if (!f.IsUsed){
- Report.Warning (169, f.Location, "The private field '{0}' is never used", f.GetSignatureForError ());
+ if ((f.caching_flags & Flags.IsAssigned) == 0)
+ Report.Warning (169, 3, f.Location, "The private field `{0}' is never used", f.GetSignatureForError ());
+ else {
+#if NET_2_0
+ const int error_code = 414;
+#else
+ const int error_code = 169;
+#endif
+ Report.Warning (error_code, 3, f.Location, "The private field `{0}' is assigned but its value is never used",
+ f.GetSignatureForError ());
+ }
continue;
}
if (RootContext.WarningLevel < 4)
continue;
- if ((f.status & Field.Status.ASSIGNED) != 0)
+ if ((f.caching_flags & Flags.IsAssigned) != 0)
continue;
- Report.Warning (649, f.Location, "Field '{0}' is never assigned to, and will always have its default value '{1}'", f.GetSignatureForError (), "");
+ Report.Warning (649, 4, f.Location, "Field `{0}' is never assigned to, and will always have its default value `{1}'",
+ f.GetSignatureForError (), f.Type.Type.IsValueType ? Activator.CreateInstance (f.Type.Type).ToString() : "null");
}
}
}
/// Emits the code, this step is performed after all
/// the types, enumerations, constructors
/// </summary>
- public void EmitType ()
+ public virtual void EmitType ()
{
if (OptAttributes != null)
OptAttributes.Emit (ec, this);
+ if (IsGeneric && !(this is ClassPart)) {
+ int offset = CountTypeParameters - CurrentTypeParameters.Length;
+ for (int i = offset; i < gen_params.Length; i++)
+ CurrentTypeParameters [i - offset].EmitAttributes (ec);
+ }
+
//
// Structs with no fields need to have at least one byte.
// The right thing would be to set the PackingSize in a DefineType
// be specified.
//
- if ((Kind == Kind.Struct) && !have_nonstatic_fields){
+ if (Kind == Kind.Struct && first_nonstatic_field == null){
FieldBuilder fb = TypeBuilder.DefineField ("$PRIVATE$", TypeManager.byte_type,
FieldAttributes.Private);
has_compliant_args = c.HasCompliantArgs;
}
if (!has_compliant_args)
- Report.Error (3015, Location, "'{0}' has no accessible constructors which use only CLS-compliant types", GetSignatureForError ());
+ Report.Error (3015, Location, "`{0}' has no accessible constructors which use only CLS-compliant types", GetSignatureForError ());
} else {
foreach (Constructor c in instance_constructors)
c.Emit ();
}
}
+ // Can not continue if constants are broken
EmitConstants ();
+ if (Report.Errors > 0)
+ return;
if (default_static_constructor != null)
default_static_constructor.Emit ();
- if (methods != null)
+ if (methods != null){
foreach (Method m in methods)
m.Emit ();
+ }
if (operators != null)
foreach (Operator o in operators)
member_cache = null;
}
- // TODO: make it obsolete and use GetSignatureForError
- public string MakeName (string n)
- {
- return "`" + Name + "." + n + "'";
- }
-
//
// Performs the validation on a Method's modifiers (properties have
// the same properties).
//
if ((flags & Modifiers.STATIC) != 0){
if ((flags & vao) != 0){
- Report.Error (112, mc.Location, "static method '{0}' can not be marked as virtual, abstract or override",
- GetSignatureForError ());
+ Report.Error (112, mc.Location, "A static member `{0}' cannot be marked as override, virtual or abstract",
+ mc.GetSignatureForError ());
ok = false;
}
}
}
if ((flags & Modifiers.OVERRIDE) != 0 && (flags & nv) != 0){
- Report.Error (113, mc.Location, "'{0}' marked as override cannot be marked as new or virtual", mc.GetSignatureForError ());
+ Report.Error (113, mc.Location, "A member `{0}' marked as override cannot be marked as new or virtual",
+ mc.GetSignatureForError ());
ok = false;
}
if ((flags & Modifiers.ABSTRACT) != 0){
if ((flags & Modifiers.EXTERN) != 0){
Report.Error (
- 180, mc.Location, "'{0}' can not be both abstract and extern", mc.GetSignatureForError ());
+ 180, mc.Location, "`{0}' cannot be both extern and abstract", mc.GetSignatureForError ());
ok = false;
}
if ((flags & Modifiers.SEALED) != 0) {
- Report.Error (502, mc.Location, "'{0}' cannot be both abstract and sealed", mc.GetSignatureForError ());
+ Report.Error (502, mc.Location, "`{0}' cannot be both abstract and sealed", mc.GetSignatureForError ());
ok = false;
}
if ((flags & Modifiers.VIRTUAL) != 0){
- Report.Error (503, mc.Location, "'{0}' can not be both abstract and virtual", mc.GetSignatureForError ());
+ Report.Error (503, mc.Location, "The abstract method `{0}' cannot be marked virtual", mc.GetSignatureForError ());
ok = false;
}
if ((ModFlags & Modifiers.ABSTRACT) == 0){
- Report.Error (513, mc.Location, "'{0}' is abstract but its container class is not", mc.GetSignatureForError ());
+ Report.Error (513, mc.Location, "`{0}' is abstract but it is contained in nonabstract class", mc.GetSignatureForError ());
ok = false;
}
}
if ((flags & Modifiers.PRIVATE) != 0){
if ((flags & vao) != 0){
- Report.Error (621, mc.Location, "'{0}' virtual or abstract members can not be private", mc.GetSignatureForError ());
+ Report.Error (621, mc.Location, "`{0}': virtual or abstract members cannot be private", mc.GetSignatureForError ());
ok = false;
}
}
if ((flags & Modifiers.SEALED) != 0){
if ((flags & Modifiers.OVERRIDE) == 0){
- Report.Error (238, mc.Location, "'{0}' cannot be sealed because it is not an override", mc.GetSignatureForError ());
+ Report.Error (238, mc.Location, "`{0}' cannot be sealed because it is not an override", mc.GetSignatureForError ());
ok = 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));
+ Report.Error (3009, Location, "`{0}': base type `{1}' is not CLS-compliant", GetSignatureForError (), TypeManager.CSharpName (base_type));
}
if (!Parent.IsClsComplianceRequired (ds)) {
- Report.Error (3018, Location, "'{0}' cannot be marked as CLS-Compliant because it is a member of non CLS-Compliant type '{1}'",
+ Report.Error (3018, Location, "`{0}' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `{1}'",
GetSignatureForError (), Parent.GetSignatureForError ());
}
return true;
foreach (DictionaryEntry entry in defined_names) {
MemberCore mc = (MemberCore)entry.Value;
- if (!mc.IsClsComplianceRequired (this))
+ if (!mc.IsClsComplianceRequired (mc.Parent))
continue;
- string name = (string)entry.Key;
+ string name = (string) entry.Key;
string basename = name.Substring (name.LastIndexOf ('.') + 1);
string lcase = basename.ToLower (System.Globalization.CultureInfo.InvariantCulture);
continue;
if (found is MemberInfo) {
- if (basename == ((MemberInfo)found).Name)
+ if (basename == ((MemberInfo) found).Name)
continue;
- Report.SymbolRelatedToPreviousError ((MemberInfo)found);
+ Report.SymbolRelatedToPreviousError ((MemberInfo) found);
} else {
Report.SymbolRelatedToPreviousError ((MemberCore) found);
}
- Report.Error (3005, mc.Location, "Identifier '{0}' differing only in case is not CLS-compliant", mc.GetSignatureForError ());
+ Report.Warning (3005, 1, mc.Location, "Identifier `{0}' differing only in case is not CLS-compliant", mc.GetSignatureForError ());
}
}
/// checks whether the `interface_type' is a base inteface implementation.
/// Then it checks whether `name' exists in the interface type.
/// </summary>
- public virtual bool VerifyImplements (Type interface_type, string full,
- string name, Location loc)
+ public virtual bool VerifyImplements (MemberBase mb)
{
- bool found = false;
-
- if (ifaces != null){
+ if (ifaces != null) {
foreach (Type t in ifaces){
- if (t == interface_type){
- found = true;
- break;
- }
+ if (t == mb.InterfaceType)
+ return true;
}
}
- if (!found){
- Report.Error (540, loc, "`{0}': containing class does not implement interface `{1}'",
- full, interface_type.FullName);
- return false;
- }
-
- return true;
+ Report.Error (540, mb.Location, "`{0}': containing type does not implement interface `{1}'",
+ mb.GetSignatureForError (), TypeManager.CSharpName (mb.InterfaceType));
+ return false;
}
- protected override void VerifyObsoleteAttribute()
+ public virtual void Mark_HasEquals ()
{
- CheckUsageOfObsoleteAttribute (TypeBuilder.BaseType);
-
- if (ifaces == null)
- return;
+ Methods.HasEquals = true;
+ }
- foreach (Type iface in ifaces) {
- CheckUsageOfObsoleteAttribute (iface);
- }
+ public virtual void Mark_HasGetHashCode ()
+ {
+ Methods.HasGetHashCode = true;
}
//
public readonly int OriginalModFlags;
public readonly int AllowedModifiers;
public readonly TypeAttributes DefaultTypeAttributes;
+ public ListDictionary DeclarativeSecurity;
static PartialContainer Create (NamespaceEntry ns, TypeContainer parent,
- MemberName member_name, int mod_flags, Kind kind,
- Location loc)
+ MemberName member_name, int mod_flags, Kind kind)
{
- PartialContainer pc;
- DeclSpace ds = RootContext.Tree.GetDecl (member_name);
- if (ds != null) {
- pc = ds as PartialContainer;
- if (pc == null) {
- Report.Error (
- 260, ds.Location, "Missing partial modifier " +
- "on declaration of type `{0}'; another " +
- "partial implementation of this type exists",
- member_name.GetTypeName());
-
- Report.LocationOfPreviousError (loc);
- return null;
- }
+ if (!CheckModFlags (0, mod_flags, member_name))
+ return null;
+ PartialContainer pc = RootContext.Tree.GetDecl (member_name) as PartialContainer;
+ if (pc != null) {
if (pc.Kind != kind) {
Report.Error (
- 261, loc, "Partial declarations of `{0}' " +
- "must be all classes, all structs or " +
- "all interfaces", member_name.GetTypeName ());
+ 261, member_name.Location,
+ "Partial declarations of `{0}' must be all classes, " +
+ "all structs or all interfaces",
+ member_name.GetTypeName ());
return null;
}
- if (pc.OriginalModFlags != mod_flags) {
- Report.Error (
- 262, loc, "Partial declarations of `{0}' " +
- "have conflicting accessibility modifiers",
- member_name.GetTypeName ());
+ if (!CheckModFlags (pc.OriginalModFlags, mod_flags, member_name))
return null;
- }
+ pc.ModFlags |= (mod_flags & pc.AllowedModifiers);
if (pc.IsGeneric) {
if (pc.CountTypeParameters != member_name.CountTypeArguments) {
Report.Error (
- 264, loc, "Partial declarations of `{0}' " +
- "must have the same type parameter names in " +
- "the same order", member_name.GetTypeName ());
+ 264, member_name.Location,
+ "Partial declarations of `{0}' must have the " +
+ "same type parameter names in the same order",
+ member_name.GetTypeName ());
return null;
}
- string[] pc_names = pc.MemberName.TypeArguments.GetDeclarations ();
- string[] names = member_name.TypeArguments.GetDeclarations ();
+ TypeParameterName[] pc_names = pc.MemberName.TypeArguments.GetDeclarations ();
+ TypeParameterName[] names = member_name.TypeArguments.GetDeclarations ();
for (int i = 0; i < pc.CountTypeParameters; i++) {
- if (pc_names [i] == names [i])
+ if (pc_names [i].Name == names [i].Name)
continue;
Report.Error (
- 264, loc, "Partial declarations of `{0}' " +
- "must have the same type parameter names in " +
- "the same order", member_name.GetTypeName ());
+ 264, member_name.Location,
+ "Partial declarations of `{0}' must have the " +
+ "same type parameter names in the same order",
+ member_name.GetTypeName ());
return null;
}
}
if (parent is ClassPart)
parent = ((ClassPart) parent).PartialContainer;
- pc = new PartialContainer (ns.NS, parent, member_name, mod_flags, kind, loc);
- RootContext.Tree.RecordDecl (member_name, pc);
+ pc = new PartialContainer (ns.NS, parent, member_name, mod_flags, kind);
- if (kind == Kind.Interface)
- parent.AddInterface (pc);
- else if (kind == Kind.Class || kind == Kind.Struct)
- parent.AddClassOrStruct (pc);
- else
+ if (kind == Kind.Interface) {
+ if (!parent.AddInterface (pc))
+ return null;
+ } else if (kind == Kind.Class || kind == Kind.Struct) {
+ if (!parent.AddClassOrStruct (pc))
+ return null;
+ } else {
throw new InvalidOperationException ();
-
+ }
+ RootContext.Tree.RecordDecl (ns.NS, member_name, pc);
// This is needed to define our type parameters; we define the constraints later.
pc.SetParameterInfo (null);
return pc;
}
+ static bool CheckModFlags (int flags_org, int flags, MemberName member_name)
+ {
+ // Check (abstract|static|sealed) sanity.
+ int tmp = (flags_org | flags) & (Modifiers.ABSTRACT | Modifiers.SEALED | Modifiers.STATIC);
+ if ((tmp & Modifiers.ABSTRACT) != 0) {
+ if ((tmp & (Modifiers.STATIC | Modifiers.SEALED)) != 0) {
+ Report.Error (
+ 418, member_name.Location,
+ "`{0}': an abstract class cannot be sealed or static", member_name.ToString ());
+ return false;
+ }
+ } else if (tmp == (Modifiers.SEALED | Modifiers.STATIC)) {
+ Report.Error (441, member_name.Location, "`{0}': a class cannot be both static and sealed", member_name.ToString ());
+ return false;
+ }
+
+ if (flags_org == 0)
+ return true;
+
+ // Check conflicts.
+ if (0 != ((flags_org ^ flags) & (0xFFFFFFFF ^ (Modifiers.SEALED | Modifiers.ABSTRACT)))) {
+ Report.Error (
+ 262, member_name.Location, "Partial declarations of `{0}' " +
+ "have conflicting accessibility modifiers",
+ member_name.GetName ());
+ return false;
+ }
+ return true;
+ }
+
public static ClassPart CreatePart (NamespaceEntry ns, TypeContainer parent,
MemberName name, int mod, Attributes attrs,
Kind kind, Location loc)
{
- PartialContainer pc = Create (ns, parent, name, mod, kind, loc);
+ PartialContainer pc = Create (ns, parent, name, mod, kind);
if (pc == null) {
// An error occured; create a dummy container, but don't
// register it.
- pc = new PartialContainer (ns.NS, parent, name, mod, kind, loc);
+ pc = new PartialContainer (ns.NS, parent, name, mod, kind);
}
- ClassPart part = new ClassPart (ns, pc, parent, mod, attrs, kind, loc);
+ ClassPart part = new ClassPart (ns, pc, parent, mod, attrs, kind);
pc.AddPart (part);
return part;
}
protected PartialContainer (Namespace ns, TypeContainer parent,
- MemberName name, int mod, Kind kind, Location l)
- : base (null, parent, name, null, kind, l)
+ MemberName name, int mod, Kind kind)
+ : base (null, parent, name, null, kind)
{
this.Namespace = ns;
else
accmods = Modifiers.PRIVATE;
- this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+ // FIXME: remove this nasty fix for bug #77370 when
+ // we get good AllowModifiersProp implementation.
+ if ((mod & Modifiers.STATIC) != 0) {
+ AllowedModifiers |= Modifiers.STATIC;
+ AllowedModifiers &= ~ (Modifiers.ABSTRACT | Modifiers.SEALED);
+ }
+
+ this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, Location);
this.OriginalModFlags = mod;
}
+ public override void EmitType ()
+ {
+ base.EmitType ();
+
+ if (DeclarativeSecurity != null) {
+ foreach (DictionaryEntry de in DeclarativeSecurity) {
+ TypeBuilder.AddDeclarativeSecurity ((SecurityAction)de.Key, (PermissionSet)de.Value);
+ }
+ }
+ }
+
public override PendingImplementation GetPendingImplementations ()
{
return PendingImplementation.GetPendingImplementations (this);
}
+ public override bool MarkForDuplicationCheck ()
+ {
+ return true;
+ }
+
protected override TypeAttributes TypeAttr {
get {
return base.TypeAttr | DefaultTypeAttributes;
Constraints[] constraints;
public ClassPart (NamespaceEntry ns, PartialContainer pc, TypeContainer parent,
- int mod, Attributes attrs, Kind kind, Location l)
- : base (ns, parent, pc.MemberName, attrs, kind, l)
+ int mod, Attributes attrs, Kind kind)
+ : base (ns, parent, pc.MemberName, attrs, kind)
{
this.PartialContainer = pc;
this.IsPartial = true;
else
accmods = Modifiers.PRIVATE;
- this.ModFlags = Modifiers.Check (pc.AllowedModifiers, mod, accmods, l);
+ this.ModFlags = Modifiers.Check (pc.AllowedModifiers, mod, accmods, pc.MemberName.Location);
if (pc.IsGeneric)
constraints = new Constraints [pc.CountCurrentTypeParameters];
}
+ public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+ {
+ if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (false)) {
+ if (PartialContainer.DeclarativeSecurity == null)
+ PartialContainer.DeclarativeSecurity = new ListDictionary ();
+
+ a.ExtractSecurityPermissionSet (PartialContainer.DeclarativeSecurity);
+ return;
+ }
+
+ base.ApplyAttributeBuilder (a, cb);
+ }
+
public override PendingImplementation GetPendingImplementations ()
{
return PartialContainer.Pending;
}
- public override bool VerifyImplements (Type interface_type, string full,
- string name, Location loc)
+ public override bool VerifyImplements (MemberBase mb)
{
- return PartialContainer.VerifyImplements (
- interface_type, full, name, loc);
+ return PartialContainer.VerifyImplements (mb);
}
public override void SetParameterInfo (ArrayList constraints_list)
return false;
}
- for (int i = 0; i < current_params.Length; i++)
- current_params [i].DefineConstraints ();
-
foreach (TypeParameter type_param in PartialContainer.TypeParameters) {
if (!type_param.DefineType (ec))
return false;
return true;
}
+ public override void RegisterFieldForInitialization (FieldBase field)
+ {
+ PartialContainer.RegisterFieldForInitialization (field);
+ }
+
public override bool EmitFieldInitializers (EmitContext ec)
{
return PartialContainer.EmitFieldInitializers (ec);
return PartialContainer.BaseCache;
}
}
+
+ public override TypeBuilder DefineType ()
+ {
+ throw new InternalErrorException ("Should not get here");
+ }
+
+ public override void Mark_HasEquals ()
+ {
+ PartialContainer.Mark_HasEquals ();
+ }
+
+ public override void Mark_HasGetHashCode ()
+ {
+ PartialContainer.Mark_HasGetHashCode ();
+ }
}
public abstract class ClassOrStruct : TypeContainer {
ListDictionary declarative_security;
public ClassOrStruct (NamespaceEntry ns, TypeContainer parent,
- MemberName name, Attributes attrs, Kind kind,
- Location l)
- : base (ns, parent, name, attrs, kind, l)
+ MemberName name, Attributes attrs, Kind kind)
+ : base (ns, parent, name, attrs, kind)
{
}
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 ());
+ if ((e.caching_flags & Flags.IsAssigned) == 0)
+ Report.Warning (67, 3, e.Location, "The event `{0}' is never used", e.GetSignatureForError ());
}
}
}
/// </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, attrs, l)
+ Attributes attrs)
+ : base (ns, parent, name, mod, attrs)
{
if (RootContext.Version == LanguageVersion.ISO_1) {
- Report.FeatureIsNotStandardized (l, "static classes");
+ Report.FeatureIsNotStandardized (Location, "static classes");
}
}
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));
+ Report.Error (715, m.Location, "`{0}': Static classes cannot contain user-defined operators", m.GetSignatureForError ());
continue;
}
- if ((m.ModFlags & Modifiers.PROTECTED) != 0)
- Report.Warning (628, 4, m.Location, "'{0}': new protected member declared in static class", m.GetSignatureForError (this));
+ if (m is Destructor) {
+ Report.Error (711, m.Location, "`{0}': Static classes cannot contain destructor", GetSignatureForError ());
+ continue;
+ }
+
+ if ((m.ModFlags & Modifiers.PROTECTED) != 0) {
+ Report.Error (1057, m.Location, "`{0}': Static classes cannot contain protected members", m.GetSignatureForError ());
+ continue;
+ }
if (m is Indexer) {
- Report.Error (720, m.Location, "'{0}': cannot declare indexers in a static class", m.GetSignatureForError (this));
+ Report.Error (720, m.Location, "`{0}': cannot declare indexers in a static class", m.GetSignatureForError ());
continue;
}
continue;
if (m is Constructor) {
- Report.Error (710, m.Location, "'{0}': Static classes cannot have instance constructors", GetSignatureForError ());
+ 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));
+ Report.Error (708, m.Location, "`{0}': cannot declare instance members in a static class", m.GetSignatureForError ());
}
base.DefineContainerMembers (list);
public override TypeBuilder DefineType()
{
if ((ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) == (Modifiers.SEALED | Modifiers.STATIC)) {
- Report.Error (441, Location, "'{0}': a class cannot be both static and sealed", GetSignatureForError ());
+ Report.Error (441, Location, "`{0}': a class cannot be both static and sealed", GetSignatureForError ());
return null;
}
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);
+ if (ptype != TypeManager.object_type) {
+ Report.Error (713, Location, "Static class `{0}' cannot derive from type `{1}'. Static classes must derive from object", GetSignatureForError (), TypeManager.CSharpName (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 ());
+ Report.Error (714, Location, "`{0}': static classes cannot implement interfaces", GetSignatureForError ());
}
return tb;
}
Modifiers.SEALED |
Modifiers.UNSAFE;
- bool WasTransitError;
-
public Class (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
- Attributes attrs, Location l)
- : base (ns, parent, name, attrs, Kind.Class, l)
+ Attributes attrs)
+ : base (ns, parent, name, attrs, Kind.Class)
{
this.ModFlags = mod;
}
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);
+ Report.Error (641, a.Location, "Attribute `{0}' is only valid on classes derived from System.Attribute", a.GetSignatureForError ());
}
}
public override TypeBuilder DefineType()
{
- if (InTransit) {
- if (WasTransitError)
- return null;
- throw new CircularDepException (this);
- }
-
if ((ModFlags & Modifiers.ABSTRACT) == Modifiers.ABSTRACT && (ModFlags & (Modifiers.SEALED | Modifiers.STATIC)) != 0) {
- Report.Error (418, Location, "'{0}': an abstract class cannot be sealed or static", GetSignatureForError ());
+ Report.Error (418, Location, "`{0}': an abstract class cannot be sealed or static", GetSignatureForError ());
return null;
}
int accmods = Parent.Parent == null ? Modifiers.INTERNAL : Modifiers.PRIVATE;
ModFlags = Modifiers.Check (AllowedModifiersProp, ModFlags, accmods, Location);
- try {
- return base.DefineType ();
- }
- catch (CircularDepException e) {
- Report.SymbolRelatedToPreviousError (e.Container);
- Report.Error (146, Location, "Circular base class dependency involving '{0}' and '{1}'",
- GetSignatureForError (), e.Container.GetSignatureForError ());
- WasTransitError = true;
- return null;
- }
+ return base.DefineType ();
}
/// Search for at least one defined condition in ConditionalAttribute of attribute class
Modifiers.PRIVATE;
public Struct (NamespaceEntry ns, TypeContainer parent, MemberName name,
- int mod, Attributes attrs, Location l)
- : base (ns, parent, name, attrs, Kind.Struct, l)
+ int mod, Attributes attrs)
+ : base (ns, parent, name, attrs, Kind.Struct)
{
int accmods;
else
accmods = Modifiers.PRIVATE;
- this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+ this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, Location);
this.ModFlags |= Modifiers.SEALED;
}
return base.TypeAttr | DefaultTypeAttributes;
}
}
-
- public override TypeBuilder DefineType()
- {
- if (InTransit) {
- InTransit = false;
- throw new CircularDepException (this);
- }
-
- try {
- return base.DefineType ();
- }
- catch (CircularDepException e) {
- InTransit = false;
- Report.SymbolRelatedToPreviousError (this);
- Error_TypeInListIsNotInterface (e.Container.Location, GetSignatureForError ());
- return null;
- }
- }
- }
+ }
/// <summary>
/// Interfaces
/// </summary>
public class Interface : TypeContainer, IMemberContainer {
- bool WasTransitError;
-
/// <summary>
/// Modifiers allowed in a class declaration
/// </summary>
Modifiers.UNSAFE |
Modifiers.PRIVATE;
- public Interface (NamespaceEntry ns, TypeContainer parent, MemberName name,
- int mod, Attributes attrs, Location l)
- : base (ns, parent, name, attrs, Kind.Interface, l)
+ public Interface (NamespaceEntry ns, TypeContainer parent, MemberName name, int mod,
+ Attributes attrs)
+ : base (ns, parent, name, attrs, Kind.Interface)
{
int accmods;
else
accmods = Modifiers.PRIVATE;
- this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+ this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, name.Location);
}
public override PendingImplementation GetPendingImplementations ()
}
}
- public override TypeBuilder DefineType()
- {
- if (InTransit) {
- if (WasTransitError)
- return null;
- throw new CircularDepException (this);
- }
-
- try {
- return base.DefineType ();
- }
- catch (CircularDepException e) {
- Report.SymbolRelatedToPreviousError (e.Container);
- Report.Error (529, Location, "Inherited interface '{0}' causes a cycle in the interface hierarchy of '{1}'",
- e.Container.GetSignatureForError (), GetSignatureForError ());
- WasTransitError = true;
- return null;
- }
- }
-
protected override bool VerifyClsCompliance (DeclSpace ds)
{
if (!base.VerifyClsCompliance (ds))
continue;
Report.SymbolRelatedToPreviousError (t);
- Report.Warning (3027, 1, Location, "'{0}' is not CLS-compliant because base interface '{1}' is not CLS-compliant",
+ Report.Warning (3027, 1, Location, "`{0}' is not CLS-compliant because base interface `{1}' is not CLS-compliant",
GetSignatureForError (), TypeManager.CSharpName (t));
}
}
public abstract class MethodCore : MemberBase {
public readonly Parameters Parameters;
- public readonly GenericMethod GenericMethod;
protected ToplevelBlock block;
- //
- // Parameters, cached for semantic analysis.
- //
- protected InternalParameters parameter_info;
- protected Type [] parameter_types;
-
// Whether this is an operator method.
- public bool IsOperator;
+ public Operator IsOperator;
//
// The method we're overriding if this is an override method.
public MethodCore (TypeContainer parent, GenericMethod generic,
Expression type, int mod, int allowed_mod, bool is_iface,
- MemberName name, Attributes attrs, Parameters parameters,
- Location loc)
- : base (parent, generic != null ? generic : (DeclSpace) parent,
- type, mod, allowed_mod, Modifiers.PRIVATE, name, attrs, loc)
+ MemberName name, Attributes attrs, Parameters parameters)
+ : base (parent, generic, type, mod, allowed_mod, Modifiers.PRIVATE,
+ name, attrs)
{
Parameters = parameters;
IsInterface = is_iface;
- this.GenericMethod = generic;
}
//
//
public Type [] ParameterTypes {
get {
- return parameter_types;
+ return Parameters.Types;
}
}
- public InternalParameters ParameterInfo
+ public Parameters ParameterInfo
{
get {
- return parameter_info;
+ return Parameters;
}
}
+
+ public override EmitContext EmitContext {
+ get { return ds.EmitContext; }
+ }
public ToplevelBlock Block {
get {
}
}
+ public void SetYields ()
+ {
+ ModFlags |= Modifiers.METHOD_YIELDS;
+ }
+
protected override bool CheckBase ()
{
if (!base.CheckBase ())
// Is null for System.Object while compiling corlib and base interfaces
if (Parent.BaseCache == 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));
+ Report.Warning (109, 4, Location, "The member `{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError ());
}
return true;
}
if (!TypeManager.IsEqual (MemberType, TypeManager.TypeToCoreType (base_ret_type))) {
Report.SymbolRelatedToPreviousError (base_method);
if (this is PropertyBase) {
- Report.Error (1715, Location, "'{0}': type must be '{1}' to match overridden member '{2}'",
+ Report.Error (1715, Location, "`{0}': type must be `{1}' to match overridden member `{2}'",
GetSignatureForError (), TypeManager.CSharpName (base_ret_type), TypeManager.CSharpSignature (base_method));
}
else {
- Report.Error (508, Location, GetSignatureForError (Parent) + ": cannot " +
- "change return type when overriding inherited member");
+ Report.Error (508, Location, "`{0}': return type must be `{1}' to match overridden member `{2}'",
+ GetSignatureForError (), TypeManager.CSharpName (base_ret_type), TypeManager.CSharpSignature (base_method));
}
return false;
}
} else {
if (base_method.IsAbstract && !IsInterface) {
Report.SymbolRelatedToPreviousError (base_method);
- Report.Error (533, Location, "'{0}' hides inherited abstract member", GetSignatureForError (Parent));
+ Report.Error (533, Location, "`{0}' hides inherited abstract member `{1}'",
+ GetSignatureForError (), TypeManager.CSharpSignature (base_method));
return false;
}
}
if (base_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 (base_method));
+ Report.Error (115, Location, "`{0}': no suitable method found to override", GetSignatureForError ());
return false;
}
- if (RootContext.WarningLevel > 2) {
- if (Name == "Equals" && parameter_types.Length == 1 && parameter_types [0] == TypeManager.object_type)
- Parent.Methods.HasEquals = true;
- else if (Name == "GetHashCode" && parameter_types.Length == 0)
- Parent.Methods.HasGetHashCode = true;
- }
+ if (Name == "Equals" && Parameters.Count == 1 && ParameterTypes [0] == TypeManager.object_type)
+ Parent.Mark_HasEquals ();
+ else if (Name == "GetHashCode" && Parameters.Empty)
+ Parent.Mark_HasGetHashCode ();
if ((ModFlags & Modifiers.OVERRIDE) != 0) {
ObsoleteAttribute oa = AttributeTester.GetMethodObsoleteAttribute (base_method);
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 (base_method);
- Report.Warning (672, 1, Location, "Member '{0}' overrides obsolete member. Add the Obsolete attribute to '{0}'", GetSignatureForError (Parent));
+ Report.Warning (672, 1, Location, "Member `{0}' overrides obsolete member `{1}'. Add the Obsolete attribute to `{0}'",
+ GetSignatureForError (), TypeManager.CSharpSignature (base_method) );
}
}
}
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));
+ Report.Error (544, Location, "`{0}': cannot override because `{1}' is not a property", GetSignatureForError (), TypeManager.GetFullNameSignature (conflict_symbol));
else
- Report.Error (505, Location, "'{0}': cannot override because '{1}' is not a method", GetSignatureForError (Parent), TypeManager.GetFullNameSignature (conflict_symbol));
+ Report.Error (505, Location, "`{0}': cannot override because `{1}' is not a method", GetSignatureForError (), TypeManager.GetFullNameSignature (conflict_symbol));
} else
- Report.Error (115, Location, "'{0}': no suitable methods found to override", GetSignatureForError (Parent));
+ Report.Error (115, Location, "`{0}': no suitable method found to override", GetSignatureForError ());
return false;
}
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));
+ Report.Warning (109, 4, Location, "The member `{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError ());
}
return true;
}
return true;
Report.SymbolRelatedToPreviousError (conflict_symbol);
- Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member", GetSignatureForError (Parent));
+ Report.Warning (108, 2, Location, "`{0}' hides inherited member `{1}'. Use the new keyword if hiding was intended",
+ GetSignatureForError (), TypeManager.GetFullNameSignature (conflict_symbol));
}
return true;
}
-
//
// Performs various checks on the MethodInfo `mb' regarding the modifier flags
// that have been defined.
{
bool ok = true;
- // TODO: replace with GetSignatureForError
- string name = base_method.DeclaringType.Name + "." + base_method.Name;
-
if ((ModFlags & Modifiers.OVERRIDE) != 0){
if (!(base_method.IsAbstract || base_method.IsVirtual)){
- Report.Error (
- 506, Location, Parent.MakeName (Name) +
- ": cannot override inherited member `" +
- name + "' because it is not " +
- "virtual, abstract or override");
+ Report.Error (506, Location,
+ "`{0}': cannot override inherited member `{1}' because it is not marked virtual, abstract or override",
+ GetSignatureForError (), TypeManager.CSharpSignature (base_method));
ok = false;
}
if (base_method.IsFinal) {
Report.SymbolRelatedToPreviousError (base_method);
- Report.Error (239, Location, "'{0}': cannot override inherited member '{1}' because it is sealed",
+ Report.Error (239, Location, "`{0}': cannot override inherited member `{1}' because it is sealed",
GetSignatureForError (), TypeManager.CSharpSignature (base_method));
ok = false;
}
MethodAttributes base_classp = base_method.Attributes & MethodAttributes.MemberAccessMask;
if (!CheckAccessModifiers (thisp, base_classp, base_method)) {
- Error_CannotChangeAccessModifiers (Parent, base_method, name);
+ Error_CannotChangeAccessModifiers (base_method, base_classp, null);
ok = false;
}
}
ModFlags |= Modifiers.NEW;
Report.SymbolRelatedToPreviousError (base_method);
if (!IsInterface && (base_method.IsVirtual || base_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), TypeManager.CSharpSignature (base_method));
- } else
- Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member", GetSignatureForError (Parent));
+ Report.Warning (114, 2, Location, "`{0}' hides inherited member `{1}'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword",
+ GetSignatureForError (), TypeManager.CSharpSignature (base_method));
+ } else {
+ Report.Warning (108, 2, Location, "`{0}' hides inherited member `{1}'. Use the new keyword if hiding was intended",
+ GetSignatureForError (), TypeManager.CSharpSignature (base_method));
+ }
}
return ok;
return (thisp == base_classp);
}
}
-
- void Error_CannotChangeAccessModifiers (TypeContainer parent, MethodInfo base_method, string name)
+
+ public bool CheckAbstractAndExtern (bool has_block)
{
- //
- // FIXME: report the old/new permissions?
- //
- Report.Error (
- 507, Location, parent.MakeName (Name) +
- ": can't change the access modifiers when overriding inherited " +
- "member `" + name + "'");
+ if (Parent.Kind == Kind.Interface)
+ return true;
+
+ if (has_block) {
+ if ((ModFlags & Modifiers.EXTERN) != 0) {
+ Report.Error (179, Location, "`{0}' cannot declare a body because it is marked extern",
+ GetSignatureForError ());
+ return false;
+ }
+
+ if ((ModFlags & Modifiers.ABSTRACT) != 0) {
+ Report.Error (500, Location, "`{0}' cannot declare a body because it is marked abstract",
+ GetSignatureForError ());
+ return false;
+ }
+ } else {
+ if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) == 0) {
+ Report.Error (501, Location, "`{0}' must declare a body because it is not marked abstract or extern",
+ GetSignatureForError ());
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ protected void Error_CannotChangeAccessModifiers (MemberInfo base_method, MethodAttributes ma, string suffix)
+ {
+ Report.SymbolRelatedToPreviousError (base_method);
+ string base_name = TypeManager.GetFullNameSignature (base_method);
+ string this_name = GetSignatureForError ();
+ if (suffix != null) {
+ base_name += suffix;
+ this_name += suffix;
+ }
+
+ Report.Error (507, Location, "`{0}': cannot change access modifiers when overriding `{1}' inherited member `{2}'",
+ this_name, Modifiers.GetDescription (ma), base_name);
}
protected static string Error722 {
get {
- return "'{0}': static types cannot be used as return types";
+ return "`{0}': static types cannot be used as return types";
}
}
/// </summary>
protected abstract MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type);
- protected virtual bool DoDefineParameters ()
+ protected bool DoDefineParameters ()
{
EmitContext ec = ds.EmitContext;
if (ec == null)
bool old_unsafe = ec.InUnsafe;
ec.InUnsafe = InUnsafe;
- // Check if arguments were correct
- parameter_types = Parameters.GetParameterInfo (ec);
- ec.InUnsafe = old_unsafe;
+ ec.ResolvingGenericMethod = GenericMethod != null;
- if ((parameter_types == null) ||
- !CheckParameters (ds, parameter_types))
- return false;
-
- TypeParameter[] tparam = ds.IsGeneric ? ds.TypeParameters : null;
- parameter_info = new InternalParameters (parameter_types, Parameters, tparam);
+ bool old_obsolete = ec.TestObsoleteMethodUsage;
+ if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
+ ec.TestObsoleteMethodUsage = false;
- Parameter array_param = Parameters.ArrayParameter;
- if ((array_param != null) &&
- (!array_param.ParameterType.IsArray ||
- (array_param.ParameterType.GetArrayRank () != 1))) {
- Report.Error (225, Location, "params parameter has to be a single dimensional array");
+ // Check if arguments were correct
+ if (!Parameters.Resolve (ec))
return false;
- }
- return true;
- }
+ ec.ResolvingGenericMethod = false;
+ ec.InUnsafe = old_unsafe;
+ ec.TestObsoleteMethodUsage = old_obsolete;
- void error_425 (Type old, Type t, string name)
- {
- Report.Error (425, Location,
- "The constraints of type parameter `{0}' " +
- "of method `{1}' must match the constraints for " +
- "type parameter `{2}' of method `{3}'",
- TypeManager.CSharpName (old), Name,
- TypeManager.CSharpName (t), name);
+ return CheckParameters (ParameterTypes);
}
- protected override bool CheckGenericOverride (MethodInfo method, string name)
+ bool CheckParameters (Type [] parameters)
{
- ParameterData pd = TypeManager.GetParameterData (method);
-
- for (int i = 0; i < ParameterTypes.Length; i++) {
- GenericConstraints ogc = pd.GenericConstraints (i);
- GenericConstraints gc = ParameterInfo.GenericConstraints (i);
-
- if ((gc == null) && (ogc == null))
- continue;
-
- Type ot = pd.ParameterType (i);
- Type t = ParameterTypes [i];
-
- if (!((gc != null) && (ogc != null))) {
- error_425 (ot, t, name);
- return false;
- }
+ bool error = false;
- if ((gc.Attributes != ogc.Attributes) ||
- (gc.HasClassConstraint != ogc.HasClassConstraint)) {
- error_425 (ot, t, name);
+ foreach (Type partype in parameters){
+ if (partype == TypeManager.void_type) {
+ Report.Error (
+ 1547, Location, "Keyword 'void' cannot " +
+ "be used in this context");
return false;
}
- if (ogc.HasClassConstraint &&
- !ogc.ClassConstraint.Equals (gc.ClassConstraint)) {
- error_425 (ot, t, name);
- return false;
+ if (partype.IsPointer){
+ if (!UnsafeOK (ds))
+ error = true;
+ if (!TypeManager.VerifyUnManaged (TypeManager.GetElementType (partype), Location))
+ error = true;
}
- Type[] oct = ogc.InterfaceConstraints;
- Type[] ct = gc.InterfaceConstraints;
-
- if (oct.Length != ct.Length) {
- error_425 (ot, t, name);
- return false;
- }
+ if (ds.AsAccessible (partype, ModFlags))
+ continue;
- for (int j = 0; j < oct.Length; j++)
- if (!oct [j].Equals (ct [j])) {
- error_425 (ot, t, name);
- return false;
- }
+ if (this is Indexer)
+ Report.Error (55, Location,
+ "Inconsistent accessibility: parameter type `" +
+ TypeManager.CSharpName (partype) + "' is less " +
+ "accessible than indexer `" + GetSignatureForError () + "'");
+ else if ((this is Method) && ((Method) this).IsOperator != null)
+ Report.Error (57, Location,
+ "Inconsistent accessibility: parameter type `" +
+ TypeManager.CSharpName (partype) + "' is less " +
+ "accessible than operator `" + GetSignatureForError () + "'");
+ else
+ Report.Error (51, Location,
+ "Inconsistent accessibility: parameter type `" +
+ TypeManager.CSharpName (partype) + "' is less " +
+ "accessible than method `" + GetSignatureForError () + "'");
+ error = true;
}
- return true;
+ return !error;
}
public override string[] ValidAttributeTargets {
{
if (!base.VerifyClsCompliance (ds)) {
if ((ModFlags & Modifiers.ABSTRACT) != 0 && IsExposedFromAssembly (ds) && ds.IsClsComplianceRequired (ds)) {
- Report.Error (3011, Location, "'{0}': only CLS-compliant members can be abstract", GetSignatureForError ());
+ Report.Error (3011, Location, "`{0}': only CLS-compliant members can be abstract", GetSignatureForError ());
}
return false;
}
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",
+ Report.Error (3002, Location, "Return type of `{0}' is not CLS-compliant",
GetSignatureForError ());
}
- AttributeTester.AreParametersCompliant (Parameters.FixedParameters, Location);
+ Parameters.VerifyClsCompliance ();
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.MemberName.GetTypeName () != MemberName.GetTypeName ()))
+ if (method == this || !(method.MemberName.Equals (MemberName)))
return false;
Type[] param_types = method.ParameterTypes;
- if (param_types == null)
+ // This never happen. Rewrite this as Equal
+ if (param_types == null && ParameterTypes == null)
+ return true;
+ if (param_types == null || ParameterTypes == null)
return false;
if (param_types.Length != ParameterTypes.Length)
return false;
+ if (method.Parameters.HasArglist != Parameters.HasArglist)
+ return false;
+
bool equal = true;
- bool may_unify = MayUnify (this, method);
for (int i = 0; i < param_types.Length; i++) {
if (param_types [i] != ParameterTypes [i])
}
if (IsExplicitImpl && (method.InterfaceType != InterfaceType))
- equal = may_unify = false;
+ 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;
+ equal = false;
}
if (equal) {
//
// Try to report 663: method only differs on out/ref
//
- ParameterData info = ParameterInfo;
- ParameterData other_info = method.ParameterInfo;
+ Parameters info = ParameterInfo;
+ Parameters other_info = method.ParameterInfo;
for (int i = 0; i < info.Count; i++){
+ try {
if (info.ParameterModifier (i) != other_info.ParameterModifier (i)){
- Report.Error (663, Location,
- "Overload method only differs " +
- "in parameter modifier");
+ Report.SymbolRelatedToPreviousError (method);
+ Report.Error (663, Location, "`{0}': Methods cannot differ only on their use of ref and out on a parameters",
+ GetSignatureForError ());
return false;
+ }} catch {
+ Console.WriteLine ("Method is: {0} {1}", method.Location, method);
+ Console.WriteLine ("this is: {0} {1}", Location, this);
}
}
Report.SymbolRelatedToPreviousError (method);
if (this is Operator && method is Operator)
- Report.Error (557, Location,
- "Duplicate user-defined conversion in type '{0}'",
- Parent.Name);
+ Report.Error (557, Location, "Duplicate user-defined conversion in type `{0}'", Parent.Name);
else
- Report.Error (111, Location,
- "Type '{0}' already defines a member called '{1}' " +
- "with the same parameter types", Parent.Name, Name);
- return true;
- } else if (may_unify) {
- Report.Error (408, Location,
- "`{0}' cannot define overload members that " +
- "may unify for some type parameter substitutions",
- Parent.MemberName);
+ Report.Error (111, Location, TypeContainer.Error111, GetSignatureForError ());
+
return true;
}
+
return false;
}
- public override bool IsUsed
- {
- get {
- if (IsExplicitImpl)
- return true;
-
- return base.IsUsed;
- }
+ public override bool IsUsed {
+ get { return IsExplicitImpl || base.IsUsed; }
}
//
get { return "M:"; }
}
- protected override void VerifyObsoleteAttribute()
- {
- base.VerifyObsoleteAttribute ();
-
- if (parameter_types == null)
- return;
-
- foreach (Type type in parameter_types) {
- CheckUsageOfObsoleteAttribute (type);
- }
- }
}
public class SourceMethod : ISourceMethod
this.builder = builder;
CodeGen.SymbolWriter.OpenMethod (
- file, this, start.Row, 0, end.Row, 0);
+ file, this, start.Row, start.Column, end.Row, start.Column);
}
public string Name {
return null;
Location start_loc = block.StartLocation;
- if (Location.IsNull (start_loc))
+ if (start_loc.IsNull)
return null;
Location end_loc = block.EndLocation;
- if (Location.IsNull (end_loc))
+ if (end_loc.IsNull)
return null;
ISourceFile file = start_loc.SourceFile;
//
public Method (TypeContainer parent, GenericMethod generic,
Expression return_type, int mod, bool is_iface,
- MemberName name, Parameters parameters, Attributes attrs,
- Location l)
+ MemberName name, Parameters parameters, Attributes attrs)
: base (parent, generic, return_type, mod,
is_iface ? AllowedInterfaceModifiers : AllowedModifiers,
- is_iface, name, attrs, parameters, l)
+ is_iface, name, attrs, parameters)
{
}
public override string GetSignatureForError()
{
- if (MethodBuilder == null) {
- return GetSignatureForError (Parent);
- }
- return TypeManager.CSharpSignature (MethodBuilder);
- }
+ if (IsOperator != null)
+ return IsOperator.GetSignatureForError ();
- /// <summary>
- /// Use this method when MethodBuilder is null
- /// </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) {
- for (int i = 0; i < parameter_info.Parameters.FixedParameters.Length; ++i) {
- Parameter p = parameter_info.Parameters.FixedParameters [i];
- args.Append (p.GetSignatureForError ());
-
- if (i < parameter_info.Parameters.FixedParameters.Length - 1)
- args.Append (',');
- }
- }
-
- return String.Concat (base.GetSignatureForError (tc), "(", args.ToString (), ")");
+ return base.GetSignatureForError () + Parameters.GetSignatureForError ();
}
void DuplicateEntryPoint (MethodInfo b, Location location)
Report.Error (
17, location,
"Program `" + CodeGen.FileName +
- "' has more than one entry point defined: `" +
+ "' has more than one entry point defined: `" +
TypeManager.CSharpSignature(b) + "'");
}
- public bool IsEntryPoint (MethodBuilder b, InternalParameters pinfo)
+ bool IsEntryPoint (MethodBuilder b, Parameters pinfo)
{
if (b.ReturnType != TypeManager.void_type &&
b.ReturnType != TypeManager.int32_type)
}
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 ());
+ if (IsOperator != null || IsExplicitImpl) {
+ Report.Error (577, Location, "Conditional not valid on `{0}' because it is a constructor, destructor, operator or explicit interface implementation",
+ GetSignatureForError ());
return;
}
if (ReturnType != TypeManager.void_type) {
- Report.Error (578, Location, "Conditional not valid on '{0}' because its return type is not void", GetSignatureForError ());
+ Report.Error (578, Location, "Conditional not valid on `{0}' because its return type is not void", GetSignatureForError ());
return;
}
if ((ModFlags & Modifiers.OVERRIDE) != 0) {
- Report.Error (243, Location, "Conditional not valid on '{0}' because it is an override method", GetSignatureForError ());
+ Report.Error (243, Location, "Conditional not valid on `{0}' because it is an override method", GetSignatureForError ());
return;
}
return;
}
- if (MethodData.IsImplementing) {
- Report.Error (629, Location, "Conditional member '{0}' cannot implement interface member", GetSignatureForError ());
+ if (MethodData.implementing != null) {
+ Report.Error (629, Location, "Conditional member `{0}' cannot implement interface member `{1}'",
+ GetSignatureForError (), TypeManager.CSharpSignature (MethodData.implementing));
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 ());
+ for (int i = 0; i < ParameterInfo.Count; ++i) {
+ if ((ParameterInfo.ParameterModifier (i) & Parameter.Modifier.OUTMASK) != 0) {
+ Report.Error (685, Location, "Conditional method `{0}' cannot have an out parameter", GetSignatureForError ());
return;
}
}
if (GenericMethod != null) {
string method_name = MemberName.Name;
- if (IsExplicitImpl)
- method_name = TypeManager.GetFullName (InterfaceType) + "." + method_name;
+ if (IsExplicitImpl) {
+ method_name = TypeManager.CSharpName (InterfaceType) +
+ '.' + method_name;
+ }
mb = Parent.TypeBuilder.DefineGenericMethod (method_name, flags);
if (!GenericMethod.Define (mb))
if (!DoDefine ())
return false;
+ if (!CheckAbstractAndExtern (block != null))
+ return false;
+
if (RootContext.StdLib && (ReturnType == TypeManager.arg_iterator_type || ReturnType == TypeManager.typed_reference_type)) {
Error1599 (Location, ReturnType);
return false;
if (!CheckBase ())
return false;
- if (IsOperator)
+ if (IsOperator != null)
flags |= MethodAttributes.SpecialName | MethodAttributes.HideBySig;
- MethodData = new MethodData (this, ParameterInfo, ModFlags, flags,
- this, mb, GenericMethod, base_method);
+ MethodData = new MethodData (this, ModFlags, flags, this, mb, GenericMethod, base_method);
if (!MethodData.Define (Parent))
return false;
//
if ((ModFlags & Modifiers.METHOD_YIELDS) != 0){
Iterator iterator = new Iterator (
- Parent, Name, MemberType,
- ParameterInfo, ModFlags, block, Location);
+ this, Parent, GenericMethod, ModFlags);
if (!iterator.DefineIterator ())
return false;
-
- block = iterator.Block;
}
MethodBuilder = MethodData.MethodBuilder;
DuplicateEntryPoint (MethodBuilder, Location);
}
} else {
- if (RootContext.WarningLevel >= 4)
- Report.Warning (28, Location, "'{0}' has the wrong signature to be an entry point", TypeManager.CSharpSignature(MethodBuilder) );
+ if (RootContext.WarningLevel >= 4)
+ Report.Warning (28, 4, Location, "`{0}' has the wrong signature to be an entry point", TypeManager.CSharpSignature(MethodBuilder));
}
}
public static void Error1599 (Location loc, Type t)
{
- Report.Error (1599, loc, "Method or delegate cannot return type '{0}'", TypeManager.CSharpName (t));
+ Report.Error (1599, loc, "Method or delegate cannot return type `{0}'", TypeManager.CSharpName (t));
}
protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
{
MethodInfo mi = (MethodInfo) container.BaseCache.FindMemberToOverride (
- container.TypeBuilder, Name, ParameterTypes, false);
+ container.TypeBuilder, Name, ParameterTypes, GenericMethod, false);
if (mi == null)
return null;
if (!base.VerifyClsCompliance (ds))
return false;
- if (parameter_types.Length > 0) {
+ if (ParameterInfo.Count > 0) {
ArrayList al = (ArrayList)ds.MemberCache.Members [Name];
if (al.Count > 1)
ds.MemberCache.VerifyClsParameterConflict (al, this, MethodBuilder);
return true;
}
-
- void IIteratorContainer.SetYields ()
- {
- ModFlags |= Modifiers.METHOD_YIELDS;
- }
-
#region IMethodData Members
public CallingConventions CallingConventions {
get {
- CallingConventions cc = Parameters.GetCallingConvention ();
+ CallingConventions cc = Parameters.CallingConvention;
if (Parameters.HasArglist)
block.HasVarargs = true;
public EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig)
{
- return new EmitContext (
+ EmitContext ec = new EmitContext (
tc, ds, Location, ig, ReturnType, ModFlags, false);
- }
- public ObsoleteAttribute GetObsoleteAttribute ()
- {
- return GetObsoleteAttribute (ds);
+ Iterator iterator = tc as Iterator;
+ if (iterator != null)
+ ec.CurrentAnonymousMethod = iterator.Host;
+
+ return ec;
}
/// <summary>
t = ec.ContainerType.BaseType;
if (ec.ContainerType.IsValueType) {
Report.Error (522, loc,
- "structs cannot call base class constructors");
+ "`{0}': Struct constructors cannot call base constructors", TypeManager.CSharpSignature (caller_builder));
return false;
}
} else
if (base_constructor == null) {
if (errors == Report.Errors)
- Report.Error (1501, loc, "Can not find a constructor for this argument list");
+ Invocation.Error_WrongNumArguments (loc, TypeManager.CSharpSignature (caller_builder),
+ argument_list.Count);
return false;
}
if (error) {
- Report.Error (122, loc, "`{0}' is inaccessible due to its protection level",
- TypeManager.CSharpSignature (base_constructor));
+ Expression.ErrorIsInaccesible (loc, TypeManager.CSharpSignature (base_constructor));
base_constructor = null;
return false;
}
if (base_constructor == caller_builder){
- Report.Error (516, loc, "Constructor `{0}' can not call itself", TypeManager.CSharpSignature (caller_builder));
+ Report.Error (516, loc, "Constructor `{0}' cannot call itself", TypeManager.CSharpSignature (caller_builder));
return false;
}
return true;
}
- public void Emit (EmitContext ec)
+ public virtual void Emit (EmitContext ec)
{
if (base_constructor != null){
ec.Mark (loc, false);
Invocation.EmitCall (ec, true, false, ec.GetThis (loc), base_constructor, argument_list, loc);
}
}
-
- /// <summary>
- /// Method search for base ctor. (We do not cache it).
- /// </summary>
- Constructor GetOverloadedConstructor (TypeContainer tc)
- {
- if (tc.InstanceConstructors == null)
- return null;
-
- foreach (Constructor c in tc.InstanceConstructors) {
- if (Arguments == null) {
- if (c.ParameterTypes.Length == 0)
- return c;
-
- continue;
- }
-
- bool ok = true;
-
- int count = c.ParameterInfo.Count;
-
- if ((count > 0) &&
- c.ParameterInfo.ParameterModifier (count - 1) == Parameter.Modifier.PARAMS) {
- for (int i = 0; i < count-1; i++)
- if ((i >= Arguments.Count) ||
- (c.ParameterTypes [i] != ((Argument)Arguments [i]).Type)) {
- ok = false;
- break;
- }
- } else {
- if (c.ParameterTypes.Length != Arguments.Count)
- continue;
-
- for (int i = 0; i < Arguments.Count; ++i)
- if (c.ParameterTypes [i] != ((Argument)Arguments [i]).Type) {
- ok = false;
- break;
- }
- }
-
- if (!ok)
- continue;
-
- return c;
- }
-
- return null;
- }
-
- //TODO: implement caching when it will be necessary
- public virtual void CheckObsoleteAttribute (TypeContainer tc, Location loc)
- {
- Constructor ctor = GetOverloadedConstructor (tc);
- if (ctor == null)
- return;
-
- ObsoleteAttribute oa = ctor.GetObsoleteAttribute (tc);
- if (oa == null)
- return;
-
- AttributeTester.Report_ObsoleteMessage (oa, ctor.GetSignatureForError (), loc);
- }
}
public class ConstructorBaseInitializer : ConstructorInitializer {
base (argument_list, l)
{
}
+ }
- public override void CheckObsoleteAttribute(TypeContainer tc, Location loc) {
- if (base_constructor == null)
- return;
-
- TypeContainer type_ds = TypeManager.LookupTypeContainer (tc.TypeBuilder.BaseType);
- if (type_ds == null) {
- ObsoleteAttribute oa = AttributeTester.GetMemberObsoleteAttribute (base_constructor);
-
- if (oa != null)
- AttributeTester.Report_ObsoleteMessage (oa, TypeManager.CSharpSignature (base_constructor), loc);
-
- return;
- }
-
- base.CheckObsoleteAttribute (type_ds, loc);
+ class GeneratedBaseInitializer: ConstructorBaseInitializer {
+ public GeneratedBaseInitializer (Location loc):
+ base (null, loc)
+ {
}
+ public override void Emit(EmitContext ec)
+ {
+ bool old = ec.TestObsoleteMethodUsage;
+ ec.TestObsoleteMethodUsage = false;
+ base.Emit (ec);
+ ec.TestObsoleteMethodUsage = old;
+ }
}
public class ConstructorThisInitializer : ConstructorInitializer {
// my very own code has static constructors.
//
public Constructor (TypeContainer ds, string name, int mod, Parameters args,
- ConstructorInitializer init, Location l)
+ ConstructorInitializer init, Location loc)
: base (ds, null, null, mod, AllowedModifiers, false,
- new MemberName (name), null, args, l)
+ new MemberName (name, loc), null, args)
{
Initializer = init;
}
- public override string GetSignatureForError()
- {
- if (ConstructorBuilder == null)
- return GetSignatureForError (Parent);
-
- return TypeManager.CSharpSignature (ConstructorBuilder);
- }
-
public bool HasCompliantArgs {
get {
return has_compliant_args;
public bool IsDefault ()
{
if ((ModFlags & Modifiers.STATIC) != 0)
- return (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
- (Parameters.ArrayParameter == null ? true : Parameters.Empty);
+ return Parameters.Empty;
- else
- return (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
- (Parameters.ArrayParameter == null ? true : Parameters.Empty) &&
+ return Parameters.Empty &&
(Initializer is ConstructorBaseInitializer) &&
(Initializer.Arguments == null);
}
if (Parent.Kind == Kind.Struct) {
if (ParameterTypes.Length == 0) {
- Report.Error (568, Location,
- "Structs can not contain explicit parameterless " +
- "constructors");
- return false;
- }
-
+ Report.Error (568, Location,
+ "Structs cannot contain explicit parameterless constructors");
+ return false;
+ }
+
if ((ModFlags & Modifiers.PROTECTED) != 0) {
- Report.Error (666, Location, "Protected member in struct declaration");
+ Report.Error (666, Location, "`{0}': new protected member declared in struct", GetSignatureForError ());
return false;
}
}
if ((RootContext.WarningLevel >= 4) && ((Parent.ModFlags & Modifiers.SEALED) != 0 && (ModFlags & Modifiers.PROTECTED) != 0)) {
- Report.Warning (628, Location, "'{0}': new protected member declared in sealed class", GetSignatureForError (Parent));
+ Report.Warning (628, 4, Location, "`{0}': new protected member declared in sealed class", GetSignatureForError ());
}
return true;
//
public override bool Define ()
{
+ if (ConstructorBuilder != null)
+ return true;
+
MethodAttributes ca = (MethodAttributes.RTSpecialName |
MethodAttributes.SpecialName);
ca |= MethodAttributes.Private;
}
+ if (!CheckAbstractAndExtern (block != null))
+ return false;
+
// Check if arguments were correct.
if (!CheckBase ())
return false;
if ((ModFlags & Modifiers.UNSAFE) != 0)
ConstructorBuilder.InitLocals = false;
+
+ if (Parent.IsComImport) {
+ if (!IsDefault ()) {
+ Report.Error (669, Location, "`{0}': A class with the ComImport attribute cannot have a user-defined constructor",
+ Parent.GetSignatureForError ());
+ return false;
+ }
+ ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.InternalCall);
+ }
TypeManager.AddMethod (ConstructorBuilder, this);
- //
- // HACK because System.Reflection.Emit is lame
- //
- TypeManager.RegisterMethod (ConstructorBuilder, ParameterInfo, ParameterTypes);
-
return true;
}
public override void Emit ()
{
EmitContext ec = CreateEmitContext (null, null);
-
- //
- // extern methods have no bodies
- //
- if ((ModFlags & Modifiers.EXTERN) != 0) {
- if ((block != null) && ((ModFlags & Modifiers.EXTERN) != 0)) {
- Report.Error (
- 179, Location, "External constructor `" +
- TypeManager.CSharpSignature (ConstructorBuilder) +
- "' can not have a body");
- return;
- }
- } else if (block == null) {
- Report.Error (
- 501, Location, "Constructor `" +
- TypeManager.CSharpSignature (ConstructorBuilder) +
- "' must declare a body since it is not marked extern");
- return;
- }
+ if (GetObsoleteAttribute () != null || Parent.GetObsoleteAttribute () != null)
+ ec.TestObsoleteMethodUsage = false;
// If this is a non-static `struct' constructor and doesn't have any
// initializer, it must initialize all of the struct's fields.
((ModFlags & Modifiers.STATIC) == 0) && (Initializer == null))
Block.AddThisVariable (Parent, Location);
- if (block != null)
- block.ResolveMeta (ec, ParameterInfo);
+ if (block != null) {
+ if (!block.ResolveMeta (ec, ParameterInfo))
+ block = null;
+ }
if ((ModFlags & Modifiers.STATIC) == 0){
if (Parent.Kind == Kind.Class && Initializer == null)
- Initializer = new ConstructorBaseInitializer (
- null, Location);
+ Initializer = new GeneratedBaseInitializer (Location);
//
ec.IsStatic = false;
}
- Parameters.LabelParameters (ec, ConstructorBuilder, Location);
+ Parameters.ApplyAttributes (ec, ConstructorBuilder);
SourceMethod source = SourceMethod.Create (
Parent, ConstructorBuilder, block);
}
}
if (Initializer != null) {
- if (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null)
- Initializer.CheckObsoleteAttribute (Parent, Location);
- else
- ec.TestObsoleteMethodUsage = false;
Initializer.Emit (ec);
}
if (OptAttributes != null)
OptAttributes.Emit (ec, this);
- ec.EmitTopBlock (block, ParameterInfo, Location);
+ ec.EmitTopBlock (this, block);
if (source != null)
source.CloseMethod ();
return null;
}
+ public override string GetSignatureForError()
+ {
+ return base.GetSignatureForError () + Parameters.GetSignatureForError ();
+ }
+
protected override bool VerifyClsCompliance (DeclSpace ds)
{
if (!base.VerifyClsCompliance (ds) || !IsExposedFromAssembly (ds)) {
return false;
}
- if (parameter_types.Length > 0) {
+ if (ParameterInfo.Count > 0) {
ArrayList al = (ArrayList)ds.MemberCache.Members [".ctor"];
if (al.Count > 3)
ds.MemberCache.VerifyClsParameterConflict (al, this, ConstructorBuilder);
if (ds.TypeBuilder.IsSubclassOf (TypeManager.attribute_type)) {
- foreach (Type param in parameter_types) {
+ foreach (Type param in ParameterTypes) {
if (param.IsArray) {
return true;
}
public System.Reflection.CallingConventions CallingConventions {
get {
- CallingConventions cc = Parameters.GetCallingConvention ();
+ CallingConventions cc = Parameters.CallingConvention;
if (Parent.Kind == Kind.Class)
if ((ModFlags & Modifiers.STATIC) == 0)
return new EmitContext (Parent, Location, ig_, null, ModFlags, true);
}
- public ObsoleteAttribute GetObsoleteAttribute ()
- {
- return null;
- }
-
public bool IsExcluded(EmitContext ec)
{
return false;
CallingConventions CallingConventions { get; }
Location Location { get; }
MemberName MethodName { get; }
- Type[] ParameterTypes { get; }
Type ReturnType { get; }
GenericMethod GenericMethod { get; }
+ Parameters ParameterInfo { get; }
Attributes OptAttributes { get; }
- ToplevelBlock Block { get; }
+ ToplevelBlock Block { get; set; }
EmitContext CreateEmitContext (TypeContainer tc, ILGenerator ig);
ObsoleteAttribute GetObsoleteAttribute ();
- string GetSignatureForError (TypeContainer tc);
+ string GetSignatureForError ();
bool IsExcluded (EmitContext ec);
bool IsClsComplianceRequired (DeclSpace ds);
void SetMemberIsUsed ();
readonly IMethodData method;
- //
- // The return type of this method
- //
public readonly GenericMethod GenericMethod;
- public readonly InternalParameters ParameterInfo;
//
// Are we implementing an interface ?
//
- public bool IsImplementing = false;
+ public MethodInfo implementing;
//
// Protected data.
}
}
- public MethodData (MemberBase member, InternalParameters parameters,
+ public MethodData (MemberBase member,
int modifiers, MethodAttributes flags, IMethodData method)
{
this.member = member;
- this.ParameterInfo = parameters;
this.modifiers = modifiers;
this.flags = flags;
this.method = method;
}
- public MethodData (MemberBase member, InternalParameters parameters,
+ public MethodData (MemberBase member,
int modifiers, MethodAttributes flags,
IMethodData method, MethodBuilder builder,
GenericMethod generic, MethodInfo parent_method)
- : this (member, parameters, modifiers, flags, method)
+ : this (member, modifiers, flags, method)
{
this.builder = builder;
this.GenericMethod = generic;
public bool Define (TypeContainer container)
{
- MethodInfo implementing = null;
-
string name = method.MethodName.Basename;
string method_name = method.MethodName.FullName;
- Type[] ParameterTypes = method.ParameterTypes;
-
if (container.Pending != null){
if (member is Indexer) // TODO: test it, but it should work without this IF
implementing = container.Pending.IsInterfaceIndexer (
- member.InterfaceType, method.ReturnType, ParameterInfo);
+ member.InterfaceType, method.ReturnType, method.ParameterInfo);
else
implementing = container.Pending.IsInterfaceMethod (
- member.InterfaceType, name, method.ReturnType, ParameterInfo);
+ member.InterfaceType, name, method.ReturnType, method.ParameterInfo);
if (member.InterfaceType != null){
if (implementing == null){
if (member is PropertyBase) {
- Report.Error (550, method.Location, "'{0}' is an accessor not found in interface member '{1}'",
- method.GetSignatureForError (container), member.Name);
+ Report.Error (550, method.Location, "`{0}' is an accessor not found in interface member `{1}{2}'",
+ method.GetSignatureForError (), TypeManager.CSharpName (member.InterfaceType),
+ member.GetSignatureForError ().Substring (member.GetSignatureForError ().LastIndexOf ('.')));
} else {
- Report.Error (539, method.Location, "'{0}' in explicit interface " +
- "declaration is not a member of interface",
- member.Name);
+ Report.Error (539, method.Location,
+ "`{0}.{1}' in explicit interface declaration is not a member of interface",
+ TypeManager.CSharpName (member.InterfaceType), member.ShortName);
}
return false;
}
- if (implementing.IsSpecialName && !((member is PropertyBase || member is EventProperty))) {
+ if (implementing.IsSpecialName && !(method is AbstractPropertyEventMethod)) {
Report.SymbolRelatedToPreviousError (implementing);
- Report.Error (683, method.Location, "'{0}' explicit method implementation cannot implement '{1}' because it is an accessor",
+ Report.Error (683, method.Location, "`{0}' explicit method implementation cannot implement `{1}' because it is an accessor",
member.GetSignatureForError (), TypeManager.CSharpSignature (implementing));
return false;
}
- method_name = TypeManager.GetFullName (member.InterfaceType) + "." + method_name;
+ method_name = TypeManager.GetFullName (member.InterfaceType) +
+ '.' + method_name;
} else {
- if (implementing != null && method is AbstractPropertyEventMethod && !implementing.IsSpecialName) {
- Report.SymbolRelatedToPreviousError (implementing);
- Report.Error (686, method.Location, "Accessor '{0}' cannot implement interface member '{1}' for type '{2}'. Use an explicit interface implementation",
- method.GetSignatureForError (container), TypeManager.CSharpSignature (implementing), container.GetSignatureForError ());
- return false;
+ if (implementing != null) {
+ AbstractPropertyEventMethod prop_method = method as AbstractPropertyEventMethod;
+ if (prop_method != null) {
+ if (!implementing.IsSpecialName) {
+ Report.SymbolRelatedToPreviousError (implementing);
+ Report.Error (686, method.Location, "Accessor `{0}' cannot implement interface member `{1}' for type `{2}'. Use an explicit interface implementation",
+ method.GetSignatureForError (), TypeManager.CSharpSignature (implementing), container.GetSignatureForError ());
+ return false;
+ }
+ PropertyBase.PropertyMethod pm = prop_method as PropertyBase.PropertyMethod;
+ if (pm != null && pm.HasCustomAccessModifier && (pm.ModFlags & Modifiers.PUBLIC) == 0) {
+ Report.SymbolRelatedToPreviousError (implementing);
+ Report.Error (277, method.Location, "Accessor `{0}' must be declared public to implement interface member `{1}'",
+ method.GetSignatureForError (), TypeManager.CSharpSignature (implementing, true));
+ return false;
+ }
+ }
}
}
}
//
if ((modifiers & Modifiers.STATIC) != 0){
implementing = null;
- Modifiers.Error_InvalidModifier (method.Location, "static");
}
}
// Set Final unless we're virtual, abstract or already overriding a method.
if ((modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) == 0)
flags |= MethodAttributes.Final;
-
- IsImplementing = true;
}
EmitContext ec = method.CreateEmitContext (container, null);
+ if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute () != null)
+ ec.TestObsoleteMethodUsage = false;
- DefineMethodBuilder (ec, container, method_name, ParameterTypes);
+ DefineMethodBuilder (ec, container, method_name, method.ParameterInfo.Types);
if (builder == null)
return false;
if ((modifiers & Modifiers.UNSAFE) != 0)
builder.InitLocals = false;
- if (IsImplementing){
+ if (implementing != null){
//
// clear the pending implemntation flag
//
if (member is Indexer) {
container.Pending.ImplementIndexer (
member.InterfaceType, builder, method.ReturnType,
- ParameterInfo, member.IsExplicitImpl);
+ method.ParameterInfo, member.IsExplicitImpl);
} else
container.Pending.ImplementMethod (
member.InterfaceType, name, method.ReturnType,
- ParameterInfo, member.IsExplicitImpl);
+ method.ParameterInfo, member.IsExplicitImpl);
if (member.IsExplicitImpl)
container.TypeBuilder.DefineMethodOverride (
builder, implementing);
}
- TypeManager.RegisterMethod (builder, ParameterInfo, ParameterTypes);
TypeManager.AddMethod (builder, method);
if (GenericMethod != null) {
// We are more strict than Microsoft and report CS0626 like error
if (method.OptAttributes == null ||
!method.OptAttributes.Contains (TypeManager.methodimpl_attr_type, ec)) {
- Report.Error (626, method.Location, "Method, operator, or accessor '{0}' is marked external and has no attributes on it. Consider adding a DllImport attribute to specify the external implementation", method.GetSignatureForError (container));
+ Report.Error (626, method.Location, "Method, operator, or accessor `{0}' is marked external and has no attributes on it. Consider adding a DllImport attribute to specify the external implementation",
+ method.GetSignatureForError ());
return;
}
}
else
ec = method.CreateEmitContext (container, null);
- if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute (container) != null)
+ if (method.GetObsoleteAttribute () != null || container.GetObsoleteAttribute () != null)
ec.TestObsoleteMethodUsage = false;
- Location loc = method.Location;
+ method.ParameterInfo.ApplyAttributes (ec, MethodBuilder);
+
Attributes OptAttributes = method.OptAttributes;
if (OptAttributes != null)
OptAttributes.Emit (ec, kind);
- if (member is MethodCore)
- ((MethodCore) member).Parameters.LabelParameters (ec, MethodBuilder, loc);
-
+ if (GenericMethod != null)
+ GenericMethod.EmitAttributes (ec);
+
ToplevelBlock block = method.Block;
- //
- // abstract or extern methods have no bodies
- //
- if ((modifiers & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0){
- if (block == null)
- return;
-
- //
- // abstract or extern methods have no bodies.
- //
- if ((modifiers & Modifiers.ABSTRACT) != 0)
- Report.Error (
- 500, method.Location, "Abstract method `" +
- TypeManager.CSharpSignature (builder) +
- "' can not have a body");
-
- if ((modifiers & Modifiers.EXTERN) != 0)
- Report.Error (
- 179, method.Location, "External method `" +
- TypeManager.CSharpSignature (builder) +
- "' can not have a body");
-
- return;
- }
-
- //
- // Methods must have a body unless they're extern or abstract
- //
- if (block == null) {
- Report.Error (
- 501, method.Location, "Method `" +
- TypeManager.CSharpSignature (builder) +
- "' must declare a body since it is not marked " +
- "abstract or extern");
- return;
- }
-
SourceMethod source = SourceMethod.Create (
container, MethodBuilder, method.Block);
if (member is Destructor)
EmitDestructor (ec, block);
else
- ec.EmitTopBlock (block, ParameterInfo, loc);
+ ec.EmitTopBlock (method, block);
if (source != null)
source.CloseMethod ();
ig.BeginExceptionBlock ();
ec.ReturnLabel = finish;
ec.HasReturnLabel = true;
- ec.EmitTopBlock (block, null, method.Location);
+ ec.EmitTopBlock (method, block);
// ig.MarkLabel (finish);
ig.BeginFinallyBlock ();
}
}
- // Should derive from MethodCore
+ // TODO: Should derive from MethodCore
public class Destructor : Method {
- public Destructor (TypeContainer ds, Expression return_type, int mod, string name,
- Parameters parameters, Attributes attrs, Location l)
- : base (ds, null, return_type, mod, false, new MemberName (name),
- parameters, attrs, l)
+ public Destructor (TypeContainer ds, Expression return_type, int mod,
+ string name, Parameters parameters, Attributes attrs,
+ Location l)
+ : base (ds, null, return_type, mod, false, new MemberName (name, l),
+ parameters, attrs)
{ }
public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
{
if (a.Type == TypeManager.conditional_attribute_type) {
- Report.Error (577, Location, "Conditional not valid on '{0}' because it is a destructor, operator, or explicit interface implementation", GetSignatureForError ());
+ Report.Error (577, Location, "Conditional not valid on `{0}' because it is a constructor, destructor, operator or explicit interface implementation",
+ GetSignatureForError ());
return;
}
base.ApplyAttributeBuilder (a, cb);
}
+
+ public override string GetSignatureForError ()
+ {
+ return Parent.GetSignatureForError () + ".~" + Parent.MemberName.Name + "()";
+ }
+
}
abstract public class MemberBase : MemberCore {
public MethodAttributes flags;
public readonly DeclSpace ds;
+ public readonly GenericMethod GenericMethod;
protected readonly int explicit_mod_flags;
//
public string ShortName {
get { return MemberName.Name; }
- set {
- SetMemberName (new MemberName (MemberName.Left, value));
- }
+ set { SetMemberName (new MemberName (MemberName.Left, value, Location)); }
+ }
+
+ public new TypeContainer Parent {
+ get { return (TypeContainer) base.Parent; }
}
//
EmitContext ec = ds.EmitContext;
bool old_unsafe = ec.InUnsafe;
ec.InUnsafe = InUnsafe;
+ ec.ResolvingGenericMethod = GenericMethod != null;
Type = Type.ResolveAsTypeTerminal (ec);
+ ec.ResolvingGenericMethod = false;
ec.InUnsafe = old_unsafe;
-
- member_type = Type == null ? null : Type.Type;
+ if (Type != null) {
+ member_type = Type.Type;
+ }
}
return member_type;
}
//
// The constructor is only exposed to our children
//
- protected MemberBase (TypeContainer parent, DeclSpace ds, Expression type, int mod,
- int allowed_mod, int def_mod, MemberName name,
- Attributes attrs, Location loc)
- : base (parent, name, attrs, loc)
+ protected MemberBase (TypeContainer parent, GenericMethod generic,
+ Expression type, int mod, int allowed_mod, int def_mod,
+ MemberName name, Attributes attrs)
+ : base (parent, name, attrs)
{
- this.ds = ds;
+ this.ds = generic != null ? generic : (DeclSpace) parent;
explicit_mod_flags = mod;
Type = type;
- ModFlags = Modifiers.Check (allowed_mod, mod, def_mod, loc);
+ ModFlags = Modifiers.Check (allowed_mod, mod, def_mod, Location);
IsExplicitImpl = (MemberName.Left != null);
+ GenericMethod = generic;
}
protected virtual bool CheckBase ()
{
if ((ModFlags & Modifiers.PROTECTED) != 0 && Parent.Kind == Kind.Struct) {
- Report.Error (666, Location, "Protected member in struct declaration");
- return false;
- }
-
+ Report.Error (666, Location, "`{0}': new protected member declared in struct", GetSignatureForError ());
+ return false;
+ }
+
if ((RootContext.WarningLevel >= 4) &&
((Parent.ModFlags & Modifiers.SEALED) != 0) &&
((ModFlags & Modifiers.PROTECTED) != 0) &&
((ModFlags & Modifiers.OVERRIDE) == 0) && (Name != "Finalize")) {
- Report.Warning (628, Location, "'{0}': new protected member declared in sealed class", GetSignatureForError (Parent));
- }
-
- return true;
- }
-
- protected abstract bool CheckGenericOverride (MethodInfo method, string name);
-
- protected virtual bool CheckParameters (DeclSpace ds, Type [] parameters)
- {
- bool error = false;
-
- foreach (Type partype in parameters){
- if (partype == TypeManager.void_type) {
- Report.Error (
- 1547, Location, "Keyword 'void' cannot " +
- "be used in this context");
- return false;
- }
-
- if (partype.IsPointer){
- if (!UnsafeOK (ds))
- error = true;
- if (!TypeManager.VerifyUnManaged (TypeManager.GetElementType (partype), Location))
- error = true;
- }
-
- if (ds.AsAccessible (partype, ModFlags))
- continue;
-
- if (this is Indexer)
- Report.Error (55, Location,
- "Inconsistent accessibility: parameter type `" +
- TypeManager.CSharpName (partype) + "' is less " +
- "accessible than indexer `" + Name + "'");
- else if ((this is Method) && ((Method) this).IsOperator)
- Report.Error (57, Location,
- "Inconsistent accessibility: parameter type `" +
- TypeManager.CSharpName (partype) + "' is less " +
- "accessible than operator `" + Name + "'");
- else
- Report.Error (51, Location,
- "Inconsistent accessibility: parameter type `" +
- TypeManager.CSharpName (partype) + "' is less " +
- "accessible than method `" + Name + "'");
- error = true;
- }
-
- return !error;
+ Report.Warning (628, 4, Location, "`{0}': new protected member declared in sealed class", GetSignatureForError ());
+ }
+ return true;
}
protected virtual bool DoDefineBase ()
}
if (IsExplicitImpl) {
- Expression expr = MemberName.Left.GetTypeExpression (Location);
+ Expression expr = MemberName.Left.GetTypeExpression ();
TypeExpr iface_texpr = expr.ResolveAsTypeTerminal (ec);
if (iface_texpr == null)
return false;
- InterfaceType = iface_texpr.Type;
+ InterfaceType = iface_texpr.ResolveType (ec);
if (!InterfaceType.IsInterface) {
Report.Error (538, Location, "'{0}' in explicit interface declaration is not an interface", TypeManager.CSharpName (InterfaceType));
return false;
}
- if (!Parent.VerifyImplements (InterfaceType, ShortName, Name, Location))
+ if (!Parent.VerifyImplements (this))
return false;
Modifiers.Check (Modifiers.AllowedExplicitImplFlags, explicit_mod_flags, 0, Location);
if (MemberType == null)
return false;
- 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");
+ CheckObsoleteType (Type);
+
+ if ((Parent.ModFlags & Modifiers.SEALED) != 0 &&
+ (ModFlags & (Modifiers.VIRTUAL|Modifiers.ABSTRACT)) != 0) {
+ Report.Error (549, Location, "New virtual member `{0}' is declared in a sealed class `{1}'",
+ GetSignatureForError (), Parent.GetSignatureForError ());
return false;
- }
}
// verify accessibility
Report.Error (54, Location,
"Inconsistent accessibility: indexer return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than indexer `" + Name + "'");
+ "accessible than indexer `" + GetSignatureForError () + "'");
else if (this is MethodCore) {
if (this is Operator)
Report.Error (56, Location,
"Inconsistent accessibility: return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than operator `" + Name + "'");
+ "accessible than operator `" + GetSignatureForError () + "'");
else
Report.Error (50, Location,
"Inconsistent accessibility: return type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than method `" + Name + "'");
+ "accessible than method `" + GetSignatureForError () + "'");
} else {
Report.Error (52, Location,
"Inconsistent accessibility: field type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than field `" + Name + "'");
+ "accessible than field `" + GetSignatureForError () + "'");
}
return false;
}
if (MemberType.IsPointer && !UnsafeOK (Parent))
return false;
- return true;
- }
+ if (IsExplicitImpl) {
+ Expression expr = MemberName.Left.GetTypeExpression ();
+ TypeExpr texpr = expr.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
+ return false;
- public override string GetSignatureForError (TypeContainer tc)
- {
- return String.Concat (tc.Name, '.', base.GetSignatureForError (tc));
+ InterfaceType = texpr.ResolveType (ec);
+
+ if (!InterfaceType.IsInterface) {
+ Report.Error (538, Location, "`{0}' in explicit interface declaration is not an interface", TypeManager.CSharpName (InterfaceType));
+ return false;
+ }
+
+ if (!Parent.VerifyImplements (this))
+ return false;
+
+ Modifiers.Check (Modifiers.AllowedExplicitImplFlags, explicit_mod_flags, 0, Location);
+
+ }
+ return true;
}
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));
+ Report.Error (610, Location, "Field or property cannot be of type `{0}'", TypeManager.CSharpName (MemberType));
return false;
}
return true;
}
if (IsInterface && HasClsCompliantAttribute && ds.IsClsComplianceRequired (ds)) {
- Report.Error (3010, Location, "'{0}': CLS-compliant interfaces must have only CLS-compliant members", GetSignatureForError ());
+ Report.Error (3010, Location, "`{0}': CLS-compliant interfaces must have only CLS-compliant members", GetSignatureForError ());
}
return false;
}
-
- protected override void VerifyObsoleteAttribute()
- {
- CheckUsageOfObsoleteAttribute (MemberType);
- }
+
}
//
abstract public class FieldBase : MemberBase {
public FieldBuilder FieldBuilder;
public Status status;
+ protected Expression initializer;
[Flags]
public enum Status : byte {
- ASSIGNED = 1,
HAS_OFFSET = 4 // Used by FieldMember.
}
/// </summary>
public MemberInfo conflict_symbol;
- //
- // The constructor is only exposed to our children
- //
protected FieldBase (TypeContainer parent, Expression type, int mod,
- int allowed_mod, MemberName name, object init,
- Attributes attrs, Location loc)
- : base (parent, parent, type, mod, allowed_mod, Modifiers.PRIVATE,
- name, attrs, loc)
+ int allowed_mod, MemberName name, Attributes attrs)
+ : base (parent, null, type, mod, allowed_mod, Modifiers.PRIVATE,
+ name, attrs)
{
- this.init = init;
}
public override AttributeTargets AttributeTargets {
FieldBuilder.SetCustomAttribute (cb);
}
- //
- // Whether this field has an initializer.
- //
- public bool HasInitializer {
- get {
- return init != null;
- }
- }
+ public void EmitInitializer (EmitContext ec)
+ {
+ // Replace DeclSpace because of partial classes
+ ec.DeclSpace = EmitContext.DeclSpace;
- protected readonly Object init;
- // Private.
- Expression init_expr;
- bool init_expr_initialized = false;
+ ec.IsFieldInitializer = true;
+ initializer = initializer.Resolve (ec);
+ ec.IsFieldInitializer = false;
+ if (initializer == null)
+ return;
+ FieldExpr fe = new FieldExpr (FieldBuilder, Location, true);
+ if ((ModFlags & Modifiers.STATIC) == 0)
+ fe.InstanceExpression = new This (Location).Resolve (ec);
- protected override bool CheckGenericOverride (MethodInfo method, string name)
- {
- return true;
- }
+ ExpressionStatement a = new Assign (fe, initializer, Location);
- //
- // Resolves and returns the field initializer.
- //
- public Expression GetInitializerExpression (EmitContext ec)
- {
- if (init_expr_initialized)
- return init_expr;
+ a = a.ResolveStatement (ec);
+ if (a == null)
+ return;
- Expression e;
- if (init is Expression)
- e = (Expression) init;
- else
- e = new ArrayCreation (Type, "", (ArrayList)init, Location);
+ Constant c = initializer as Constant;
+ if (c != null && CanElideInitializer (c))
+ return;
- EmitContext parent_ec = Parent.EmitContext;
+ a.EmitStatement (ec);
+ }
- bool old_is_static = parent_ec.IsStatic;
- parent_ec.IsStatic = ec.IsStatic;
- parent_ec.IsFieldInitializer = true;
- e = e.DoResolve (parent_ec);
- parent_ec.IsFieldInitializer = false;
- parent_ec.IsStatic = old_is_static;
+ bool CanElideInitializer (Constant c)
+ {
+ if (MemberType == c.Type)
+ return c.IsDefaultValue;
- init_expr = e;
- init_expr_initialized = true;
+ if (c.Type == TypeManager.null_type)
+ return true;
- return init_expr;
+ return false;
}
protected override bool CheckBase ()
conflict_symbol = Parent.FindBaseMemberWithSameName (Name, false);
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));
+ Report.Warning (109, 4, Location, "The member `{0}' does not hide an inherited member. The new keyword is not required", GetSignatureForError ());
}
return true;
}
if ((ModFlags & (Modifiers.NEW | Modifiers.OVERRIDE)) == 0) {
Report.SymbolRelatedToPreviousError (conflict_symbol);
- Report.Warning (108, Location, "The keyword new is required on '{0}' because it hides inherited member", GetSignatureForError (Parent));
+ Report.Warning (108, 2, Location, "`{0}' hides inherited member `{1}'. Use the new keyword if hiding was intended",
+ GetSignatureForError (), TypeManager.GetFullNameSignature (conflict_symbol));
}
return true;
}
- protected override bool DoDefine ()
- {
- if (!base.DoDefine ())
- return false;
-
- if (MemberType == TypeManager.void_type) {
- Report.Error (1547, Location,
- "Keyword 'void' cannot be used in this context");
- return false;
- }
- return true;
- }
-
- public override string GetSignatureForError ()
- {
- if (FieldBuilder == null) {
- return base.GetSignatureForError (Parent);
+ public Expression Initializer {
+ set {
+ if (value != null) {
+ this.initializer = value;
+ Parent.RegisterFieldForInitialization (this);
+ }
}
- return TypeManager.GetFullNameSignature (FieldBuilder);
}
protected virtual bool IsFieldClsCompliant {
return false;
if (!IsFieldClsCompliant) {
- Report.Error (3003, Location, "Type of '{0}' is not CLS-compliant", GetSignatureForError ());
+ Report.Error (3003, Location, "Type of `{0}' is not CLS-compliant", GetSignatureForError ());
}
return true;
}
public void SetAssigned ()
{
- status |= Status.ASSIGNED;
+ caching_flags |= Flags.IsAssigned;
}
}
- public abstract class FieldMember: FieldBase
+ 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 | Modifiers.ABSTRACT, name, init, attrs, loc)
+ int allowed_mod, MemberName name, Attributes attrs)
+ : base (parent, type, mod, allowed_mod | Modifiers.ABSTRACT, name, attrs)
{
if ((mod & Modifiers.ABSTRACT) != 0)
- Report.Error (681, loc, "The modifier 'abstract' is not valid on fields. Try using a property instead");
+ Report.Error (681, Location, "The modifier 'abstract' is not valid on fields. Try using a property instead");
}
public override void ApplyAttributeBuilder(Attribute a, CustomAttributeBuilder cb)
if (ec == null)
throw new InternalErrorException ("FieldMember.Define called too early");
- if (MemberType == null)
+ if (MemberType == null || Type == null)
return false;
+ CheckObsoleteType (Type);
+
if (MemberType == TypeManager.void_type) {
Report.Error (1547, Location, "Keyword 'void' cannot be used in this context");
return false;
Report.Error (52, Location,
"Inconsistent accessibility: field type `" +
TypeManager.CSharpName (MemberType) + "' is less " +
- "accessible than field `" + Name + "'");
+ "accessible than field `" + GetSignatureForError () + "'");
return false;
}
}
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 ());
+ Report.Error (625, Location, "`{0}': Instance field types marked with StructLayout(LayoutKind.Explicit) must have a FieldOffset attribute.", GetSignatureForError ());
}
base.Emit ();
/// <summary>
/// Fixed buffer implementation
/// </summary>
- public class FixedField: FieldMember, IFixedBuffer
+ public class FixedField : FieldMember, IFixedBuffer
{
public const string FixedElementName = "FixedElementField";
static int GlobalCounter = 0;
public FixedField (TypeContainer parent, Expression type, int mod, string name,
Expression size_expr, Attributes attrs, Location loc):
- base (parent, type, mod, AllowedModifiers, new MemberName (name), null, attrs, loc)
+ base (parent, type, mod, AllowedModifiers, new MemberName (name, loc), attrs)
{
if (RootContext.Version == LanguageVersion.ISO_1)
- Report.FeatureIsNotStandardized (loc, "fixed sized buffers");
+ Report.FeatureIsNotStandardized (loc, "fixed size buffers");
this.size_expr = size_expr;
}
public override bool Define()
{
+#if !NET_2_0
+ if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) != 0)
+ Report.Warning (-23, 1, Location, "Only private or internal fixed sized buffers are supported by .NET 1.x");
+#endif
+
if (Parent.Kind != Kind.Struct) {
- Report.Error (1642, Location, "Fixed buffer fields may only be members of structs");
+ Report.Error (1642, Location, "`{0}': Fixed size buffer fields may only be members of structs",
+ GetSignatureForError ());
return false;
}
return false;
if (!TypeManager.IsPrimitiveType (MemberType)) {
- Report.Error (1663, Location, "Fixed sized buffer type must be one of the following: bool, byte, short, int, long, char, sbyte, ushort, uint, ulong, float or double");
+ Report.Error (1663, Location, "`{0}': Fixed size buffers type must be one of the following: bool, byte, short, int, long, char, sbyte, ushort, uint, ulong, float or double",
+ GetSignatureForError ());
return false;
}
- Expression e = size_expr.Resolve (Parent.EmitContext);
- if (e == null)
- return false;
-
- Constant c = e as Constant;
- if (c == null) {
- Report.Error (133, Location, "The expression being assigned to '{0}' must be constant", GetSignatureForError ());
+ Constant c = size_expr.ResolveAsConstant (Parent.EmitContext, this);
+ if (c == null)
return false;
- }
IntConstant buffer_size_const = c.ToInt (Location);
if (buffer_size_const == null)
buffer_size = buffer_size_const.Value;
if (buffer_size <= 0) {
- Report.Error (1665, Location, "Fixed sized buffer '{0}' must have a length greater than zero", GetSignatureForError ());
+ Report.Error (1665, Location, "`{0}': Fixed size buffers must have a length greater than zero", GetSignatureForError ());
return false;
}
int type_size = Expression.GetTypeSize (MemberType);
if (buffer_size > int.MaxValue / type_size) {
- Report.Error (1664, Location, "Fixed sized buffer of length '{0}' and type '{1}' exceeded 2^31 limit",
- buffer_size.ToString (), TypeManager.CSharpName (MemberType));
+ Report.Error (1664, Location, "Fixed size buffer `{0}' of length `{1}' and type `{2}' exceeded 2^31 limit",
+ GetSignatureForError (), buffer_size.ToString (), TypeManager.CSharpName (MemberType));
return false;
}
Modifiers.READONLY;
public Field (TypeContainer parent, Expression type, int mod, string name,
- Object expr_or_array_init, Attributes attrs, Location loc)
- : base (parent, type, mod, AllowedModifiers, new MemberName (name),
- expr_or_array_init, attrs, loc)
+ Attributes attrs, Location loc)
+ : base (parent, type, mod, AllowedModifiers, new MemberName (name, loc),
+ attrs)
{
}
(vt == TypeManager.char_type) ||
(vt == TypeManager.float_type) ||
(!vt.IsValueType))){
- Report.Error (
- 677, Location, Parent.MakeName (Name) +
- " A volatile field can not be of type `" +
- TypeManager.CSharpName (vt) + "'");
+ Report.Error (677, Location, "`{0}': A volatile field cannot be of the type `{1}'",
+ GetSignatureForError (), TypeManager.CSharpName (vt));
return false;
}
}
if ((ModFlags & Modifiers.READONLY) != 0){
- Report.Error (
- 678, Location,
- "A field can not be both volatile and readonly");
+ Report.Error (678, Location, "`{0}': A field cannot be both volatile and readonly",
+ GetSignatureForError ());
return false;
}
}
TypeManager.RegisterFieldBase (FieldBuilder, this);
}
catch (ArgumentException) {
- Report.Warning (-24, Location, "The Microsoft runtime is unable to use [void|void*] as a field type, try using the Mono runtime.");
+ Report.Warning (-24, 1, Location, "The Microsoft runtime is unable to use [void|void*] as a field type, try using the Mono runtime.");
return false;
}
return false;
if ((ModFlags & Modifiers.VOLATILE) != 0) {
- Report.Warning (3026, 1, Location, "CLS-compliant field '{0}' cannot be volatile", GetSignatureForError ());
+ Report.Warning (3026, 1, Location, "CLS-compliant field `{0}' cannot be volatile", GetSignatureForError ());
}
return true;
//
// `set' and `get' accessors are represented with an Accessor.
//
- public class Accessor {
+ public class Accessor : IIteratorContainer {
//
// Null if the accessor is empty, or a Block if not
//
public Attributes Attributes;
public Location Location;
public int ModFlags;
+ public bool Yields;
public Accessor (ToplevelBlock b, int mod, Attributes attrs, Location loc)
{
Location = loc;
ModFlags = Modifiers.Check (AllowedModifiers, mod, 0, loc);
}
- }
+ public void SetYields ()
+ {
+ Yields = true;
+ }
+ }
// 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: MemberCore, IMethodData {
+ public abstract class AbstractPropertyEventMethod : MemberCore, IMethodData {
protected MethodData method_data;
protected ToplevelBlock block;
protected ListDictionary declarative_security;
ReturnParameter return_attributes;
public AbstractPropertyEventMethod (MemberBase member, string prefix)
- : base (null, SetupName (prefix, member), null, member.Location)
+ : base (member.Parent, SetupName (prefix, member, member.Location), null)
{
this.prefix = prefix;
IsDummy = true;
public AbstractPropertyEventMethod (MemberBase member, Accessor accessor,
string prefix)
- : base (null, SetupName (prefix, member),
- accessor.Attributes, accessor.Location)
+ : base (member.Parent, SetupName (prefix, member, accessor.Location),
+ accessor.Attributes)
{
this.prefix = prefix;
this.block = accessor.Block;
}
- static MemberName SetupName (string prefix, MemberBase member)
+ static MemberName SetupName (string prefix, MemberBase member, Location loc)
{
- return new MemberName (member.MemberName.Left, prefix + member.ShortName);
+ return new MemberName (member.MemberName.Left, prefix + member.ShortName, loc);
}
public void UpdateName (MemberBase member)
{
- SetMemberName (SetupName (prefix, member));
+ SetMemberName (SetupName (prefix, member, Location));
}
#region IMethodData Members
}
}
- public abstract ObsoleteAttribute GetObsoleteAttribute ();
- public abstract Type[] ParameterTypes { get; }
+ public Type[] ParameterTypes {
+ get {
+ return ParameterInfo.Types;
+ }
+ }
+
+ public abstract Parameters ParameterInfo { 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,
+ "Attribute `{0}' is not valid on property or event accessors. It is valid on `{1}' declarations only",
+ TypeManager.CSharpName (a.Type), a.GetValidTargets ());
return;
}
public bool IsDuplicateImplementation (MethodCore method)
{
- if (Name != method.Name)
+ if (!MemberName.Equals (method.MemberName))
return false;
Type[] param_types = method.ParameterTypes;
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);
+ Report.Error (111, Location, TypeContainer.Error111, method.GetSignatureForError ());
return true;
}
get { throw new InvalidOperationException ("Unexpected attempt to get doc comment from " + this.GetType () + "."); }
}
- protected override void VerifyObsoleteAttribute()
- {
- }
-
}
//
//
abstract public class PropertyBase : MethodCore {
- public class GetMethod: PropertyMethod
+ public class GetMethod : PropertyMethod
{
static string[] attribute_targets = new string [] { "method", "return" };
{
base.Define (container);
- method_data = new MethodData (method, method.ParameterInfo, ModFlags, flags, this);
+ method_data = new MethodData (method, ModFlags, flags, this);
if (!method_data.Define (container))
return null;
return method_data.MethodBuilder;
}
- public override string GetSignatureForError (TypeContainer tc)
- {
- return String.Concat (base.GetSignatureForError (tc), ".get");
- }
-
public override Type ReturnType {
get {
return method.MemberType;
}
}
+ public override Parameters ParameterInfo {
+ get {
+ return Parameters.EmptyReadOnlyParameters;
+ }
+ }
+
public override string[] ValidAttributeTargets {
get {
return attribute_targets;
}
}
- public class SetMethod: PropertyMethod {
+ public class SetMethod : PropertyMethod {
static string[] attribute_targets = new string [] { "method", "param", "return" };
ImplicitParameter param_attr;
+ protected Parameters parameters;
public SetMethod (MethodCore method):
base (method, "set_")
{
if (a.Target == AttributeTargets.Parameter) {
if (param_attr == null)
- param_attr = new ImplicitParameter (method_data.MethodBuilder);
+ param_attr = new ImplicitParameter (method_data.MethodBuilder, method.Location);
param_attr.ApplyAttributeBuilder (a, cb);
return;
base.ApplyAttributeBuilder (a, cb);
}
- protected virtual InternalParameters GetParameterInfo (EmitContext ec)
+ public override Parameters ParameterInfo {
+ get {
+ return parameters;
+ }
+ }
+
+ protected virtual void DefineParameters ()
{
Parameter [] parms = new Parameter [1];
- parms [0] = new Parameter (method.Type, "value", Parameter.Modifier.NONE, null);
- Parameters parameters = new Parameters (parms, null, method.Location);
-
- bool old_unsafe = ec.InUnsafe;
- ec.InUnsafe = InUnsafe;
- Type [] types = parameters.GetParameterInfo (ec);
- ec.InUnsafe = old_unsafe;
-
- return new InternalParameters (types, parameters);
+ parms [0] = new Parameter (method.MemberType, "value", Parameter.Modifier.NONE, null, Location);
+ parameters = new Parameters (parms);
+ parameters.Resolve (null);
}
public override MethodBuilder Define (TypeContainer container)
{
if (container.EmitContext == null)
throw new InternalErrorException ("SetMethod.Define called too early");
-
+
+ DefineParameters ();
+ if (IsDummy)
+ return null;
+
base.Define (container);
-
- method_data = new MethodData (method, GetParameterInfo (container.EmitContext), ModFlags, flags, this);
+
+ method_data = new MethodData (method, ModFlags, flags, this);
if (!method_data.Define (container))
return null;
return method_data.MethodBuilder;
}
- public override string GetSignatureForError (TypeContainer tc)
- {
- return String.Concat (base.GetSignatureForError (tc), ".set");
- }
-
- public override Type[] ParameterTypes {
- get {
- return new Type[] { method.MemberType };
- }
- }
-
public override Type ReturnType {
get {
return TypeManager.void_type;
static string[] attribute_targets = new string [] { "property" };
- public abstract class PropertyMethod: AbstractPropertyEventMethod {
+ public abstract class PropertyMethod : AbstractPropertyEventMethod {
protected readonly MethodCore method;
protected MethodAttributes flags;
+ bool yields;
public PropertyMethod (MethodCore method, string prefix)
: base (method, prefix)
{
this.method = method;
- Parent = method.Parent;
}
public PropertyMethod (MethodCore method, Accessor accessor, string prefix)
: base (method, accessor, prefix)
{
this.method = method;
- Parent = method.Parent;
this.ModFlags = accessor.ModFlags;
+ yields = accessor.Yields;
if (accessor.ModFlags != 0 && RootContext.Version == LanguageVersion.ISO_1) {
- Report.FeatureIsNotStandardized (Location, "accessor modifiers");
+ Report.FeatureIsNotStandardized (Location, "access modifiers on properties");
}
}
return method.IsClsComplianceRequired (ds);
}
- public InternalParameters ParameterInfo
- {
- get {
- return method_data.ParameterInfo;
- }
- }
-
public virtual MethodBuilder Define (TypeContainer container)
{
+ if (!method.CheckAbstractAndExtern (block != null))
+ return null;
+
//
// Check for custom access modifier
//
ModFlags = method.ModFlags;
flags = method.flags;
} else {
+ if (container.Kind == Kind.Interface)
+ Report.Error (275, Location, "`{0}': accessibility modifiers may not be used on accessors in an interface",
+ GetSignatureForError ());
+
if ((method.ModFlags & Modifiers.ABSTRACT) != 0 && (ModFlags & Modifiers.PRIVATE) != 0) {
- Report.Error (442, Location, "{0}': abstract properties cannot have private accessors", GetSignatureForError (container));
+ Report.Error (442, Location, "`{0}': abstract properties cannot have private accessors", GetSignatureForError ());
}
CheckModifiers (container, ModFlags);
flags |= (method.flags & (~MethodAttributes.MemberAccessMask));
}
- return null;
+ //
+ // Setup iterator if we are one
+ //
+ if (yields) {
+ Iterator iterator = new Iterator (this, Parent as TypeContainer, null, ModFlags);
+
+ if (!iterator.DefineIterator ())
+ return null;
+ }
+ return null;
}
public bool HasCustomAccessModifier
}
}
- public override Type[] ParameterTypes {
- get {
- return TypeManager.NoTypes;
- }
- }
-
public override EmitContext CreateEmitContext (TypeContainer tc,
ILGenerator ig)
{
public override ObsoleteAttribute GetObsoleteAttribute ()
{
- return method.GetObsoleteAttribute (method.ds);
+ return method.GetObsoleteAttribute ();
}
- public override string GetSignatureForError (TypeContainer tc)
+ public override string GetSignatureForError()
{
- return String.Concat (tc.Name, '.', method.Name);
+ return method.GetSignatureForError () + '.' + prefix.Substring (0, 3);
}
void CheckModifiers (TypeContainer container, int modflags)
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));
+ if ((mflags == modflags) || (modflags & (~flags)) != 0) {
+ Report.Error (273, Location,
+ "The accessibility modifier of the `{0}' accessor must be more restrictive than the modifier of the property or indexer `{1}'",
+ GetSignatureForError (), method.GetSignatureForError ());
+ }
}
public override bool MarkForDuplicationCheck ()
public PropertyBase (TypeContainer parent, Expression type, int mod_flags,
int allowed_mod, bool is_iface, MemberName name,
- Parameters parameters, Attributes attrs,
- Location loc)
+ Parameters parameters, Attributes attrs)
: base (parent, null, type, mod_flags, allowed_mod, is_iface, name,
- attrs, parameters, loc)
+ attrs, parameters)
{
}
// 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.",
+ Report.Error (274, Location, "`{0}': Cannot specify accessibility modifiers for both accessors of the property or indexer",
GetSignatureForError ());
return false;
}
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.",
+ "`{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;
}
return true;
}
- public override string GetSignatureForError()
- {
- if (PropertyBuilder == null)
- return GetSignatureForError (Parent);
-
- return TypeManager.CSharpSignature (PropertyBuilder, false);
- }
-
protected override bool CheckForDuplications ()
{
ArrayList ar = Parent.Indexers;
protected override MethodInfo FindOutBaseMethod (TypeContainer container, ref Type base_ret_type)
{
PropertyInfo base_property = container.BaseCache.FindMemberToOverride (
- container.TypeBuilder, Name, ParameterTypes, true) as PropertyInfo;
+ container.TypeBuilder, Name, ParameterTypes, null, true) as PropertyInfo;
if (base_property == null)
return null;
if ((ModFlags & Modifiers.OVERRIDE) != 0) {
if (Get != null && !Get.IsDummy && get_accessor == null) {
Report.SymbolRelatedToPreviousError (base_property);
- Report.Error (545, Location, "'{0}': cannot override because '{1}' does not have an overridable get accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (base_property));
+ Report.Error (545, Location, "`{0}.get': cannot override because `{1}' does not have an overridable get accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (base_property));
}
if (Set != null && !Set.IsDummy && set_accessor == null) {
Report.SymbolRelatedToPreviousError (base_property);
- Report.Error (546, Location, "'{0}': cannot override because '{1}' does not have an overridable set accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (base_property));
+ Report.Error (546, Location, "`{0}.set': cannot override because `{1}' does not have an overridable set accessor", GetSignatureForError (), TypeManager.GetFullNameSignature (base_property));
}
}
//
// Check base class accessors access
//
+
+ // TODO: rewrite to reuse Get|Set.CheckAccessModifiers and share code there
get_accessor_access = set_accessor_access = 0;
if ((ModFlags & Modifiers.NEW) == 0) {
if (get_accessor != null) {
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 (base_property));
+ Error_CannotChangeAccessModifiers (get_accessor, get_accessor_access, ".get");
}
if (set_accessor != null) {
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 (base_property));
+ Error_CannotChangeAccessModifiers (set_accessor, set_accessor_access, ".set");
}
}
}
}
- public class Property : PropertyBase, IIteratorContainer {
+ public class Property : PropertyBase {
const int AllowedModifiers =
Modifiers.NEW |
Modifiers.PUBLIC |
const int AllowedInterfaceModifiers =
Modifiers.NEW;
- public Property (TypeContainer parent, Expression type, int mod_flags,
- bool is_iface, MemberName name, Attributes attrs,
- Accessor get_block, Accessor set_block, Location loc)
- : base (parent, type, mod_flags,
+ public Property (TypeContainer ds, Expression type, int mod, bool is_iface,
+ MemberName name, Attributes attrs, Accessor get_block,
+ Accessor set_block)
+ : base (ds, type, mod,
is_iface ? AllowedInterfaceModifiers : AllowedModifiers,
- is_iface, name, Parameters.EmptyReadOnlyParameters, attrs,
- loc)
+ is_iface, name, Parameters.EmptyReadOnlyParameters, attrs)
{
if (get_block == null)
Get = new GetMethod (this);
flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
if (!Get.IsDummy) {
-
GetBuilder = Get.Define (Parent);
if (GetBuilder == null)
return false;
-
- //
- // Setup iterator if we are one
- //
- if ((ModFlags & Modifiers.METHOD_YIELDS) != 0){
- Iterator iterator = new Iterator (
- Parent, "get", MemberType,
- Get.ParameterInfo,
- ModFlags, Get.Block, Location);
-
- if (!iterator.DefineIterator ())
- return false;
- Get.Block = iterator.Block;
- }
}
+ SetBuilder = Set.Define (Parent);
if (!Set.IsDummy) {
- SetBuilder = Set.Define (Parent);
if (SetBuilder == null)
return false;
-
- SetBuilder.DefineParameter (1, ParameterAttributes.None, "value");
}
// FIXME - PropertyAttributes.HasDefault ?
-
- PropertyAttributes prop_attr = PropertyAttributes.None;
- if (!IsInterface)
- prop_attr |= PropertyAttributes.RTSpecialName |
- PropertyAttributes.SpecialName;
- PropertyBuilder = Parent.TypeBuilder.DefineProperty (
- Name, prop_attr, MemberType, null);
-
- if (!Get.IsDummy)
- PropertyBuilder.SetGetMethod (GetBuilder);
-
- if (!Set.IsDummy)
- PropertyBuilder.SetSetMethod (SetBuilder);
+ PropertyBuilder = Parent.TypeBuilder.DefineProperty (
+ MemberName.ToString (), PropertyAttributes.None, MemberType, null);
- TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
- return true;
- }
+ if (!Get.IsDummy)
+ PropertyBuilder.SetGetMethod (GetBuilder);
- public void SetYields ()
- {
- ModFlags |= Modifiers.METHOD_YIELDS;
+ if (!Set.IsDummy)
+ PropertyBuilder.SetSetMethod (SetBuilder);
+
+ return true;
}
}
public void SetUsed ()
{
if (my_event != null) {
- my_event.status = FieldBase.Status.ASSIGNED;
+ my_event.SetAssigned ();
my_event.SetMemberIsUsed ();
}
}
/// </summary>
public class EventProperty: Event {
- static string[] attribute_targets = new string [] { "event", "property" };
+ static string[] attribute_targets = new string [] { "event" }; // "property" target was disabled for 2.0 version
public EventProperty (TypeContainer parent, Expression type, int mod_flags,
- bool is_iface, MemberName name, Object init,
- Attributes attrs, Accessor add, Accessor remove,
- Location loc)
- : base (parent, type, mod_flags, is_iface, name, init, attrs, loc)
+ bool is_iface, MemberName name,
+ Attributes attrs, Accessor add, Accessor remove)
+ : base (parent, type, mod_flags, is_iface, name, attrs)
{
Add = new AddDelegateMethod (this, add);
Remove = new RemoveDelegateMethod (this, remove);
/// <summary>
/// Event is declared like field.
/// </summary>
- public class EventField: Event {
+ 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,
- Attributes attrs, Location loc)
- : base (parent, type, mod_flags, is_iface, name, init, attrs, loc)
+ bool is_iface, MemberName name,
+ Attributes attrs)
+ : base (parent, type, mod_flags, is_iface, name, attrs)
{
Add = new AddDelegateMethod (this);
Remove = new RemoveDelegateMethod (this);
base.ApplyAttributeBuilder (a, cb);
}
+ public override bool Define()
+ {
+ if (!base.Define ())
+ return false;
+
+ if (initializer != null) {
+ if (((ModFlags & Modifiers.ABSTRACT) != 0)) {
+ Report.Error (74, Location, "`{0}': abstract event cannot have an initializer",
+ GetSignatureForError ());
+ return false;
+ }
+ }
+
+ return true;
+ }
+
public override string[] ValidAttributeTargets {
get {
return IsInterface ? attribute_targets_interface : attribute_targets;
{
if (a.Target == AttributeTargets.Parameter) {
if (param_attr == null)
- param_attr = new ImplicitParameter (method_data.MethodBuilder);
+ param_attr = new ImplicitParameter (method_data.MethodBuilder, method.Location);
param_attr.ApplyAttributeBuilder (a, cb);
return;
return method.IsClsComplianceRequired (ds);
}
- public MethodBuilder Define (TypeContainer container, InternalParameters ip)
+ public MethodBuilder Define (TypeContainer container)
{
- method_data = new MethodData (method, ip, method.ModFlags,
+ method_data = new MethodData (method, method.ModFlags,
method.flags | MethodAttributes.HideBySig | MethodAttributes.SpecialName, this);
if (!method_data.Define (container))
return null;
MethodBuilder mb = method_data.MethodBuilder;
- mb.DefineParameter (1, ParameterAttributes.None, "value");
+ ParameterInfo.ApplyAttributes (Parent.EmitContext, mb);
return mb;
}
protected abstract MethodInfo DelegateMethodInfo { get; }
- public override Type[] ParameterTypes {
- get {
- return new Type[] { method.MemberType };
- }
- }
-
public override Type ReturnType {
get {
return TypeManager.void_type;
method.ModFlags, false);
}
- public override string GetSignatureForError (TypeContainer tc)
- {
- return String.Concat (tc.Name, '.', method.Name);
- }
-
public override ObsoleteAttribute GetObsoleteAttribute ()
{
- return method.GetObsoleteAttribute (method.Parent);
+ return method.GetObsoleteAttribute ();
}
public override string[] ValidAttributeTargets {
return attribute_targets;
}
}
+
+ public override Parameters ParameterInfo {
+ get {
+ return method.parameters;
+ }
+ }
+
}
public DelegateMethod Add, Remove;
public MyEventBuilder EventBuilder;
public MethodBuilder AddBuilder, RemoveBuilder;
+ Parameters parameters;
- public Event (TypeContainer parent, Expression type, int mod_flags,
- bool is_iface, MemberName name, Object init, Attributes attrs,
- Location loc)
+ protected Event (TypeContainer parent, Expression type, int mod_flags,
+ bool is_iface, MemberName name, Attributes attrs)
: base (parent, type, mod_flags,
is_iface ? AllowedInterfaceModifiers : AllowedModifiers,
- name, init, attrs, loc)
+ name, attrs)
{
IsInterface = is_iface;
}
if (!DoDefine ())
return false;
- if (init != null && ((ModFlags & Modifiers.ABSTRACT) != 0)){
- Report.Error (74, Location, "'" + Parent.Name + "." + Name +
- "': abstract event can not have an initializer");
- return false;
- }
-
if (!TypeManager.IsDelegateType (MemberType)) {
- Report.Error (66, Location, "'" + Parent.Name + "." + Name +
- "' : event must be of a delegate type");
+ Report.Error (66, Location, "`{0}': event must be of a delegate type", GetSignatureForError ());
return false;
}
ec.InUnsafe = InUnsafe;
Parameter [] parms = new Parameter [1];
- parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
- Parameters parameters = new Parameters (parms, null, Location);
- Type [] types = parameters.GetParameterInfo (ec);
- InternalParameters ip = new InternalParameters (types, parameters);
+ parms [0] = new Parameter (MemberType, "value", Parameter.Modifier.NONE, null, Location);
+ parameters = new Parameters (parms);
+ parameters.Resolve (null);
ec.InUnsafe = old_unsafe;
// Now define the accessors
//
- AddBuilder = Add.Define (Parent, ip);
+ AddBuilder = Add.Define (Parent);
if (AddBuilder == null)
return false;
- RemoveBuilder = Remove.Define (Parent, ip);
+ RemoveBuilder = Remove.Define (Parent);
if (RemoveBuilder == null)
return false;
if (conflict_symbol != null && (ModFlags & Modifiers.NEW) == 0) {
if (!(conflict_symbol is EventInfo)) {
Report.SymbolRelatedToPreviousError (conflict_symbol);
- Report.Error (72, Location, "Event '{0}' can override only event", GetSignatureForError (Parent));
+ Report.Error (72, Location, "Event `{0}' can override only event", GetSignatureForError ());
return false;
}
}
public override string GetSignatureForError ()
{
- if (EventBuilder == null)
- return base.GetSignatureForError (Parent);
-
- return TypeManager.GetFullNameSignature (EventBuilder);
+ return base.GetSignatureForError ();
}
//
}
- public class Indexer : PropertyBase {
+ public class Indexer : PropertyBase, IIteratorContainer {
- class GetIndexerMethod: GetMethod
+ class GetIndexerMethod : GetMethod
{
public GetIndexerMethod (MethodCore method):
base (method)
{
}
- // TODO: one GetSignatureForError is enough (reuse Parent member)
- public override string GetSignatureForError (TypeContainer tc)
- {
- string core = base.GetSignatureForError (tc);
- return core.Replace (TypeContainer.DefaultIndexerName,
- String.Format ("this[{0}]", TypeManager.CSharpName (ParameterTypes)));
- }
-
- public override Type[] ParameterTypes {
+ public override Parameters ParameterInfo {
get {
- return method.ParameterTypes;
+ return method.ParameterInfo;
}
}
}
class SetIndexerMethod: SetMethod
{
- readonly Parameters parameters;
-
public SetIndexerMethod (MethodCore method):
base (method)
{
}
- public SetIndexerMethod (MethodCore method, Parameters parameters, Accessor accessor):
+ public SetIndexerMethod (MethodCore method, Accessor accessor):
base (method, accessor)
{
- this.parameters = parameters;
- }
-
- public override Type[] ParameterTypes {
- get {
- int top = method.ParameterTypes.Length;
- Type [] set_pars = new Type [top + 1];
- method.ParameterTypes.CopyTo (set_pars, 0);
- set_pars [top] = method.MemberType;
- return set_pars;
- }
}
- protected override InternalParameters GetParameterInfo (EmitContext ec)
+ protected override void DefineParameters ()
{
- Parameter [] fixed_parms = parameters.FixedParameters;
-
- if (fixed_parms == null){
- throw new Exception ("We currently do not support only array arguments in an indexer at: " + method.Location);
- // BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
- // BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
- //
- // Here is the problem: the `value' parameter has
- // to come *after* the array parameter in the declaration
- // like this:
- // X (object [] x, Type value)
- // .param [0]
- //
- // BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
- // BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
-
- }
-
+ Parameter [] fixed_parms = method.Parameters.FixedParameters;
Parameter [] tmp = new Parameter [fixed_parms.Length + 1];
fixed_parms.CopyTo (tmp, 0);
tmp [fixed_parms.Length] = new Parameter (
- method.Type, "value", Parameter.Modifier.NONE, null);
+ method.MemberType, "value", Parameter.Modifier.NONE, null, method.Location);
- Parameters set_formal_params = new Parameters (tmp, null, method.Location);
- Type [] types = set_formal_params.GetParameterInfo (ec);
-
- return new InternalParameters (types, set_formal_params);
+ parameters = new Parameters (tmp);
+ parameters.Resolve (null);
}
}
//
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)
+ Accessor get_block, Accessor set_block)
: base (parent, type, mod,
is_iface ? AllowedInterfaceModifiers : AllowedModifiers,
- is_iface, name, parameters, attrs, loc)
+ is_iface, name, parameters, attrs)
{
if (get_block == null)
Get = new GetIndexerMethod (this);
if (set_block == null)
Set = new SetIndexerMethod (this);
else
- Set = new SetIndexerMethod (this, parameters, set_block);
+ Set = new SetIndexerMethod (this, set_block);
}
public override bool Define ()
{
- PropertyAttributes prop_attr =
- PropertyAttributes.RTSpecialName |
- PropertyAttributes.SpecialName;
-
if (!DoDefineBase ())
return false;
if (IsExplicitImpl) {
Report.Error (415, indexer_attr.Location,
- "The 'IndexerName' attribute is valid only on an " +
+ "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");
+ "Cannot set the `IndexerName' attribute on an indexer marked override");
return false;
}
if (!Tokenizer.IsValidIdentifier (ShortName)) {
Report.Error (633, indexer_attr.Location,
- "The argument to the 'IndexerName' attribute must be a valid identifier");
+ "The argument to the `IndexerName' attribute must be a valid identifier");
return false;
}
}
GetBuilder = Get.Define (Parent);
if (GetBuilder == null)
return false;
+
+ //
+ // Setup iterator if we are one
+ //
+ if ((ModFlags & Modifiers.METHOD_YIELDS) != 0){
+ Iterator iterator = new Iterator (
+ Get, Parent, null, ModFlags);
+
+ if (!iterator.DefineIterator ())
+ return false;
+ }
}
+ SetBuilder = Set.Define (Parent);
if (!Set.IsDummy){
- SetBuilder = Set.Define (Parent);
if (SetBuilder == null)
return false;
}
//
Parameter [] p = Parameters.FixedParameters;
if (p != null) {
+ // TODO: should be done in parser and it needs to do cycle
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.IsDummy)
- GetBuilder.DefineParameter (
- i + 1, p [i].Attributes, p [i].Name);
-
- if (!Set.IsDummy)
- SetBuilder.DefineParameter (
- i + 1, p [i].Attributes, p [i].Name);
- }
-
- if (!Set.IsDummy)
- SetBuilder.DefineParameter (
- i + 1, ParameterAttributes.None, "value");
-
- if (i != ParameterTypes.Length) {
- Parameter array_param = Parameters.ArrayParameter;
-
- SetBuilder.DefineParameter (
- i + 1, array_param.Attributes, array_param.Name);
- }
}
PropertyBuilder = Parent.TypeBuilder.DefineProperty (
- Name, prop_attr, MemberType, ParameterTypes);
+ Name, PropertyAttributes.None, MemberType, ParameterTypes);
if (!Get.IsDummy)
PropertyBuilder.SetGetMethod (GetBuilder);
public override string GetSignatureForError ()
{
- if (PropertyBuilder == null)
- return GetSignatureForError (Parent);
-
- return TypeManager.CSharpSignature (PropertyBuilder, true);
- }
+ StringBuilder sb = new StringBuilder (Parent.GetSignatureForError ());
+ if (MemberName.Left != null) {
+ sb.Append ('.');
+ sb.Append (MemberName.Left);
+ }
- public override string GetSignatureForError(TypeContainer tc)
- {
- return String.Concat (tc.Name, ".this[", Parameters.FixedParameters [0].TypeName.ToString (), ']');
+ sb.Append (".this");
+ sb.Append (Parameters.GetSignatureForError ().Replace ('(', '[').Replace (')', ']'));
+ return sb.ToString ();
}
public override bool MarkForDuplicationCheck ()
caching_flags |= Flags.TestMethodDuplication;
return true;
}
-
}
public class Operator : MethodCore, IIteratorContainer {
// Implicit and Explicit
Implicit,
- Explicit
+ Explicit,
+
+ // Just because of enum
+ TOP
};
public readonly OpType OperatorType;
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)
+ new MemberName ("op_" + type, loc), attrs, parameters)
{
OperatorType = type;
Block = block;
}
}
- protected override bool CheckGenericOverride (MethodInfo method, string name)
- {
- return true;
- }
-
protected override bool CheckForDuplications()
{
ArrayList ar = Parent.Operators;
{
const int RequiredModifiers = Modifiers.PUBLIC | Modifiers.STATIC;
if ((ModFlags & RequiredModifiers) != RequiredModifiers){
- Report.Error (558, Location, "User defined operators '{0}' must be declared static and public", GetSignatureForError (Parent));
+ Report.Error (558, Location, "User-defined operator `{0}' must be declared static and public", GetSignatureForError ());
return false;
}
OperatorMethod = new Method (
Parent, null, Type, ModFlags, false, MemberName,
- Parameters, OptAttributes, Location);
+ Parameters, OptAttributes);
OperatorMethod.Block = Block;
- OperatorMethod.IsOperator = true;
+ OperatorMethod.IsOperator = this;
OperatorMethod.flags |= MethodAttributes.SpecialName | MethodAttributes.HideBySig;
OperatorMethod.Define ();
OperatorMethodBuilder = OperatorMethod.MethodBuilder;
- parameter_types = OperatorMethod.ParameterTypes;
+ Type[] parameter_types = OperatorMethod.ParameterTypes;
Type declaring_type = OperatorMethod.MethodData.DeclaringType;
Type return_type = OperatorMethod.ReturnType;
Type first_arg_type = parameter_types [0];
if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
if (first_arg_type == return_type && first_arg_type == declaring_type){
- Report.Error (
- 555, Location,
- "User-defined conversion cannot take an object of the " +
- "enclosing type and convert to an object of the enclosing" +
- " type");
+ Report.Error (555, Location,
+ "User-defined operator cannot take an object of the enclosing type and convert to an object of the enclosing type");
return false;
}
}
if (first_arg_type.IsInterface || return_type.IsInterface){
- Report.Error (
- 552, Location,
- "User-defined conversion cannot convert to or from an " +
- "interface type");
+ Report.Error (552, Location, "User-defined conversion `{0}' cannot convert to or from an interface type",
+ GetSignatureForError ());
return false;
}
if (first_arg_type.IsSubclassOf (return_type)
|| return_type.IsSubclassOf (first_arg_type)){
if (declaring_type.IsSubclassOf (return_type)) {
- Report.Error (553, Location, "'{0}' : user defined conversion to/from base class", GetSignatureForError ());
+ Report.Error (553, Location, "User-defined conversion `{0}' cannot convert to or from base class",
+ GetSignatureForError ());
return false;
}
- Report.Error (554, Location, "'{0}' : user defined conversion to/from derived class", GetSignatureForError ());
+ Report.Error (554, Location, "User-defined conversion `{0}' cannot convert to or from derived class",
+ GetSignatureForError ());
return false;
}
} else if (OperatorType == OpType.LeftShift || OperatorType == OpType.RightShift) {
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) {
+ } else if (Parameters.Count == 1) {
// Checks for Unary operators
if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
}
} else {
- if (OperatorType == OpType.BitwiseAnd &&
- (first_arg_type != return_type || first_arg_type != parameter_types [1])) {
- Report.Error (217, Location, "In order to be applicable as a short circuit operator a user-defined logical operator ('{0}') " +
- "must have the same return type as the type of its 2 parameters", GetSignatureForError ());
- return false;
- }
-
// Checks for Binary operators
if (first_arg_type != declaring_type &&
}
}
- public override string GetSignatureForError (TypeContainer tc)
+ public static OpType GetOperatorType (string name)
{
- 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 ());
+ if (name.StartsWith ("op_")){
+ for (int i = 0; i < Unary.oper_names.Length; ++i) {
+ if (Unary.oper_names [i] == name)
+ return (OpType)i;
+ }
+
+ for (int i = 0; i < Binary.oper_names.Length; ++i) {
+ if (Binary.oper_names [i] == name)
+ return (OpType)i;
+ }
}
- sb.Append (")");
- return sb.ToString ();
+ return OpType.TOP;
}
public override string GetSignatureForError ()
{
- return ToString ();
+ StringBuilder sb = new StringBuilder ();
+ if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
+ sb.AppendFormat ("{0}.{1} operator {2}", Parent.GetSignatureForError (), GetName (OperatorType), Type.Type == null ? Type.ToString () : TypeManager.CSharpName (Type.Type));
+ }
+ else {
+ sb.AppendFormat ("{0}.operator {1}", Parent.GetSignatureForError (), GetName (OperatorType));
+ }
+
+ sb.Append (Parameters.GetSignatureForError ());
+ return sb.ToString ();
}
public override bool MarkForDuplicationCheck ()
return true;
}
- public override string ToString ()
- {
- if (OperatorMethod == null)
- return Name;
-
- Type return_type = OperatorMethod.ReturnType;
- Type [] param_types = OperatorMethod.ParameterTypes;
-
- if (Parameters.FixedParameters.Length == 1)
- return String.Format (
- "{0} operator {1}({2})",
- TypeManager.CSharpName (return_type),
- GetName (OperatorType),
- param_types [0]);
- else
- return String.Format (
- "{0} operator {1}({2}, {3})",
- TypeManager.CSharpName (return_type),
- GetName (OperatorType),
- param_types [0], param_types [1]);
- }
-
public override string[] ValidAttributeTargets {
get {
return attribute_targets;
}
}
-
- public void SetYields ()
- {
- ModFlags |= Modifiers.METHOD_YIELDS;
- }
}
//
RetType = ret_type;
if (parameters == null)
- Parameters = TypeManager.NoTypes;
+ Parameters = Type.EmptyTypes;
else
Parameters = parameters;
}
Type [] args;
if (mi != null)
- args = TypeManager.GetArgumentTypes (mi);
+ args = TypeManager.GetParameterData (mi).Types;
else
args = TypeManager.GetArgumentTypes (pi);
Type [] sigp = sig.Parameters;
projects / mono.git / blobdiff