//
// Licensed under the terms of the GNU GPL
//
-// (C) 2001 Ximian, Inc (http://www.ximian.com)
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
//
//
+using System;
using System.Collections;
using System.Reflection;
using System.Reflection.Emit;
-using System;
using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
namespace Mono.CSharp {
// Holds the list of
ArrayList interfaces;
+ // Holds order in which interfaces must be closed
+ ArrayList interface_order;
+
// Holds the methods.
ArrayList methods;
// Holds the operators
ArrayList operators;
+ // The emit context for toplevel objects.
+ EmitContext ec;
+
//
// Pointers to the default constructor and the default static constructor
//
// Whether we have seen a static constructor for this class or not
//
bool have_static_constructor = false;
+
+ //
+ // Whether we have at least one non-static field
+ //
+ bool have_nonstatic_fields = false;
//
// This one is computed after we can distinguish interfaces
// Information in the case we are an attribute type
- public AttributeTargets Targets;
- public bool AllowMultiple;
+ public AttributeTargets Targets = AttributeTargets.All;
+ public bool AllowMultiple = false;
public bool Inherited;
+
+ // The interfaces we implement.
+ Type [] ifaces;
+ //
+ // The indexer name for this class
+ //
+ public string IndexerName;
public TypeContainer (TypeContainer parent, string name, Location l)
: base (parent, name, l)
if (methods == null)
methods = new ArrayList ();
- methods.Add (method);
+ if (method.Name.IndexOf (".") != -1)
+ methods.Insert (0, method);
+ else
+ methods.Add (method);
+
if (value != null)
DefineName (name, method);
{
AdditionResult res;
string name = field.Name;
-
+
if ((res = IsValid (name)) != AdditionResult.Success)
return res;
-
+
if (fields == null)
fields = new ArrayList ();
-
+
fields.Add (field);
if (field.Initializer != null){
initialized_fields.Add (field);
}
}
-
+
+ if ((field.ModFlags & Modifiers.STATIC) == 0)
+ have_nonstatic_fields = true;
+
DefineName (name, field);
return AdditionResult.Success;
}
if (properties == null)
properties = new ArrayList ();
- properties.Add (prop);
+ if (prop.Name.IndexOf (".") != -1)
+ properties.Insert (0, prop);
+ else
+ properties.Add (prop);
DefineName (name, prop);
return AdditionResult.Success;
if (indexers == null)
indexers = new ArrayList ();
- indexers.Add (i);
+ if (i.InterfaceType != null)
+ indexers.Insert (0, i);
+ else
+ indexers.Add (i);
return AdditionResult.Success;
}
return AdditionResult.Success;
}
+
+ public void RegisterOrder (Interface iface)
+ {
+ if (interface_order == null)
+ interface_order = new ArrayList ();
+
+ interface_order.Add (iface);
+ }
public ArrayList Types {
get {
get {
return fields;
}
+
+ set {
+ fields = value;
+ }
}
public ArrayList InstanceConstructors {
}
}
- //
- // root_types contains all the types. All TopLevel types
- // hence have a parent that points to `root_types', that is
- // why there is a non-obvious test down here.
- //
- public bool IsTopLevel {
- get {
- if (Parent != null){
- if (Parent.Parent == null)
- return true;
- }
- return false;
- }
- }
-
public bool HaveStaticConstructor {
get {
return have_static_constructor;
//
// Emits the instance field initializers
//
- public bool EmitFieldInitializers (EmitContext ec, bool is_static)
+ public bool EmitFieldInitializers (EmitContext ec)
{
ArrayList fields;
ILGenerator ig = ec.ig;
-
- if (is_static)
+ Expression instance_expr;
+
+ if (ec.IsStatic){
fields = initialized_static_fields;
- else
+ instance_expr = null;
+ } else {
fields = initialized_fields;
+ instance_expr = new This (Location.Null).Resolve (ec);
+ }
if (fields == null)
return true;
if (init is Expression)
e = (Expression) init;
else {
- string base_type = f.Type.Substring (0, f.Type.IndexOf ("["));
- string rank = f.Type.Substring (f.Type.IndexOf ("["));
- e = new ArrayCreation (base_type, rank, (ArrayList) init, f.Location);
+ e = new ArrayCreation (f.Type, "", (ArrayList)init, f.Location);
}
-
- e = e.Resolve (ec);
- if (e == null)
+
+ Location l = f.Location;
+ FieldExpr fe = new FieldExpr (f.FieldBuilder, l);
+ fe.InstanceExpression = instance_expr;
+ Expression a = new Assign (fe, e, l);
+
+ a = a.Resolve (ec);
+ if (a == null)
return false;
-
- if (!is_static)
- ig.Emit (OpCodes.Ldarg_0);
-
- e.Emit (ec);
-
- if (is_static)
- ig.Emit (OpCodes.Stsfld, f.FieldBuilder);
- else
- ig.Emit (OpCodes.Stfld, f.FieldBuilder);
-
+
+ if (a is ExpressionStatement)
+ ((ExpressionStatement) a).EmitStatement (ec);
+ else {
+ throw new Exception ("Assign.Resolve returned a non ExpressionStatement");
+ }
}
return true;
}
}
- struct TypeAndMethods {
- public Type type;
- public MethodInfo [] methods;
-
- // Far from ideal, but we want to avoid creating a copy
- // of methods above.
- public Type [][] args;
-
- //
- // This flag on the method says `We found a match, but
- // because it was private, we could not use the match
- //
- public bool [] found;
- }
-
- //
- // This array keeps track of the pending implementations
- //
- TypeAndMethods [] pending_implementations;
-
- //
- // Returns a list of the abstract methods that are exposed by all of our
- // parents that we must implement. Notice that this `flattens' the
- // method search space, and takes into account overrides.
- //
- ArrayList GetAbstractMethods (Type t)
- {
- ArrayList list = null;
- bool searching = true;
- Type current_type = t;
-
- do {
- MemberInfo [] mi;
-
- mi = FindMembers (
- current_type, MemberTypes.Method,
- BindingFlags.Public | BindingFlags.Instance |
- BindingFlags.DeclaredOnly,
- virtual_method_filter, null);
-
- if (current_type == TypeManager.object_type)
- searching = false;
- else {
- current_type = current_type.BaseType;
- if (!current_type.IsAbstract)
- searching = false;
- }
-
- if (mi == null)
- continue;
-
- int count = mi.Length;
- if (count == 0)
- continue;
-
- if (count == 1 && !(mi [0] is MethodBase))
- searching = false;
- else
- list = Expression.CopyNewMethods (list, mi);
- } while (searching);
-
- if (list == null)
- return null;
-
- for (int i = 0; i < list.Count; i++){
- while (list.Count > i && !((MethodInfo) list [i]).IsAbstract)
- list.RemoveAt (i);
- }
-
- if (list.Count == 0)
- return null;
-
- return list;
- }
-
- //
- // Registers the required method implementations for this class
- //
- // Register method implementations are either abstract methods
- // flagged as such on the base class or interface methods
- //
- public void RegisterRequiredImplementations ()
- {
- Type [] ifaces = TypeBuilder.GetInterfaces ();
- Type b = TypeBuilder.BaseType;
- int icount = 0;
-
- icount = ifaces.Length;
-
- //
- // If we are implementing an abstract class, and we are not
- // ourselves abstract, and there are abstract methods (C# allows
- // abstract classes that have no abstract methods), then allocate
- // one slot.
- //
- // We also pre-compute the methods.
- //
- bool implementing_abstract = (b.IsAbstract && !TypeBuilder.IsAbstract);
- ArrayList abstract_methods = null;
-
- if (implementing_abstract){
- abstract_methods = GetAbstractMethods (b);
-
- if (abstract_methods == null)
- implementing_abstract = false;
- }
-
- int total = icount + (implementing_abstract ? 1 : 0);
- if (total == 0)
- return;
-
- pending_implementations = new TypeAndMethods [total];
-
- int i = 0;
- if (ifaces != null){
- foreach (Type t in ifaces){
- MethodInfo [] mi;
-
- if (t is TypeBuilder){
- Interface iface;
-
- iface = RootContext.TypeManager.LookupInterface (t);
-
- mi = iface.GetMethods ();
- } else
- mi = t.GetMethods ();
-
- int count = mi.Length;
- pending_implementations [i].type = t;
- pending_implementations [i].methods = mi;
- pending_implementations [i].args = new Type [count][];
- pending_implementations [i].found = new bool [count];
-
- int j = 0;
- foreach (MethodInfo m in mi){
- Type [] types = TypeManager.GetArgumentTypes (m);
-
- pending_implementations [i].args [j] = types;
- j++;
- }
- i++;
- }
- }
-
- if (abstract_methods != null){
- int count = abstract_methods.Count;
- pending_implementations [i].methods = new MethodInfo [count];
-
- abstract_methods.CopyTo (pending_implementations [i].methods, 0);
- pending_implementations [i].found = new bool [count];
- pending_implementations [i].args = new Type [count][];
- pending_implementations [i].type = TypeBuilder;
-
- int j = 0;
- foreach (MemberInfo m in abstract_methods){
- MethodInfo mi = (MethodInfo) m;
-
- Type [] types = TypeManager.GetArgumentTypes (mi);
-
- pending_implementations [i].args [j] = types;
- j++;
- }
- }
- }
-
- public static string MakeFQN (string nsn, string name)
- {
- string prefix = (nsn == "" ? "" : nsn + ".");
-
- return prefix + name;
- }
-
- Type LookupInterfaceOrClass (object builder, string ns, string name, bool is_class, out bool error)
- {
- TypeContainer parent;
- Type t;
-
- error = false;
- name = MakeFQN (ns, name);
-
- t = RootContext.TypeManager.LookupType (name);
- if (t != null)
- return t;
-
- if (is_class)
- parent = (Class) RootContext.Tree.Classes [name];
- else
- parent = (Struct) RootContext.Tree.Structs [name];
-
- if (parent != null){
- t = parent.DefineType (builder);
- if (t == null){
- Report.Error (146, "Class definition is circular: `"+name+"'");
- error = true;
- return null;
- }
-
- return t;
- }
-
- return null;
- }
-
- //
- // returns the type for an interface or a class, this will recursively
- // try to define the types that it depends on.
- //
- Type GetInterfaceOrClass (object builder, string name, bool is_class)
- {
- Type t;
- bool error;
-
- //
- // Attempt to lookup the class on our namespace and all it's implicit parents
- //
- for (string ns = Namespace.Name; ns != null; ns = RootContext.ImplicitParent (ns)) {
-
- t = LookupInterfaceOrClass (builder, ns, name, is_class, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
- }
-
- //
- // Attempt to do a direct unqualified lookup
- //
- t = LookupInterfaceOrClass (builder, "", name, is_class, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
-
- //
- // Attempt to lookup the class on any of the `using'
- // namespaces
- //
-
- for (Namespace ns = Namespace; ns != null; ns = ns.Parent){
-
- t = LookupInterfaceOrClass (builder, ns.Name, name, is_class, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
-
- //
- // Now check the using clause list
- //
- ArrayList using_list = ns.UsingTable;
-
- if (using_list == null)
- continue;
-
- foreach (string n in using_list){
- t = LookupInterfaceOrClass (builder, n, name, is_class, out error);
- if (error)
- return null;
-
- if (t != null)
- return t;
- }
-
- }
-
- Report.Error (246, Location, "Can not find type `"+name+"'");
- return null;
- }
+ /// <remarks>
+ /// The pending methods that need to be implemented (interfaces or abstract methods)
+ /// </remarks>
+ public PendingImplementation Pending;
/// <summary>
/// This function computes the Base class and also the
/// The @parent argument is set to the parent object or null
/// if this is `System.Object'.
/// </summary>
- Type [] GetClassBases (object builder, bool is_class, out Type parent, out bool error)
+ Type [] GetClassBases (bool is_class, out Type parent, out bool error)
{
ArrayList bases = Bases;
int count;
count = bases.Count;
if (is_class){
- string name = (string) bases [0];
- Type first = GetInterfaceOrClass (builder, name, is_class);
+ Expression name = (Expression) bases [0];
+ name = ResolveTypeExpr (name, false, Location);
- if (first == null){
+ if (name == null){
error = true;
return null;
}
-
+
+ Type first = name.Type;
+
if (first.IsClass){
parent = first;
start = 1;
parent = TypeManager.object_type;
start = 0;
}
+
} else {
start = 0;
}
Type [] ifaces = new Type [count-start];
for (i = start, j = 0; i < count; i++, j++){
- string name = (string) bases [i];
- Type t = GetInterfaceOrClass (builder, name, is_class);
-
+ Expression name = (Expression) bases [i];
+ Expression resolved = ResolveTypeExpr (name, false, Location);
+ bases [i] = resolved;
+ Type t = resolved.Type;
+
if (t == null){
error = true;
return null;
string detail = "";
if (t.IsValueType)
- detail = " (a class can not inherit from a struct)";
+ detail = " (a class can not inherit from a struct/enum)";
Report.Error (509, "class `"+ Name +
"': Cannot inherit from sealed class `"+
return null;
}
}
+
+ for (int x = 0; x < j; x++) {
+ if (t == ifaces [x]) {
+ Report.Error (528, "`" + name + "' is already listed in interface list");
+ error = true;
+ return null;
+ }
+ }
ifaces [j] = t;
}
- return ifaces;
+ return TypeManager.ExpandInterfaces (ifaces);
}
//
// Defines the type in the appropriate ModuleBuilder or TypeBuilder.
//
- public TypeBuilder DefineType (object parent_builder)
+ public override TypeBuilder DefineType ()
{
Type parent;
- Type [] ifaces;
bool error;
bool is_class;
else
is_class = false;
- ifaces = GetClassBases (parent_builder, is_class, out parent, out error);
+ ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+
+ ifaces = GetClassBases (is_class, out parent, out error);
if (error)
return null;
- if (this is Class){
+ if (is_class && parent != null){
if (parent == TypeManager.enum_type ||
(parent == TypeManager.value_type && RootContext.StdLib) ||
parent == TypeManager.delegate_type ||
return null;
}
}
-
- if (parent_builder is ModuleBuilder) {
- ModuleBuilder builder = (ModuleBuilder) parent_builder;
+
+ if (!is_class && TypeManager.value_type == null)
+ throw new Exception ();
+
+ TypeAttributes type_attributes = TypeAttr;
+
+ // if (parent_builder is ModuleBuilder) {
+ if (IsTopLevel){
+ ModuleBuilder builder = CodeGen.ModuleBuilder;
+
//
// Structs with no fields need to have a ".size 1"
// appended
//
- if (!is_class && Fields == null)
+ if (!is_class && !have_nonstatic_fields)
TypeBuilder = builder.DefineType (Name,
- TypeAttr,
+ type_attributes,
parent,
PackingSize.Unspecified, 1);
else
// classes or structs with fields
//
TypeBuilder = builder.DefineType (Name,
- TypeAttr,
+ type_attributes,
parent,
ifaces);
} else {
- TypeBuilder builder = (System.Reflection.Emit.TypeBuilder) parent_builder;
+ TypeBuilder builder = Parent.TypeBuilder;
//
// Structs with no fields need to have a ".size 1"
// appended
//
- if (!is_class && Fields == null)
+ if (!is_class && !have_nonstatic_fields)
TypeBuilder = builder.DefineNestedType (Basename,
- TypeAttr,
+ type_attributes,
parent,
PackingSize.Unspecified);
- else
- //
- // classes or structs with fields
- //
+ else {
+ //
+ // classes or structs with fields
+ //
TypeBuilder = builder.DefineNestedType (Basename,
- TypeAttr,
+ type_attributes,
parent,
ifaces);
+ }
+ }
+
+ // add interfaces that were not added at type creation (weird API issue)
+ if (!is_class && !have_nonstatic_fields && (ifaces != null)) {
+ foreach (Type i in ifaces)
+ TypeBuilder.AddInterfaceImplementation (i);
}
+
+ //
+ // Finish the setup for the EmitContext
+ //
+ ec.ContainerType = TypeBuilder;
- RootContext.TypeManager.AddUserType (Name, TypeBuilder, this);
- RootContext.RegisterOrder (this);
+ TypeManager.AddUserType (Name, TypeBuilder, this, ifaces);
+
+ if ((parent != null) &&
+ (parent == TypeManager.attribute_type ||
+ parent.IsSubclassOf (TypeManager.attribute_type))) {
+ RootContext.RegisterAttribute (this);
+ TypeManager.RegisterAttrType (TypeBuilder, this);
+ } else
+ RootContext.RegisterOrder (this);
+
+ if (Interfaces != null) {
+ foreach (Interface iface in Interfaces)
+ iface.DefineType ();
+ }
if (Types != null) {
foreach (TypeContainer tc in Types)
- tc.DefineType (TypeBuilder);
+ tc.DefineType ();
}
if (Delegates != null) {
foreach (Delegate d in Delegates)
- d.DefineDelegate (TypeBuilder);
+ d.DefineType ();
}
if (Enums != null) {
foreach (Enum en in Enums)
- en.DefineEnum (TypeBuilder);
+ en.DefineType ();
}
-
+
InTransit = false;
return TypeBuilder;
}
if (defined_names == null)
continue;
-
+
idx = Array.BinarySearch (defined_names, mc.Name, mif_compare);
-
if (idx < 0){
if (RootContext.WarningLevel >= 4){
if ((mc.ModFlags & Modifiers.NEW) != 0)
- Report109 (mc.Location, mc);
+ Warning_KewywordNewNotRequired (mc.Location, mc);
}
continue;
}
- if (defined_names [idx] is PropertyInfo &&
- ((mc.ModFlags & Modifiers.OVERRIDE) != 0)){
+ MemberInfo match = defined_names [idx];
+
+ if (match is PropertyInfo && ((mc.ModFlags & Modifiers.OVERRIDE) != 0))
continue;
- }
-
-#if WANT_TO_VERIFY_SIGNATURES_HERE
- if (defined_names [idx] is MethodBase && mc is MethodCore){
- MethodBase mb = (MethodBase) defined_names [idx];
- MethodCore met = (MethodCore) mc;
-
- if ((mb.IsVirtual || mb.IsAbstract) &&
- (mc.ModFlags & Modifiers.OVERRIDE) != 0)
- continue;
- //
- // FIXME: Compare the signatures here. If they differ,
- // then: `continue;'
- }
-#endif
- Report108 (mc.Location, defined_names [idx]);
+ //
+ // If we are both methods, let the method resolution emit warnings
+ //
+ if (match is MethodBase && mc is MethodCore)
+ continue;
+
+ if ((mc.ModFlags & Modifiers.NEW) == 0)
+ Warning_KeywordNewRequired (mc.Location, defined_names [idx]);
}
foreach (object o in remove_list)
remove_list.Clear ();
}
+
+ //
+ // Defines the indexers, and also verifies that the IndexerNameAttribute in the
+ // class is consisten. Either it is `Item' or it is the name defined by all the
+ // indexers with the `IndexerName' attribute.
+ //
+ // Turns out that the IndexerNameAttribute is applied to each indexer,
+ // but it is never emitted, instead a DefaultName attribute is attached
+ // to the class.
+ //
+ void DefineIndexers ()
+ {
+ string class_indexer_name = null;
+
+ foreach (Indexer i in Indexers){
+ string name;
+
+ i.Define (this);
+
+ name = i.IndexerName;
+ if (class_indexer_name == null){
+ class_indexer_name = name;
+ continue;
+ }
+
+ if (name == class_indexer_name)
+ continue;
+
+ Report.Error (
+ 668, "Two indexers have different names, " +
+ " you should use the same name for all your indexers");
+ }
+ if (class_indexer_name == null)
+ class_indexer_name = "Item";
+ IndexerName = class_indexer_name;
+ }
/// <summary>
/// Populates our TypeBuilder with fields and methods
if (this is Class){
if (instance_constructors == null){
- if (default_constructor == null)
+ if (default_constructor == null)
DefineDefaultConstructor (false);
}
ReportStructInitializedInstanceError ();
}
- RegisterRequiredImplementations ();
-
+ Pending = PendingImplementation.GetPendingImplementations (this);
+
//
// Constructors are not in the defined_names array
//
default_static_constructor.Define (this);
if (methods != null)
- DefineMembers (methods, null);
+ DefineMembers (methods, defined_names);
if (properties != null)
DefineMembers (properties, defined_names);
DefineMembers (events, defined_names);
if (indexers != null) {
- foreach (Indexer i in Indexers)
- i.Define (this);
- }
+ DefineIndexers ();
+ } else
+ IndexerName = "Item";
if (operators != null)
DefineMembers (operators, null);
return true;
}
- /// <summary>
- /// Looks up the alias for the name
- /// </summary>
- public string LookupAlias (string name)
- {
- if (Namespace != null)
- return Namespace.LookupAlias (name);
- else
- return null;
- }
-
/// <summary>
/// This function is based by a delegate to the FindMembers routine
/// </summary>
/// </summary>
static MemberFilter accepting_filter;
- static bool IsVirtualFilter (MemberInfo m, object filterCriteria)
- {
- if (!(m is MethodInfo))
- return false;
-
- return ((MethodInfo) m).IsVirtual;
- }
-
- /// <summary>
- /// This filter is used by FindMembers, and it is used to
- /// extract only virtual/abstract fields
- /// </summary>
- static MemberFilter virtual_method_filter;
/// <summary>
/// A member comparission method based on name only
static TypeContainer ()
{
accepting_filter = new MemberFilter (AlwaysAccept);
- virtual_method_filter = new MemberFilter (IsVirtualFilter);
mif_compare = new MemberInfoCompare ();
}
// FIXME: return an empty static array instead of null, that cleans up
// some code and is consistent with some coding conventions I just found
// out existed ;-)
+ //
+ //
+ // Notice that in various cases we check if our field is non-null,
+ // something that would normally mean that there was a bug elsewhere.
+ //
+ // The problem happens while we are defining p-invoke methods, as those
+ // will trigger a FindMembers, but this happens before things are defined
+ //
+ // Since the whole process is a no-op, it is fine to check for null here.
+ //
public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf,
MemberFilter filter, object criteria)
{
ArrayList members = new ArrayList ();
+ bool priv = (bf & BindingFlags.NonPublic) != 0;
if (filter == null)
filter = accepting_filter;
-
+
if ((mt & MemberTypes.Field) != 0) {
if (fields != null) {
foreach (Field f in fields) {
+ if ((f.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
FieldBuilder fb = f.FieldBuilder;
- if (filter (fb, criteria) == true)
+ if (fb != null && filter (fb, criteria) == true)
members.Add (fb);
}
}
if (constants != null) {
foreach (Const con in constants) {
+ if ((con.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
FieldBuilder fb = con.FieldBuilder;
- if (filter (fb, criteria) == true)
+ if (fb != null && filter (fb, criteria) == true)
members.Add (fb);
}
}
if ((mt & MemberTypes.Method) != 0) {
if (methods != null) {
foreach (Method m in methods) {
+ if ((m.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
MethodBuilder mb = m.MethodBuilder;
- // If we are in transit, ignore
- // This case arises when we are still defining a PInvoke method
- // and we hit FindMembers because of the need to resolve named
- // arguments inside of Attribute.DefinePInvokeMethod
- if (mb == null)
- continue;
-
- if (filter (mb, criteria) == true)
+ if (mb != null && filter (mb, criteria) == true)
members.Add (mb);
}
}
if (operators != null){
foreach (Operator o in operators) {
+ if ((o.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
MethodBuilder ob = o.OperatorMethodBuilder;
-
- if (filter (ob, criteria) == true)
+ if (ob != null && filter (ob, criteria) == true)
members.Add (ob);
}
}
+
+ if (properties != null){
+ foreach (Property p in properties){
+ if ((p.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
+ MethodBuilder b;
+
+ b = p.GetBuilder;
+ if (b != null && filter (b, criteria) == true)
+ members.Add (b);
+
+ b = p.SetBuilder;
+ if (b != null && filter (b, criteria) == true)
+ members.Add (b);
+ }
+ }
}
if ((mt & MemberTypes.Event) != 0) {
if (events != null)
foreach (Event e in events) {
- if (filter (e.EventBuilder, criteria) == true)
+ if ((e.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
+ MemberInfo eb = e.EventBuilder;
+ if (eb != null && filter (eb, criteria) == true)
members.Add (e.EventBuilder);
}
}
if ((mt & MemberTypes.Property) != 0){
if (properties != null)
foreach (Property p in properties) {
- if (filter (p.PropertyBuilder, criteria) == true) {
+ if ((p.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
+ MemberInfo pb = p.PropertyBuilder;
+ if (pb != null && filter (pb, criteria) == true) {
members.Add (p.PropertyBuilder);
}
}
if (indexers != null)
foreach (Indexer ix in indexers) {
- if (filter (ix.PropertyBuilder, criteria) == true) {
+ if ((ix.ModFlags & Modifiers.PRIVATE) != 0)
+ if (!priv)
+ continue;
+
+ MemberInfo ib = ix.PropertyBuilder;
+ if (ib != null && filter (ib, criteria) == true) {
members.Add (ix.PropertyBuilder);
}
}
}
if ((mt & MemberTypes.NestedType) != 0) {
+ if (types != null){
+ foreach (TypeContainer t in types) {
+ TypeBuilder tb = t.TypeBuilder;
- if (Types != null)
- foreach (TypeContainer t in Types)
- if (filter (t.TypeBuilder, criteria) == true)
- members.Add (t.TypeBuilder);
+ if (tb != null && (filter (tb, criteria) == true))
+ members.Add (tb);
+ }
+ }
+
+ if (enums != null){
+ foreach (Enum en in enums){
+ TypeBuilder tb = en.TypeBuilder;
- if (Enums != null)
- foreach (Enum en in Enums)
- if (filter (en.TypeBuilder, criteria) == true)
- members.Add (en.TypeBuilder);
+ if (tb != null && (filter (tb, criteria) == true))
+ members.Add (tb);
+ }
+ }
+ if (delegates != null){
+ foreach (Delegate d in delegates){
+ TypeBuilder tb = d.TypeBuilder;
+
+ if (tb != null && (filter (tb, criteria) == true))
+ members.Add (tb);
+ }
+ }
}
if ((mt & MemberTypes.Constructor) != 0){
foreach (Constructor c in instance_constructors){
ConstructorBuilder cb = c.ConstructorBuilder;
- if (filter (cb, criteria) == true)
- members.Add (cb);
+ if (cb != null)
+ if (filter (cb, criteria) == true)
+ members.Add (cb);
}
}
ConstructorBuilder cb =
default_static_constructor.ConstructorBuilder;
+ if (cb != null)
if (filter (cb, criteria) == true)
members.Add (cb);
}
//
// Lookup members in parent if requested.
//
- if ((bf & BindingFlags.DeclaredOnly) == 0){
+ if (((bf & BindingFlags.DeclaredOnly) == 0) && (TypeBuilder.BaseType != null)) {
MemberInfo [] mi;
mi = FindMembers (TypeBuilder.BaseType, mt, bf, filter, criteria);
if (count > 0){
MemberInfo [] mi = new MemberInfo [count];
members.CopyTo (mi);
- return mi;
- }
-
- return null;
- }
-
- public MemberInfo GetFieldFromEvent (EventExpr event_expr)
- {
- EventInfo ei = event_expr.EventInfo;
-
- foreach (Event e in events) {
-
- if (e.FieldBuilder == null)
- continue;
-
- if (Type.FilterName (e.FieldBuilder, ei.Name))
- return e.FieldBuilder;
+ return mi;
}
return null;
}
+
+
public static MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
MemberFilter filter, object criteria)
{
else
return t.FindMembers (mt, bf, filter, criteria);
}
-
- /// <summary>
- /// Whether the specified method is an interface method implementation
- /// </summary>
- ///
- /// <remarks>
- /// If a method in Type `t' (or null to look in all interfaces
- /// and the base abstract class) with name `Name', return type `ret_type' and
- /// arguments `args' implements an interface, this method will
- /// return the MethodInfo that this method implements.
- ///
- /// This will remove the method from the list of "pending" methods
- /// that are required to be implemented for this class as a side effect.
- ///
- /// </remarks>
- public MethodInfo IsInterfaceMethod (Type t, string Name, Type ret_type, Type [] args,
- bool clear)
- {
- if (pending_implementations == null)
- return null;
-
- foreach (TypeAndMethods tm in pending_implementations){
- if (!(t == null || tm.type == t))
- continue;
-
- int i = 0;
- foreach (MethodInfo m in tm.methods){
- if (m == null){
- i++;
- continue;
- }
-
- if (Name != m.Name){
- i++;
- continue;
- }
-
- if (ret_type != m.ReturnType){
- i++;
- continue;
- }
-
- if (args == null){
- if (tm.args [i] == null || tm.args [i].Length == 0){
- if (clear)
- tm.methods [i] = null;
- tm.found [i] = true;
- return m;
- }
- i++;
- continue;
- }
-
- if (tm.args == null){
- Console.WriteLine ("Type: " + tm.type);
- Console.WriteLine ("method: " + tm.methods [i]);
- }
-
- if (tm.args [i] == null){
- i++;
- continue;
- }
-
- //
- // Check if we have the same parameters
- //
- if (tm.args [i].Length != args.Length){
- i++;
- continue;
- }
-
- int j, top = args.Length;
- bool fail = false;
-
- for (j = 0; j < top; j++){
- if (tm.args [i][j] != args[j]){
- fail = true;
- break;
- }
- }
- if (fail){
- i++;
- continue;
- }
-
- if (clear)
- tm.methods [i] = null;
- tm.found [i] = true;
- return m;
- }
-
- // If a specific type was requested, we can stop now.
- if (tm.type == t)
- return null;
- }
- return null;
- }
- /// <summary>
- /// Verifies that any pending abstract methods or interface methods
- /// were implemented.
- /// </summary>
- bool VerifyPendingMethods ()
+ //
+ // FindMethods will look for methods not only in the type `t', but in
+ // any interfaces implemented by the type.
+ //
+ public static MethodInfo [] FindMethods (Type t, BindingFlags bf,
+ MemberFilter filter, object criteria)
{
- int top = pending_implementations.Length;
- bool errors = false;
- int i;
-
- for (i = 0; i < top; i++){
- Type type = pending_implementations [i].type;
- int j = 0;
-
- foreach (MethodInfo mi in pending_implementations [i].methods){
- if (mi == null)
- continue;
-
- if (type.IsInterface){
- string extra = "";
-
- if (pending_implementations [i].found [j])
- extra = ". (method might be private or static)";
- Report.Error (
- 536, Location,
- "`" + Name + "' does not implement " +
- "interface member `" +
- type.FullName + "." + mi.Name + "'" + extra);
- } else {
- Report.Error (
- 534, Location,
- "`" + Name + "' does not implement " +
- "inherited abstract member `" +
- type.FullName + "." + mi.Name + "'");
- }
- errors = true;
- j++;
- }
- }
- return errors;
+ return null;
}
/// <summary>
con.EmitConstant (this);
return;
}
-
+
/// <summary>
/// Emits the code, this step is performed after all
/// the types, enumerations, constructors
foreach (Property p in properties)
p.Emit (this);
- if (indexers != null) {
+ if (indexers != null){
foreach (Indexer ix in indexers)
ix.Emit (this);
-
- CustomAttributeBuilder cb = Interface.EmitDefaultMemberAttr (this, ModFlags, Location);
-
+
+ CustomAttributeBuilder cb = Interface.EmitDefaultMemberAttr (
+ this, IndexerName, ModFlags, Location);
TypeBuilder.SetCustomAttribute (cb);
}
e.Emit (this);
}
- if (pending_implementations != null)
- if (!VerifyPendingMethods ())
+ if (Pending != null)
+ if (Pending.VerifyPendingMethods ())
return;
-
- EmitContext ec = new EmitContext (
- this, Mono.CSharp.Location.Null, null, null,
- ModFlags, false);
-
+
Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
//
// Check for internal or private fields that were never assigned
//
- if (RootContext.WarningLevel >= 3){
- foreach (Field f in fields){
+ if (fields != null && RootContext.WarningLevel >= 3) {
+ foreach (Field f in fields) {
if ((f.ModFlags & Modifiers.PUBLIC) != 0)
continue;
//
if (RootContext.WarningLevel < 4)
continue;
-
+
if ((f.status & Field.Status.ASSIGNED) != 0)
continue;
//
// Report.Warning (-20, "Exception while creating class: " + TypeBuilder.Name);
// Console.WriteLine (e.Message);
+ } catch {
+ Console.WriteLine ("In type: " + Name);
+ throw;
}
if (Enums != null)
foreach (Enum en in Enums)
en.CloseType ();
+
+ if (interface_order != null){
+ foreach (Interface iface in interface_order)
+ iface.CloseType ();
+ }
if (Types != null){
foreach (TypeContainer tc in Types)
return "`" + Name + "." + n + "'";
}
- public void Report108 (Location l, MemberInfo mi)
+ public void Warning_KeywordNewRequired (Location l, MemberInfo mi)
{
Report.Warning (
108, l, "The keyword new is required on " +
mi.ReflectedType.Name + "." + mi.Name + "'");
}
- public void Report109 (Location l, MemberCore mc)
+ public void Warning_KewywordNewNotRequired (Location l, MemberCore mc)
{
Report.Warning (
109, l, "The member " + MakeName (mc.Name) + " does not hide an " +
public bool MethodModifiersValid (int flags, string n, Location loc)
{
const int vao = (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE);
+ const int va = (Modifiers.VIRTUAL | Modifiers.ABSTRACT);
const int nv = (Modifiers.NEW | Modifiers.VIRTUAL);
bool ok = true;
string name = MakeName (n);
}
}
+ if (this is Struct){
+ if ((flags & va) != 0){
+ Modifiers.Error_InvalidModifier (loc, "virtual or abstract");
+ ok = false;
+ }
+ }
+
if ((flags & Modifiers.OVERRIDE) != 0 && (flags & nv) != 0){
Report.Error (
113, loc, name +
builder_and_args = new Hashtable ();
return true;
}
+
+ /// <summary>
+ /// Performs checks for an explicit interface implementation. First it
+ /// checks whether the `interface_type' is a base inteface implementation.
+ /// Then it checks whether `name' exists in the interface type.
+ /// </summary>
+ public bool VerifyImplements (Type interface_type, string full, string name, Location loc)
+ {
+ bool found = false;
+
+ if (ifaces != null){
+ foreach (Type t in ifaces){
+ if (t == interface_type){
+ found = true;
+ break;
+ }
+ }
+ }
+
+ if (!found){
+ Report.Error (540, "`" + full + "': containing class does not implement interface `" + interface_type.FullName + "'");
+ return false;
+ }
+
+ return true;
+ }
+
+ public static void Error_ExplicitInterfaceNotMemberInterface (Location loc, string name)
+ {
+ Report.Error (539, loc, "Explicit implementation: `" + name + "' is not a member of the interface");
+ }
}
public class Class : TypeContainer {
// Returns the System.Type array for the parameters of this method
//
Type [] parameter_types;
- static Type [] no_types = new Type [0];
public Type [] ParameterTypes (TypeContainer parent)
{
if (Parameters == null)
- return no_types;
+ return TypeManager.NoTypes;
if (parameter_types == null)
parameter_types = Parameters.GetParameterInfo (parent);
// the argument names.
//
Parameter [] p = Parameters.FixedParameters;
- if (p == null)
- return;
-
+ int i = 0;
+
MethodBuilder mb = null;
ConstructorBuilder cb = null;
mb = (MethodBuilder) builder;
else
cb = (ConstructorBuilder) builder;
-
- int i;
-
- for (i = 0; i < p.Length; i++) {
- ParameterBuilder pb;
- if (mb == null)
- pb = cb.DefineParameter (
- i + 1, p [i].Attributes, p [i].Name);
- else
- pb = mb.DefineParameter (
- i + 1, p [i].Attributes, p [i].Name);
-
- Attributes attr = p [i].OptAttributes;
- if (attr != null)
- Attribute.ApplyAttributes (ec, pb, pb, attr, Location);
+ if (p != null){
+ for (i = 0; i < p.Length; i++) {
+ ParameterBuilder pb;
+
+ if (mb == null)
+ pb = cb.DefineParameter (
+ i + 1, p [i].Attributes, p [i].Name);
+ else
+ pb = mb.DefineParameter (
+ i + 1, p [i].Attributes, p [i].Name);
+
+ Attributes attr = p [i].OptAttributes;
+ if (attr != null)
+ Attribute.ApplyAttributes (ec, pb, pb, attr, Location);
+ }
}
-
- if (i != parameters.Length) {
+
+ if (Parameters.ArrayParameter != null){
ParameterBuilder pb;
-
Parameter array_param = Parameters.ArrayParameter;
+
if (mb == null)
pb = cb.DefineParameter (
i + 1, array_param.Attributes,
}
public class Method : MethodCore {
- public readonly string ReturnType;
+ public Expression ReturnType;
public MethodBuilder MethodBuilder;
public readonly Attributes OptAttributes;
//
// return_type can be "null" for VOID values.
//
- public Method (string return_type, int mod, string name, Parameters parameters,
+ public Method (Expression return_type, int mod, string name, Parameters parameters,
Attributes attrs, Location l)
: base (name, parameters, l)
{
OptAttributes = attrs;
}
- static bool MemberSignatureCompare (MemberInfo m, object filter_criteria)
- {
- MethodInfo mi;
-
- if (! (m is MethodInfo))
- return false;
-
- MethodSignature sig = (MethodSignature) filter_criteria;
-
- if (m.Name != sig.Name)
- return false;
-
- mi = (MethodInfo) m;
-
- if (mi.ReturnType != sig.RetType)
- return false;
-
- Type [] args = TypeManager.GetArgumentTypes (mi);
- Type [] sigp = sig.Parameters;
-
- if (args.Length != sigp.Length)
- return false;
-
- for (int i = args.Length; i > 0; ){
- i--;
- if (args [i] != sigp [i])
- return false;
- }
- return true;
- }
-
- /// <summary>
- /// This delegate is used to extract methods which have the
- /// same signature as the argument
- /// </summary>
- static MemberFilter method_signature_filter;
-
- static Method ()
- {
- method_signature_filter = new MemberFilter (MemberSignatureCompare);
- return;
- }
-
//
// Returns the `System.Type' for the ReturnType of this
// function. Provides a nice cache. (used between semantic analysis
public Type GetReturnType (TypeContainer parent)
{
if (type_return_type == null)
- type_return_type = RootContext.LookupType (
- parent, ReturnType, false, Location);
+ type_return_type = parent.ResolveType (ReturnType, false, Location);
return type_return_type;
}
- void DuplicatEntryPoint (MethodInfo b)
- {
- Report.Error (
- 17, Location,
- "Program `" + RootContext.CodeGen.FileName +
- "' has more than one entry point defined: `" +
- b.DeclaringType.Name + "." + b.Name + "'");
- }
-
+ void DuplicateEntryPoint (MethodInfo b, Location location)
+ {
+ Report.Error (
+ 17, location,
+ "Program `" + CodeGen.FileName +
+ "' has more than one entry point defined: `" +
+ TypeManager.CSharpSignature(b) + "'");
+ }
+
+ void Report28 (MethodInfo b)
+ {
+ if (RootContext.WarningLevel < 4)
+ return;
+
+ Report.Warning (
+ 28, Location,
+ "`" + TypeManager.CSharpSignature(b) +
+ "' has the wrong signature to be an entry point");
+ }
+
+ public bool IsEntryPoint (MethodBuilder b, InternalParameters pinfo)
+ {
+ if (b.ReturnType != TypeManager.void_type &&
+ b.ReturnType != TypeManager.int32_type)
+ return false;
+
+ if (pinfo.Count == 0)
+ return true;
+
+ if (pinfo.Count > 1)
+ return false;
+
+ Type t = pinfo.ParameterType(0);
+ if (t.IsArray &&
+ (t.GetArrayRank() == 1) &&
+ (t.GetElementType() == TypeManager.string_type) &&
+ (pinfo.ParameterModifier(0) == Parameter.Modifier.NONE))
+ return true;
+ else
+ return false;
+ }
+
//
// Creates the type
//
Type ret_type = GetReturnType (parent);
Type [] parameters = ParameterTypes (parent);
bool error = false;
- MethodInfo implementing;
+ MethodInfo implementing = null;
Type iface_type = null;
string iface = "", short_name;
bool explicit_impl = false;
// ptype is only null for System.Object while compiling corlib.
if (ptype != null){
- MethodSignature ms = new MethodSignature (Name, ret_type, parameters);
+ MethodSignature ms = new MethodSignature (Name, null, parameters);
MemberInfo [] mi, mi_static, mi_instance;
mi_static = TypeContainer.FindMembers (
ptype, MemberTypes.Method,
- BindingFlags.Public | BindingFlags.Static, method_signature_filter,
- ms);
+ BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+ MethodSignature.inheritable_method_signature_filter, ms);
mi_instance = TypeContainer.FindMembers (
ptype, MemberTypes.Method,
- BindingFlags.Public | BindingFlags.Instance, method_signature_filter,
+ BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
+ MethodSignature.inheritable_method_signature_filter,
ms);
if (mi_instance != null && mi_instance.Length > 0){
mi = mi_static;
else
mi = null;
-
+
if (mi != null && mi.Length > 0){
- if (!CheckMethodAgainstBase (parent, (MethodInfo) mi [0])){
+ if (!CheckMethodAgainstBase (parent, flags, (MethodInfo) mi [0])){
return false;
}
} else {
if ((ModFlags & Modifiers.NEW) != 0)
WarningNotHiding (parent);
-
- if ((ModFlags & Modifiers.OVERRIDE) != 0)
+
+ if ((ModFlags & Modifiers.OVERRIDE) != 0){
Report.Error (115, Location,
parent.MakeName (Name) +
" no suitable methods found to override");
+ }
}
} else if ((ModFlags & Modifiers.NEW) != 0)
WarningNotHiding (parent);
//
// If we implement an interface, extract the interface name.
//
-
if (Name.IndexOf (".") != -1){
int pos = Name.LastIndexOf (".");
iface = Name.Substring (0, pos);
// Compute the full name that we need to export
Name = iface_type.FullName + "." + short_name;
+
+ if (!parent.VerifyImplements (iface_type, short_name, Name, Location))
+ return false;
+
explicit_impl = true;
} else
short_name = Name;
// Check if we are an implementation of an interface method or
// a method
//
- implementing = parent.IsInterfaceMethod (
- iface_type, short_name, ret_type, parameters, false);
-
+ if (parent.Pending != null){
+ implementing = parent.Pending.IsInterfaceMethod (
+ iface_type, short_name, ret_type, parameters);
+
+ if (iface_type != null && implementing == null){
+ TypeContainer.Error_ExplicitInterfaceNotMemberInterface (Location, short_name);
+ return false;
+ }
+ }
+
//
// For implicit implementations, make sure we are public, for
// explicit implementations, make sure we are private.
// but it wont get cleared
//
if (iface_type == null){
- if ((ModFlags & Modifiers.PUBLIC) == 0)
+ //
+ // We already catch different accessibility settings
+ // so we just need to check that we are not private
+ //
+ if ((ModFlags & Modifiers.PRIVATE) != 0)
implementing = null;
+ //
+ // Static is not allowed
+ //
if ((ModFlags & Modifiers.STATIC) != 0)
implementing = null;
} else {
- if ((ModFlags & (Modifiers.PUBLIC | Modifiers.ABSTRACT)) != 0){
- Report.Error (
- 106, Location, "`public' or `abstract' modifiers "+
- "are not allowed in explicit interface declarations"
- );
+ if ((ModFlags & (Modifiers.PUBLIC | Modifiers.ABSTRACT | Modifiers.VIRTUAL)) != 0){
+ Modifiers.Error_InvalidModifier (Location, "public, virtual or abstract");
implementing = null;
}
}
// If implementing is still valid, set flags
//
if (implementing != null){
+ // Console.WriteLine ("Implementing for:" + (iface_type != null ? iface_type.FullName : "<null>") + " " + short_name);
+
+ if (implementing.DeclaringType.IsInterface)
+ flags |= MethodAttributes.NewSlot;
+
flags |=
MethodAttributes.Virtual |
MethodAttributes.HideBySig;
- // If not abstract, then we can set Final.
- if (((flags & MethodAttributes.Abstract) == 0) &&
- implementing.DeclaringType.IsInterface)
- flags |= MethodAttributes.Final;
-
//
- // clear the flag
+ // clear the pending implementation flag
//
- parent.IsInterfaceMethod (
- iface_type, short_name, ret_type, parameters, true);
+ parent.Pending.ImplementMethod (
+ iface_type, short_name, ret_type, parameters, explicit_impl);
}
Attribute dllimport_attr = null;
//
if ((flags & MethodAttributes.PinvokeImpl) != 0) {
+
+ if ((ModFlags & Modifiers.STATIC) == 0) {
+ Report.Error (601, Location, "The DllImport attribute must be specified on " +
+ "a method marked 'static' and 'extern'.");
+ return false;
+ }
+
EmitContext ec = new EmitContext (
parent, Location, null, GetReturnType (parent), ModFlags);
ec, parent.TypeBuilder,
Name, flags, ret_type, parameters);
} else {
-
MethodBuilder = parent.TypeBuilder.DefineMethod (
Name, flags,
GetCallingConvention (parent is Class),
ret_type, parameters);
-
+
if (implementing != null && explicit_impl)
parent.TypeBuilder.DefineMethodOverride (
MethodBuilder, implementing);
//
// This is used to track the Entry Point,
//
- // FIXME: Allow pluggable entry point, check arguments, etc.
- //
if (Name == "Main" &&
((ModFlags & Modifiers.STATIC) != 0) &&
(RootContext.MainClass == null ||
RootContext.MainClass == parent.TypeBuilder.FullName)){
- if (RootContext.EntryPoint != null){
- DuplicatEntryPoint (MethodBuilder);
- DuplicatEntryPoint (RootContext.EntryPoint);
- } else
- RootContext.EntryPoint = MethodBuilder;
-
- //
- // FIXME: Verify that the method signature
- // is valid for an entry point, and report
- // error 28 if not.
- //
+ if (IsEntryPoint (MethodBuilder, ParameterInfo)) {
+ if (RootContext.EntryPoint == null) {
+ RootContext.EntryPoint = MethodBuilder;
+ RootContext.EntryPointLocation = Location;
+ } else {
+ DuplicateEntryPoint (RootContext.EntryPoint, RootContext.EntryPointLocation);
+ DuplicateEntryPoint (MethodBuilder, Location);
+ }
+ } else
+ Report28(MethodBuilder);
}
return true;
ig = MethodBuilder.GetILGenerator ();
else
ig = null;
-
- ec = new EmitContext (parent, Location, ig,
- GetReturnType (parent), ModFlags);
+
+ ec = new EmitContext (parent, Location, ig, GetReturnType (parent), ModFlags);
if (OptAttributes != null)
Attribute.ApplyAttributes (ec, MethodBuilder, this, OptAttributes, Location);
//
// abstract or extern methods have no bodies
//
- if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0)
+ if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0){
+ if (Block != null){
+ if ((ModFlags & Modifiers.ABSTRACT) != 0){
+ Report.Error (
+ 500, "Abstract method `" +
+ TypeManager.CSharpSignature (MethodBuilder) +
+ "' can not have a body");
+ }
+ }
return;
+ }
//
// Handle destructors specially
//
if (Name == "Finalize" && type_return_type == TypeManager.void_type)
EmitDestructor (ec);
- else
- ec.EmitTopBlock (Block, Location);
+ else {
+ ISymbolWriter sw = CodeGen.SymbolWriter;
+
+ if ((sw != null) && (!Location.IsNull (Location))) {
+ MethodToken token = MethodBuilder.GetToken ();
+ sw.OpenMethod (new SymbolToken (token.Token));
+ sw.SetMethodSourceRange (Location.SymbolDocument,
+ Location.Row, 0,
+ Block.EndLocation.SymbolDocument,
+ Block.EndLocation.Row, 0);
+
+ ec.EmitTopBlock (Block, Location);
+
+ sw.CloseMethod ();
+ } else
+ ec.EmitTopBlock (Block, Location);
+ }
}
void EmitDestructor (EmitContext ec)
Label finish = ig.DefineLabel ();
bool old_in_try = ec.InTry;
- Expression member_lookup;
ig.BeginExceptionBlock ();
ec.InTry = true;
ec.InFinally = true;
ig.BeginFinallyBlock ();
- member_lookup = Expression.MemberLookup (
- ec, ec.TypeContainer.TypeBuilder.BaseType, "Finalize",
- MemberTypes.Method, Expression.AllBindingFlags, Location);
+ if (ec.ContainerType.BaseType != null) {
+ Expression member_lookup = Expression.MemberLookup (
+ ec, ec.ContainerType.BaseType, "Finalize",
+ MemberTypes.Method, Expression.AllBindingFlags, Location);
- if (member_lookup != null){
- MethodGroupExpr parent_destructor = ((MethodGroupExpr) member_lookup);
+ if (member_lookup != null){
+ MethodGroupExpr parent_destructor = ((MethodGroupExpr) member_lookup);
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Call, (MethodInfo) parent_destructor.Methods [0]);
+ ig.Emit (OpCodes.Ldarg_0);
+ ig.Emit (OpCodes.Call, (MethodInfo) parent_destructor.Methods [0]);
+ }
}
ec.InFinally = old_in_finally;
Type t;
if (argument_list != null){
- for (int i = argument_list.Count; i > 0; ){
- --i;
-
- Argument a = (Argument) argument_list [i];
+ foreach (Argument a in argument_list){
if (!a.Resolve (ec, location))
return false;
}
}
- if (this is ConstructorBaseInitializer)
- t = ec.TypeContainer.TypeBuilder.BaseType;
- else
- t = ec.TypeContainer.TypeBuilder;
+ if (this is ConstructorBaseInitializer) {
+ if (ec.ContainerType.BaseType == null)
+ return true;
+
+ t = ec.ContainerType.BaseType;
+ if (ec.ContainerType.IsValueType) {
+ Report.Error (522, location,
+ "structs cannot call base class constructors");
+ return false;
+ }
+ } else
+ t = ec.ContainerType;
parent_constructor_group = Expression.MemberLookup (
ec, t, ".ctor",
MemberTypes.Constructor,
- BindingFlags.Public | BindingFlags.Instance, location);
+ BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+ location);
if (parent_constructor_group == null){
- Console.WriteLine ("Could not find a constructor in our parent");
+ Report.Error (1501, location,
+ "Can not find a constructor for this argument list");
return false;
}
(MethodGroupExpr) parent_constructor_group, argument_list, location);
if (parent_constructor == null){
- Console.WriteLine ("Could not locate a proper overload function");
+ Report.Error (1501, location,
+ "Can not find a constructor for this argument list");
return false;
}
public void Emit (EmitContext ec)
{
- ec.ig.Emit (OpCodes.Ldarg_0);
+ if (parent_constructor != null)
+ ec.ig.Emit (OpCodes.Ldarg_0);
if (argument_list != null)
Invocation.EmitArguments (ec, null, argument_list);
- ec.ig.Emit (OpCodes.Call, parent_constructor);
+ if (parent_constructor != null)
+ ec.ig.Emit (OpCodes.Call, parent_constructor);
}
}
Type [] parameters = ParameterTypes (parent);
+ if (parameters == null)
+ return false;
+
if ((ModFlags & Modifiers.STATIC) != 0)
ca |= MethodAttributes.Static;
else {
ILGenerator ig = ConstructorBuilder.GetILGenerator ();
EmitContext ec = new EmitContext (parent, Location, ig, null, ModFlags, true);
- if (parent is Class && ((ModFlags & Modifiers.STATIC) == 0)){
- if (Initializer == null)
+ if ((ModFlags & Modifiers.STATIC) == 0){
+ if (parent is Class && Initializer == null)
Initializer = new ConstructorBaseInitializer (null, parent.Location);
-
- if (!Initializer.Resolve (ec)){
- Console.WriteLine ("Could not resolve initializer: " + parent.Name);
- }
+
+
+ //
+ // Spec mandates that Initializers will not have
+ // `this' access
+ //
+ ec.IsStatic = true;
+ if (Initializer != null && !Initializer.Resolve (ec))
+ return;
+ ec.IsStatic = false;
}
LabelParameters (ec, ParameterTypes (parent), ConstructorBuilder);
// Classes can have base initializers and instance field initializers.
//
if (parent is Class){
- if ((ModFlags & Modifiers.STATIC) == 0){
- Initializer.Emit (ec);
- parent.EmitFieldInitializers (ec, false);
- }
+ if ((ModFlags & Modifiers.STATIC) == 0)
+ parent.EmitFieldInitializers (ec);
}
+ if (Initializer != null)
+ Initializer.Emit (ec);
if ((ModFlags & Modifiers.STATIC) != 0)
- parent.EmitFieldInitializers (ec, true);
+ parent.EmitFieldInitializers (ec);
Attribute.ApplyAttributes (ec, ConstructorBuilder, this, OptAttributes, Location);
ec.EmitTopBlock (Block, Location);
}
}
-
- public class Field : MemberCore {
- public readonly string Type;
- public readonly Object Initializer;
- public readonly Attributes OptAttributes;
- public FieldBuilder FieldBuilder;
- public Status status;
-
- [Flags]
- public enum Status : byte { ASSIGNED = 1, USED = 2 }
-
+ //
+ // Fields and Events both generate FieldBuilders, we use this to share
+ // their common bits. This is also used to flag usage of the field
+ //
+ abstract public class FieldBase : MemberCore {
+ public Expression Type;
+ public readonly Object Initializer;
+ public readonly Attributes OptAttributes;
+ public FieldBuilder FieldBuilder;
+ public Status status;
+
+ [Flags]
+ public enum Status : byte { ASSIGNED = 1, USED = 2 }
+
+ //
+ // The constructor is only exposed to our children
+ //
+ protected FieldBase (Expression type, int mod, int allowed_mod, string name,
+ object init, Attributes attrs, Location loc)
+ : base (name, loc)
+ {
+ Type = type;
+ ModFlags = Modifiers.Check (allowed_mod, mod, Modifiers.PRIVATE, loc);
+ Initializer = init;
+ OptAttributes = attrs;
+ }
+ }
+
+ //
+ // The Field class is used to represents class/struct fields during parsing.
+ //
+ public class Field : FieldBase {
// <summary>
// Modifiers allowed in a class declaration
// </summary>
Modifiers.UNSAFE |
Modifiers.READONLY;
- public Field (string type, int mod, string name, Object expr_or_array_init,
+ public Field (Expression type, int mod, string name, Object expr_or_array_init,
Attributes attrs, Location loc)
- : base (name, loc)
+ : base (type, mod, AllowedModifiers, name, expr_or_array_init, attrs, loc)
{
- Type = type;
- ModFlags = Modifiers.Check (AllowedModifiers, mod, Modifiers.PRIVATE, loc);
- Initializer = expr_or_array_init;
- OptAttributes = attrs;
}
public override bool Define (TypeContainer parent)
{
- Type t = RootContext.LookupType (parent, Type, false, Location);
+ Type t = parent.ResolveType (Type, false, Location);
if (t == null)
return false;
FieldBuilder = parent.TypeBuilder.DefineField (
Name, t, Modifiers.FieldAttr (ModFlags));
- TypeManager.RegisterField (FieldBuilder, this);
+ TypeManager.RegisterFieldBase (FieldBuilder, this);
return true;
}
public void Emit (TypeContainer tc)
{
- EmitContext ec = new EmitContext (tc, Location, null, FieldBuilder.FieldType, ModFlags);
+ EmitContext ec = new EmitContext (tc, Location, null,
+ FieldBuilder.FieldType, ModFlags);
Attribute.ApplyAttributes (ec, FieldBuilder, this, OptAttributes, Location);
}
}
+ //
+ // `set' and `get' accessors are represented with an Accessor.
+ //
+ public class Accessor {
+ //
+ // Null if the accessor is empty, or a Block if not
+ //
+ public Block Block;
+ public Attributes OptAttributes;
+
+ public Accessor (Block b, Attributes attrs)
+ {
+ Block = b;
+ OptAttributes = attrs;
+ }
+ }
+
public class Property : MemberCore {
- public readonly string Type;
- public Block Get, Set;
+ public Expression Type;
+ public Accessor Get, Set;
public PropertyBuilder PropertyBuilder;
public Attributes OptAttributes;
- MethodBuilder GetBuilder, SetBuilder;
+ public MethodBuilder GetBuilder, SetBuilder;
//
// The type, once we compute it.
-
Type PropertyType;
+ bool explicit_impl;
+
+ //
+ // If true, the interface type we are explicitly implementing
+ //
+ Type explicit_iface_type = null;
+
const int AllowedModifiers =
Modifiers.NEW |
Modifiers.PUBLIC |
Modifiers.OVERRIDE |
Modifiers.ABSTRACT |
Modifiers.UNSAFE |
+ Modifiers.EXTERN |
Modifiers.VIRTUAL;
- public Property (string type, string name, int mod_flags, Block get_block, Block set_block,
+ public Property (Expression type, string name, int mod_flags,
+ Accessor get_block, Accessor set_block,
Attributes attrs, Location loc)
: base (name, loc)
{
//
// Checks our base implementation if any
//
- bool CheckBase (TypeContainer parent)
+ bool CheckBase (MethodAttributes flags, TypeContainer parent)
{
//
// Find properties with the same name on the base class
//
+
MemberInfo [] props;
- MemberInfo [] props_static = TypeContainer.FindMembers (
+ MemberInfo [] props_static = TypeManager.MemberLookup (
+ parent.TypeBuilder,
parent.TypeBuilder.BaseType,
- MemberTypes.All, BindingFlags.Public | BindingFlags.Static,
- System.Type.FilterName, Name);
+ MemberTypes.Property, BindingFlags.Public | BindingFlags.Static,
+ Name);
- MemberInfo [] props_instance = TypeContainer.FindMembers (
+ MemberInfo [] props_instance = TypeManager.MemberLookup (
+ parent.TypeBuilder,
parent.TypeBuilder.BaseType,
- MemberTypes.All, BindingFlags.Public | BindingFlags.Instance,
- System.Type.FilterName, Name);
+ MemberTypes.Property, BindingFlags.Public | BindingFlags.Instance,
+ Name);
//
// Find if we have anything
//
// If we have something on the base.
if (props != null && props.Length > 0){
- //
- // FIXME:
- // Currently we expect only to get 1 match at most from our
- // base class, maybe we can get more than one, investigate
- // whether this is possible
- //
if (props.Length > 1)
- throw new Exception ("How do we handle this?");
+ throw new Exception ("Should not happen");
PropertyInfo pi = (PropertyInfo) props [0];
MethodInfo reference = inherited_get == null ?
inherited_set : inherited_get;
- if (!CheckMethodAgainstBase (parent, reference))
- return false;
+ if (reference != null)
+ if (!CheckMethodAgainstBase (parent, flags, reference))
+ return false;
+
} else {
if ((ModFlags & Modifiers.NEW) != 0)
WarningNotHiding (parent);
if ((ModFlags & Modifiers.OVERRIDE) != 0){
Report.Error (115, Location,
parent.MakeName (Name) +
- " no suitable methods found to override");
+ " no suitable properties found to override");
return false;
}
}
return true;
}
- bool DefineMethod (TypeContainer parent, Type iface_type, string short_name, bool is_get)
+ bool DefineMethod (TypeContainer parent, string short_name,
+ MethodAttributes flags, bool is_get, ref bool is_implementing)
{
- MethodAttributes flags = Modifiers.MethodAttr (ModFlags);
- Type [] parameters = null;
- MethodInfo implementing;
+ Type [] parameters = TypeManager.NoTypes;
+ MethodInfo implementing = null;
Type fn_type;
- string name;
+ string name, prefix;
- flags |= MethodAttributes.HideBySig |
- MethodAttributes.SpecialName;
-
+ if (explicit_impl)
+ prefix = explicit_iface_type.FullName + ".";
+ else
+ prefix = "";
+
if (is_get){
fn_type = PropertyType;
name = "get_" + short_name;
fn_type = TypeManager.void_type;
}
- implementing = parent.IsInterfaceMethod (
- iface_type, name, fn_type, parameters, false);
+ if (parent.Pending != null){
+ implementing = parent.Pending.IsInterfaceMethod (
+ explicit_iface_type, name, fn_type, parameters);
+ if (explicit_iface_type != null && implementing == null){
+ TypeContainer.Error_ExplicitInterfaceNotMemberInterface (Location, name);
+ return false;
+ }
+ }
+
//
// For implicit implementations, make sure we are public, for
// explicit implementations, make sure we are private.
// The "candidate" function has been flagged already
// but it wont get cleared
//
- if (iface_type == null){
- if ((ModFlags & Modifiers.PUBLIC) == 0)
+ if (explicit_iface_type == null){
+ //
+ // We already catch different accessibility settings
+ // so we just need to check that we are not private
+ //
+ if ((ModFlags & Modifiers.PRIVATE) != 0)
implementing = null;
+
+ //
+ // Static is not allowed
+ //
if ((ModFlags & Modifiers.STATIC) != 0)
implementing = null;
} else {
- if ((ModFlags & (Modifiers.PUBLIC | Modifiers.ABSTRACT)) != 0){
- Report.Error (
- 106, Location, "`public' or `abstract' modifiers "+
- "are not allowed in explicit interface declarations"
- );
+ if ((ModFlags & (Modifiers.PUBLIC | Modifiers.ABSTRACT | Modifiers.VIRTUAL)) != 0){
+ Modifiers.Error_InvalidModifier (Location, "public, virtual or abstract");
implementing = null;
}
}
// If implementing is still valid, set flags
//
if (implementing != null){
+ //
+ // When implementing interface methods, set NewSlot.
+ //
+ if (implementing.DeclaringType.IsInterface)
+ flags |= MethodAttributes.NewSlot;
+
flags |=
MethodAttributes.Virtual |
- // removed newslot
MethodAttributes.HideBySig;
- // If an interface implementation, then we can set Final.
- if (((flags & MethodAttributes.Abstract) == 0) &&
- implementing.DeclaringType.IsInterface)
- flags |= MethodAttributes.Final;
-
//
- // clear the pending flag
+ // clear the pending implemntation flag
//
- parent.IsInterfaceMethod (
- iface_type, name, fn_type, parameters, true);
+ parent.Pending.ImplementMethod (
+ explicit_iface_type, name, fn_type, parameters, explicit_impl);
+
+ is_implementing = true;
}
//
if (is_get){
GetBuilder = parent.TypeBuilder.DefineMethod (
- name, flags, PropertyType, null);
- PropertyBuilder.SetGetMethod (GetBuilder);
+ prefix + name, flags, PropertyType, null);
if (implementing != null)
parent.TypeBuilder.DefineMethodOverride (
}
} else {
SetBuilder = parent.TypeBuilder.DefineMethod (
- name, flags, null, parameters);
+ prefix + name, flags, null, parameters);
if (implementing != null)
parent.TypeBuilder.DefineMethodOverride (
SetBuilder, implementing);
SetBuilder.DefineParameter (1, ParameterAttributes.None, "value");
- PropertyBuilder.SetSetMethod (SetBuilder);
//
// HACK because System.Reflection.Emit is lame
public override bool Define (TypeContainer parent)
{
- Type iface_type = null;
string short_name;
if (!parent.MethodModifiersValid (ModFlags, Name, Location))
return false;
+ MethodAttributes flags = Modifiers.MethodAttr (ModFlags);
+
+ flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
+
// Lookup Type, verify validity
- PropertyType = RootContext.LookupType (parent, Type, false, Location);
+ PropertyType = parent.ResolveType (Type, false, Location);
if (PropertyType == null)
return false;
if (PropertyType.IsPointer && !UnsafeOK (parent))
return false;
- if (!CheckBase (parent))
+ if (!CheckBase (flags, parent))
return false;
//
int pos = Name.LastIndexOf (".");
string iface = Name.Substring (0, pos);
- iface_type = RootContext.LookupType (parent, iface, false, Location);
- if (iface_type == null)
+ explicit_iface_type = RootContext.LookupType (parent, iface, false, Location);
+ if (explicit_iface_type == null)
return false;
short_name = Name.Substring (pos + 1);
// Compute the full name that we need to export.
- Name = iface_type.FullName + "." + short_name;
- } else
+ Name = explicit_iface_type.FullName + "." + short_name;
+
+ if (!parent.VerifyImplements (explicit_iface_type, short_name, Name, Location))
+ return false;
+
+ explicit_impl = true;
+ } else {
+ explicit_impl = false;
short_name = Name;
+ }
- // FIXME - PropertyAttributes.HasDefault ?
-
- PropertyAttributes prop_attr = PropertyAttributes.RTSpecialName |
- PropertyAttributes.SpecialName;
-
- PropertyBuilder = parent.TypeBuilder.DefineProperty (
- Name, prop_attr, PropertyType, null);
-
+ bool is_implementing = false;
if (Get != null)
- if (!DefineMethod (parent, iface_type, short_name, true))
+ if (!DefineMethod (parent, short_name, flags, true, ref is_implementing))
return false;
if (Set != null)
- if (!DefineMethod (parent, iface_type, short_name, false))
+ if (!DefineMethod (parent, short_name, flags, false, ref is_implementing))
return false;
+
+ // FIXME - PropertyAttributes.HasDefault ?
- //
- // HACK for the reasons exposed above
- //
- if (!TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder)) {
- Report.Error (
- 111, Location,
- "Class `" + parent.Name +
- "' already contains a definition for the property `" +
- Name + "'");
- return false;
- }
+ PropertyAttributes prop_attr =
+ PropertyAttributes.RTSpecialName |
+ PropertyAttributes.SpecialName;
+
+ if (!explicit_impl){
+ PropertyBuilder = parent.TypeBuilder.DefineProperty (
+ Name, prop_attr, PropertyType, null);
+
+ if (Get != null)
+ PropertyBuilder.SetGetMethod (GetBuilder);
+
+ if (Set != null)
+ PropertyBuilder.SetSetMethod (SetBuilder);
+ //
+ // HACK for the reasons exposed above
+ //
+ if (!TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder)) {
+ Report.Error (
+ 111, Location,
+ "Class `" + parent.Name +
+ "' already contains a definition for the property `" +
+ Name + "'");
+ return false;
+ }
+ }
return true;
}
EmitContext ec;
ec = new EmitContext (tc, Location, null, PropertyType, ModFlags);
- Attribute.ApplyAttributes (ec, PropertyBuilder, this, OptAttributes, Location);
-
+
+ //
+ // The PropertyBuilder can be null for explicit implementations, in that
+ // case, we do not actually emit the ".property", so there is nowhere to
+ // put the attribute
+ //
+ if (PropertyBuilder != null)
+ Attribute.ApplyAttributes (ec, PropertyBuilder, this, OptAttributes, Location);
+ if (Get != null)
+ Attribute.ApplyAttributes (ec, GetBuilder, Get, Get.OptAttributes, Location);
+ if (Set != null)
+ Attribute.ApplyAttributes (ec, SetBuilder, Set, Set.OptAttributes, Location);
//
// abstract or extern properties have no bodies
if (Get != null){
ig = GetBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, PropertyType, ModFlags);
-
- ec.EmitTopBlock (Get, Location);
+
+ ec.EmitTopBlock (Get.Block, Location);
}
if (Set != null){
ig = SetBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, null, ModFlags);
-
- ec.EmitTopBlock (Set, Location);
+
+ ec.EmitTopBlock (Set.Block, Location);
}
}
}
/// </summary>
/// Gigantic workaround for lameness in SRE follows :
- /// This class derived from EventInfo and attempts to basically
+ /// This class derives from EventInfo and attempts to basically
/// wrap around the EventBuilder so that FindMembers can quickly
/// return this in it search for members
/// </summary>
declaring_type = type_builder;
- // FIXME : This is supposed to be MyBuilder but since that doesn't
- // derive from Type, I have no clue what to do with this.
- reflected_type = null;
+ reflected_type = type_builder;
attributes = event_attr;
this.name = name;
}
}
- public class Event : MemberCore {
-
+ public class Event : FieldBase {
const int AllowedModifiers =
Modifiers.NEW |
Modifiers.PUBLIC |
Modifiers.UNSAFE |
Modifiers.ABSTRACT;
- public readonly string Type;
- public readonly Object Initializer;
- public readonly Block Add;
- public readonly Block Remove;
+ public readonly Accessor Add;
+ public readonly Accessor Remove;
public MyEventBuilder EventBuilder;
- public FieldBuilder FieldBuilder;
- public Attributes OptAttributes;
Type EventType;
MethodBuilder AddBuilder, RemoveBuilder;
-
- public Event (string type, string name, Object init, int flags, Block add_block,
- Block rem_block, Attributes attrs, Location loc)
- : base (name, loc)
+ public Event (Expression type, string name, Object init, int mod, Accessor add,
+ Accessor remove, Attributes attrs, Location loc)
+ : base (type, mod, AllowedModifiers, name, init, attrs, loc)
{
- Type = type;
- Initializer = init;
- ModFlags = Modifiers.Check (AllowedModifiers, flags, Modifiers.PRIVATE, loc);
- Add = add_block;
- Remove = rem_block;
- OptAttributes = attrs;
+ Add = add;
+ Remove = remove;
}
public override bool Define (TypeContainer parent)
MethodAttributes m_attr = Modifiers.MethodAttr (ModFlags);
EventAttributes e_attr = EventAttributes.RTSpecialName | EventAttributes.SpecialName;
- EventType = RootContext.LookupType (parent, Type, false, Location);
+ EventType = parent.ResolveType (Type, false, Location);
if (EventType == null)
return false;
EventBuilder = new MyEventBuilder (parent.TypeBuilder, Name, e_attr, EventType);
- if (Add == null && Remove == null)
- FieldBuilder = parent.TypeBuilder.DefineField (Name, EventType, FieldAttributes.Private);
+ if (Add == null && Remove == null) {
+ FieldBuilder = parent.TypeBuilder.DefineField (
+ Name, EventType, FieldAttributes.FamANDAssem);
+ TypeManager.RegisterPrivateFieldOfEvent ((EventInfo) EventBuilder, FieldBuilder);
+ TypeManager.RegisterFieldBase (FieldBuilder, this);
+ }
//
// Now define the accessors
//
+ string add_name = "add_" + Name;
AddBuilder = parent.TypeBuilder.DefineMethod (
- "add_" + Name, m_attr, null, parameters);
+ add_name, m_attr, null, parameters);
AddBuilder.DefineParameter (1, ParameterAttributes.None, "value");
EventBuilder.SetAddOnMethod (AddBuilder);
-
+ if (parent.Pending != null)
+ parent.Pending.ImplementMethod (null, add_name, null, parameters, false);
+
//
// HACK because System.Reflection.Emit is lame
//
"'add' method of event `" + Name + "'");
return false;
}
-
+
+ string remove_name = "remove_" + Name;
RemoveBuilder = parent.TypeBuilder.DefineMethod (
- "remove_" + Name, m_attr, null, parameters);
+ remove_name, m_attr, null, parameters);
RemoveBuilder.DefineParameter (1, ParameterAttributes.None, "value");
EventBuilder.SetRemoveOnMethod (RemoveBuilder);
+ if (parent.Pending != null)
+ parent.Pending.ImplementMethod (null, remove_name, null, parameters, false);
+
+ //
+ // This looks like dead code
+ //
+ //if (parent.Pending != null)
+ // parent.Pending.IsInterfaceMethod (null, remove_name, null, parameters, false);
//
// HACK because System.Reflection.Emit is lame
ig = AddBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
- if (Add != null)
- ec.EmitTopBlock (Add, Location);
- else
+ if (Add != null) {
+ Attribute.ApplyAttributes (ec, AddBuilder, Add, Add.OptAttributes, Location);
+ ec.EmitTopBlock (Add.Block, Location);
+ } else
EmitDefaultMethod (ec, true);
ig = RemoveBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
- if (Remove != null)
- ec.EmitTopBlock (Remove, Location);
- else
+ if (Remove != null) {
+ Attribute.ApplyAttributes (ec, RemoveBuilder, Remove, Remove.OptAttributes, Location);
+ ec.EmitTopBlock (Remove.Block, Location);
+ } else
EmitDefaultMethod (ec, false);
ec = new EmitContext (tc, Location, null, EventType, ModFlags);
// FIXME: This does not handle:
//
// int INTERFACENAME [ args ]
+ // Does not
//
// Only:
//
Modifiers.SEALED |
Modifiers.OVERRIDE |
Modifiers.UNSAFE |
+ Modifiers.EXTERN |
Modifiers.ABSTRACT;
- public readonly string Type;
+ public readonly Expression Type;
public readonly string InterfaceType;
public readonly Parameters FormalParameters;
- public readonly Block Get;
- public readonly Block Set;
+ public readonly Accessor Get, Set;
public Attributes OptAttributes;
public MethodBuilder GetBuilder;
public MethodBuilder SetBuilder;
public PropertyBuilder PropertyBuilder;
public Type IndexerType;
-
- public Indexer (string type, string int_type, int flags, Parameters parms,
- Block get_block, Block set_block, Attributes attrs, Location loc)
+ public string IndexerName;
+
+ EmitContext ec;
+
+ public Indexer (Expression type, string int_type, int flags, Parameters parms,
+ Accessor get_block, Accessor set_block, Attributes attrs, Location loc)
: base ("", loc)
{
OptAttributes = attrs;
}
- void DefineMethod (TypeContainer parent, Type iface_type,
+ bool DefineMethod (TypeContainer parent, Type explicit_iface_type,
Type ret_type, string name,
- Type [] parameters, bool is_get)
+ Type [] parameters, MethodAttributes attr, bool is_get)
{
- MethodAttributes attr = Modifiers.MethodAttr (ModFlags);
- MethodInfo implementing;
+ MethodInfo implementing = null;
+ bool is_implementation;
- implementing = parent.IsInterfaceMethod (
- iface_type, name, ret_type, parameters, false);
+ if (parent.Pending != null){
+ implementing = parent.Pending.IsInterfaceMethod (
+ explicit_iface_type, name, ret_type, parameters);
+
+ if (explicit_iface_type != null && implementing == null){
+ TypeContainer.Error_ExplicitInterfaceNotMemberInterface (Location, "this");
+ return false;
+ }
+ }
+ is_implementation = implementing != null;
+
//
// Setting null inside this block will trigger a more
// verbose error reporting for missing interface implementations
// but it wont get cleared
//
if (implementing != null){
- if (iface_type == null){
- if ((ModFlags & Modifiers.PUBLIC) == 0)
+ if (explicit_iface_type == null){
+ //
+ // We already catch different accessibility settings
+ // so we just need to check that we are not private
+ //
+ if ((ModFlags & Modifiers.PRIVATE) != 0)
implementing = null;
+
+ //
+ // Static is not allowed
+ //
if ((ModFlags & Modifiers.STATIC) != 0)
implementing = null;
} else {
- if((ModFlags&(Modifiers.PUBLIC | Modifiers.ABSTRACT)) != 0){
- Report.Error (
- 106, Location,
- "`public' or `abstract' modifiers are not "+
- "allowed in explicit interface declarations"
- );
+ if((ModFlags&(Modifiers.PUBLIC | Modifiers.ABSTRACT | Modifiers.VIRTUAL)) != 0){
+ Modifiers.Error_InvalidModifier (Location, "public, virtual or abstract");
implementing = null;
}
}
}
if (implementing != null){
+ //
+ // When implementing interface methods, set NewSlot.
+ //
+ if (implementing.DeclaringType.IsInterface)
+ attr |= MethodAttributes.NewSlot;
+
attr |=
MethodAttributes.Virtual |
- // removed newslot
MethodAttributes.HideBySig;
- // If an interface implementing, then we can set final.
- if (((attr & MethodAttributes.Abstract) == 0) &&
- implementing.DeclaringType.IsInterface)
- attr |= MethodAttributes.Final;
-
//
- // clear the pending flag
+ // clear the pending implementing flag
//
- parent.IsInterfaceMethod (
- iface_type, name, ret_type, parameters, true);
+ parent.Pending.ImplementMethod (
+ explicit_iface_type, name, ret_type, parameters, true);
}
//
// clear implementing, as it is only used for explicit
// interface implementation
//
- if (Name.IndexOf (".") == -1)
+ if (InterfaceType == null)
implementing = null;
+ string prefix;
+ if (explicit_iface_type == null)
+ prefix = "";
+ else
+ prefix = explicit_iface_type.FullName + ".";
+
if (is_get){
-
- string meth_name = "get_Item";
- if (iface_type != null)
- meth_name = iface_type + ".get_Item";
+ string meth_name = prefix + "get_" + IndexerName;
GetBuilder = parent.TypeBuilder.DefineMethod (
meth_name, attr, IndexerType, parameters);
if (implementing != null)
parent.TypeBuilder.DefineMethodOverride (
GetBuilder, implementing);
-
-
- PropertyBuilder.SetGetMethod (GetBuilder);
} else {
+ string meth_name = prefix + "set_" + IndexerName;
- string meth_name = "set_Item";
-
- if (iface_type != null)
- meth_name = iface_type + ".set_Item";
-
SetBuilder = parent.TypeBuilder.DefineMethod (
meth_name, attr, null, parameters);
if (implementing != null)
parent.TypeBuilder.DefineMethodOverride (
SetBuilder, implementing);
-
- PropertyBuilder.SetSetMethod (SetBuilder);
}
+
+ return is_implementation;
}
public override bool Define (TypeContainer parent)
PropertyAttributes.SpecialName;
bool error = false;
- IndexerType = RootContext.LookupType (parent, Type, false, Location);
+ IndexerType = parent.ResolveType (Type, false, Location);
Type [] parameters = FormalParameters.GetParameterInfo (parent);
// Check if the return type and arguments were correct
if (error)
return false;
- Type iface_type = null;
+ Type explicit_iface_type = null;
if (InterfaceType != null){
- iface_type = RootContext.LookupType (parent, InterfaceType, false, Location);
- if (iface_type == null)
+ explicit_iface_type = RootContext.LookupType (parent, InterfaceType, false, Location);
+ if (explicit_iface_type == null)
+ return false;
+
+ if (!parent.VerifyImplements (explicit_iface_type, "this", "this", Location))
return false;
}
-
+
+ ec = new EmitContext (parent, Location, null, IndexerType, ModFlags);
+
+ IndexerName = Attribute.ScanForIndexerName (ec, OptAttributes);
+ if (IndexerName == null)
+ IndexerName = "Item";
- PropertyBuilder = parent.TypeBuilder.DefineProperty (
- TypeManager.IndexerPropertyName (parent.TypeBuilder),
- prop_attr, IndexerType, parameters);
+ MethodAttributes attr = Modifiers.MethodAttr (ModFlags);
+ bool is_implementing = false;
+
if (Get != null){
- DefineMethod (parent, iface_type, IndexerType, "get_Item", parameters, true);
+ is_implementing = DefineMethod (
+ parent, explicit_iface_type, IndexerType, "get_" + IndexerName,
+ parameters, attr, true);
InternalParameters pi = new InternalParameters (parent, FormalParameters);
if (!TypeManager.RegisterMethod (GetBuilder, pi, parameters)) {
Report.Error (111, Location,
Parameter [] fixed_parms = FormalParameters.FixedParameters;
+ if (fixed_parms == null){
+ throw new Exception ("We currently do not support only array arguments in an indexer");
+ // 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 [] tmp = new Parameter [fixed_parms.Length + 1];
+
fixed_parms.CopyTo (tmp, 0);
tmp [fixed_parms.Length] = new Parameter (
Type, "value", Parameter.Modifier.NONE, null);
Parameters set_formal_params = new Parameters (tmp, null, Location);
- DefineMethod (
- parent, iface_type, TypeManager.void_type,
- "set_Item", set_pars, false);
+ is_implementing = DefineMethod (
+ parent, explicit_iface_type, TypeManager.void_type,
+ "set_" + IndexerName, set_pars, attr, false);
InternalParameters ip = new InternalParameters (parent, set_formal_params);
}
}
- TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
+
+ //
+ // Only define the PropertyBuilder if we are not implementing
+ // an interface property.
+ //
+ if (!is_implementing){
+ PropertyBuilder = parent.TypeBuilder.DefineProperty (
+ IndexerName, prop_attr, IndexerType, parameters);
+
+ if (GetBuilder != null)
+ PropertyBuilder.SetGetMethod (GetBuilder);
+
+ if (SetBuilder != null)
+ PropertyBuilder.SetSetMethod (SetBuilder);
+
+ TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
+ }
return true;
}
public void Emit (TypeContainer tc)
{
ILGenerator ig;
- EmitContext ec;
- ec = new EmitContext (tc, Location, null, IndexerType, ModFlags);
- Attribute.ApplyAttributes (ec, PropertyBuilder, this, OptAttributes, Location);
+ //
+ // The PropertyBuilder can be null for explicit implementations, in that
+ // case, we do not actually emit the ".property", so there is nowhere to
+ // put the attribute
+ //
+ if (PropertyBuilder != null)
+ Attribute.ApplyAttributes (
+ ec, PropertyBuilder, this, OptAttributes, Location);
+ if (Get != null)
+ Attribute.ApplyAttributes (ec, GetBuilder, Get, Get.OptAttributes, Location);
+ if (Set != null)
+ Attribute.ApplyAttributes (ec, SetBuilder, Set, Set.OptAttributes, Location);
+ if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0)
+ return;
+
if (Get != null){
ig = GetBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, IndexerType, ModFlags);
- ec.EmitTopBlock (Get, Location);
+ ec.EmitTopBlock (Get.Block, Location);
}
if (Set != null){
ig = SetBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, null, ModFlags);
- ec.EmitTopBlock (Set, Location);
+ ec.EmitTopBlock (Set.Block, Location);
}
}
}
};
public readonly OpType OperatorType;
- public readonly string ReturnType;
- public readonly string FirstArgType;
- public readonly string FirstArgName;
- public readonly string SecondArgType;
- public readonly string SecondArgName;
+ public readonly Expression ReturnType;
+ public readonly Expression FirstArgType, SecondArgType;
+ public readonly string FirstArgName, SecondArgName;
public readonly Block Block;
public Attributes OptAttributes;
public MethodBuilder OperatorMethodBuilder;
public string MethodName;
public Method OperatorMethod;
- public Operator (OpType type, string ret_type, int flags, string arg1type, string arg1name,
- string arg2type, string arg2name, Block block, Attributes attrs, Location loc)
+ public Operator (OpType type, Expression ret_type, int flags,
+ Expression arg1type, string arg1name,
+ Expression arg2type, string arg2name,
+ Block block, Attributes attrs, Location loc)
: base ("", loc)
{
OperatorType = type;
{
EmitContext ec = new EmitContext (parent, Location, null, null, ModFlags);
Attribute.ApplyAttributes (ec, OperatorMethodBuilder, this, OptAttributes, Location);
+
+ //
+ // abstract or extern methods have no bodies
+ //
+ if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0)
+ return;
OperatorMethod.Block = Block;
OperatorMethod.Emit (parent);
public Type RetType;
public Type [] Parameters;
+ /// <summary>
+ /// This delegate is used to extract methods which have the
+ /// same signature as the argument
+ /// </summary>
+ public static MemberFilter method_signature_filter;
+
+ /// <summary>
+ /// This delegate is used to extract inheritable methods which
+ /// have the same signature as the argument. By inheritable,
+ /// this means that we have permissions to override the method
+ /// from the current assembly and class
+ /// </summary>
+ public static MemberFilter inheritable_method_signature_filter;
+
+ static MethodSignature ()
+ {
+ method_signature_filter = new MemberFilter (MemberSignatureCompare);
+ inheritable_method_signature_filter = new MemberFilter (
+ InheritableMemberSignatureCompare);
+ }
+
public MethodSignature (string name, Type ret_type, Type [] parameters)
{
Name = name;
RetType = ret_type;
- Parameters = parameters;
+
+ if (parameters == null)
+ Parameters = TypeManager.NoTypes;
+ else
+ Parameters = parameters;
}
public override int GetHashCode ()
return true;
}
+
+ static bool MemberSignatureCompare (MemberInfo m, object filter_criteria)
+ {
+ MethodInfo mi;
+
+ if (! (m is MethodInfo))
+ return false;
+
+ MethodSignature sig = (MethodSignature) filter_criteria;
+
+ if (m.Name != sig.Name)
+ return false;
+
+ mi = (MethodInfo) m;
+
+ //
+ // we use sig.RetType == null to mean `do not check the
+ // method return value.
+ //
+ if (sig.RetType != null)
+ if (mi.ReturnType != sig.RetType)
+ return false;
+
+ Type [] args = TypeManager.GetArgumentTypes (mi);
+ Type [] sigp = sig.Parameters;
+
+ if (args.Length != sigp.Length)
+ return false;
+
+ for (int i = args.Length; i > 0; ){
+ i--;
+ if (args [i] != sigp [i])
+ return false;
+ }
+ return true;
+ }
+
+ //
+ // This filter should be used when we are requesting methods that
+ // we want to override.
+ //
+ // This makes a number of assumptions, for example
+ // that the methods being extracted are of a parent
+ // class (this means we know implicitly that we are
+ // being called to find out about members by a derived
+ // class).
+ //
+ static bool InheritableMemberSignatureCompare (MemberInfo m, object filter_criteria)
+ {
+ if (MemberSignatureCompare (m, filter_criteria)){
+ MethodInfo mi = (MethodInfo) m;
+ MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+ // If only accessible to the current class.
+ if (prot == MethodAttributes.Private)
+ return false;
+
+ // If only accessible to the defining assembly or
+ if (prot == MethodAttributes.FamANDAssem ||
+ prot == MethodAttributes.Assembly){
+ if (m.DeclaringType.Assembly == CodeGen.AssemblyBuilder)
+ return true;
+ else
+ return false;
+ }
+
+ // Anything else (FamOrAssembly and Public) is fine
+ return true;
+ }
+ return false;
+ }
}
}
projects / mono.git / blobdiff