//
// 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;
public bool AllowMultiple = false;
public bool Inherited;
+ // The interfaces we implement.
+ Type [] ifaces;
+
//
// The indexer name for this class
//
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){
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;
}
get {
return fields;
}
+
+ set {
+ fields = value;
+ }
}
public ArrayList InstanceConstructors {
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);
}
Location l = f.Location;
}
}
- 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 = TypeManager.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;
-
-#if DEBUG
- {
- Type x = TypeBuilder;
-
- while (x != null){
- Type [] iff = x.GetInterfaces ();
- Console.WriteLine ("Type: " + x.Name);
-
- foreach (Type tt in iff){
- Console.WriteLine (" Iface: " + tt.Name);
- }
- x = x.BaseType;
- }
- }
-#endif
-
- 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 = 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++;
- }
- }
- }
+ /// <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
count = bases.Count;
if (is_class){
- string name = (string) bases [0];
- Type first = FindType (name);
+ 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;
Type [] ifaces = new Type [count-start];
for (i = start, j = 0; i < count; i++, j++){
- string name = (string) bases [i];
- Type t = FindType (name);
+ 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;
}
}
+
+ 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);
}
//
public override TypeBuilder DefineType ()
{
Type parent;
- Type [] ifaces;
bool error;
bool is_class;
}
}
+ // 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
//
TypeManager.AddUserType (Name, TypeBuilder, this, ifaces);
- if (parent == TypeManager.attribute_type ||
- parent.IsSubclassOf (TypeManager.attribute_type)) {
+ if ((parent != null) &&
+ (parent == TypeManager.attribute_type ||
+ parent.IsSubclassOf (TypeManager.attribute_type))) {
RootContext.RegisterAttribute (this);
TypeManager.RegisterAttrType (TypeBuilder, this);
} else
ReportStructInitializedInstanceError ();
}
- RegisterRequiredImplementations ();
-
+ Pending = PendingImplementation.GetPendingImplementations (this);
+
//
// Constructors are not in the defined_names array
//
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 ();
}
if (filter == null)
filter = accepting_filter;
-
+
if ((mt & MemberTypes.Field) != 0) {
if (fields != null) {
foreach (Field f in fields) {
}
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){
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);
return null;
}
- public MemberInfo GetFieldFromEvent (EventExpr event_expr)
- {
- if (events == null)
- return null;
-
- 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 null;
- }
+
public static MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
MemberFilter filter, object criteria)
return null;
}
- /// <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)
- {
- int arg_len = args.Length;
-
- 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){
- if (!((ret_type == null && m.ReturnType == TypeManager.void_type) ||
- (m.ReturnType == null && ret_type == TypeManager.void_type)))
- {
- i++;
- continue;
- }
- }
-
- //
- // Check if we have the same parameters
- //
- if (tm.args [i].Length != arg_len){
- 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>
- /// C# allows this kind of scenarios:
- /// interface I { void M (); }
- /// class X { public void M (); }
- /// class Y : X, I { }
- ///
- /// For that case, we create an explicit implementation function
- /// I.M in Y.
- /// </summary>
- void DefineProxy (Type iface, MethodInfo parent_method, MethodInfo iface_method,
- Type [] args)
- {
- MethodBuilder proxy;
-
- string proxy_name = iface.Name + "." + iface_method.Name;
-
- proxy = TypeBuilder.DefineMethod (
- proxy_name,
- MethodAttributes.HideBySig |
- MethodAttributes.NewSlot |
- MethodAttributes.Virtual,
- CallingConventions.Standard | CallingConventions.HasThis,
- parent_method.ReturnType, args);
-
- int top = args.Length;
- ILGenerator ig = proxy.GetILGenerator ();
-
- ig.Emit (OpCodes.Ldarg_0);
- for (int i = 0; i < top; i++){
- switch (i){
- case 0:
- ig.Emit (OpCodes.Ldarg_1); break;
- case 1:
- ig.Emit (OpCodes.Ldarg_2); break;
- case 2:
- ig.Emit (OpCodes.Ldarg_3); break;
- default:
- ig.Emit (OpCodes.Ldarg, i - 1); break;
- }
- }
- ig.Emit (OpCodes.Call, parent_method);
- ig.Emit (OpCodes.Ret);
-
- TypeBuilder.DefineMethodOverride (proxy, iface_method);
- }
-
- /// <summary>
- /// This function tells whether one of our parent classes implements
- /// the given method (which turns out, it is valid to have an interface
- /// implementation in a parent
- /// </summary>
- bool ParentImplements (Type iface_type, MethodInfo mi)
- {
- MethodSignature ms;
-
- Type [] args = TypeManager.GetArgumentTypes (mi);
- ms = new MethodSignature (mi.Name, mi.ReturnType, args);
- MemberInfo [] list = FindMembers (
- TypeBuilder.BaseType, MemberTypes.Method | MemberTypes.Property,
- BindingFlags.Public | BindingFlags.Instance,
- MethodSignature.method_signature_filter, ms);
-
- if (list == null || list.Length == 0)
- return false;
-
- DefineProxy (iface_type, (MethodInfo) list [0], mi, args);
- return true;
- }
-
- /// <summary>
- /// Verifies that any pending abstract methods or interface methods
- /// were implemented.
- /// </summary>
- bool VerifyPendingMethods ()
- {
- 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){
- if (ParentImplements (type, mi))
- continue;
-
- 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;
- }
-
/// <summary>
/// Emits the values for the constants
/// </summary>
e.Emit (this);
}
- if (pending_implementations != null)
- if (!VerifyPendingMethods ())
+ if (Pending != null)
+ if (Pending.VerifyPendingMethods ())
return;
Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
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 {
}
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)
{
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;
}
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;
//
// 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.
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;
MethodAttributes.HideBySig;
//
- // 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;
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.ContainerType.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;
}
}
- if (this is ConstructorBaseInitializer)
+ if (this is ConstructorBaseInitializer) {
+ if (ec.ContainerType.BaseType == null)
+ return true;
+
t = ec.ContainerType.BaseType;
- else
+ 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 (
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);
}
}
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);
// `this' access
//
ec.IsStatic = true;
- if (!Initializer.Resolve (ec))
+ if (Initializer != null && !Initializer.Resolve (ec))
return;
ec.IsStatic = false;
}
// Classes can have base initializers and instance field initializers.
//
if (parent is Class){
- if ((ModFlags & Modifiers.STATIC) == 0){
+ if ((ModFlags & Modifiers.STATIC) == 0)
parent.EmitFieldInitializers (ec);
-
- Initializer.Emit (ec);
- }
}
+ if (Initializer != null)
+ Initializer.Emit (ec);
if ((ModFlags & Modifiers.STATIC) != 0)
parent.EmitFieldInitializers (ec);
// their common bits. This is also used to flag usage of the field
//
abstract public class FieldBase : MemberCore {
- public readonly string Type;
+ public Expression Type;
public readonly Object Initializer;
public readonly Attributes OptAttributes;
public FieldBuilder FieldBuilder;
//
// The constructor is only exposed to our children
//
- protected FieldBase (string type, int mod, int allowed_mod, string name,
+ protected FieldBase (Expression type, int mod, int allowed_mod, string name,
object init, Attributes attrs, Location loc)
: base (name, loc)
{
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 (type, mod, AllowedModifiers, name, expr_or_array_init, attrs, loc)
{
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;
// Null if the accessor is empty, or a Block if not
//
public Block Block;
-
- public Accessor (Block b)
+ public Attributes OptAttributes;
+
+ public Accessor (Block b, Attributes attrs)
{
Block = b;
+ OptAttributes = attrs;
}
}
public class Property : MemberCore {
- public readonly string Type;
+ public Expression Type;
public Accessor Get, Set;
public PropertyBuilder PropertyBuilder;
public Attributes OptAttributes;
//
// 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.EXTERN |
Modifiers.VIRTUAL;
- public Property (string type, string name, int mod_flags,
+ public Property (Expression type, string name, int mod_flags,
Accessor get_block, Accessor set_block,
Attributes attrs, Location loc)
: base (name, loc)
return true;
}
- bool DefineMethod (TypeContainer parent, Type iface_type, string short_name,
- MethodAttributes flags, bool is_get)
+ bool DefineMethod (TypeContainer parent, string short_name,
+ MethodAttributes flags, bool is_get, ref bool is_implementing)
{
Type [] parameters = TypeManager.NoTypes;
- MethodInfo implementing;
+ MethodInfo implementing = null;
Type fn_type;
- string name;
+ string name, prefix;
+ 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 (explicit_iface_type == null){
//
// We already catch different accessibility settings
// so we just need to check that we are not private
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;
}
}
MethodAttributes.HideBySig;
//
- // 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))
MethodAttributes flags = Modifiers.MethodAttr (ModFlags);
- flags |= MethodAttributes.HideBySig |
- MethodAttributes.SpecialName;
+ 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;
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, flags, true))
+ if (!DefineMethod (parent, short_name, flags, true, ref is_implementing))
return false;
if (Set != null)
- if (!DefineMethod (parent, iface_type, short_name, flags, 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.Block, Location);
}
if (Set != null){
ig = SetBuilder.GetILGenerator ();
ec = new EmitContext (tc, Location, ig, null, ModFlags);
-
+
ec.EmitTopBlock (Set.Block, Location);
}
}
Modifiers.UNSAFE |
Modifiers.ABSTRACT;
- public readonly Block Add;
- public readonly Block Remove;
+ public readonly Accessor Add;
+ public readonly Accessor Remove;
public MyEventBuilder EventBuilder;
Type EventType;
MethodBuilder AddBuilder, RemoveBuilder;
- public Event (string type, string name, Object init, int mod, Block add_block,
- Block rem_block, Attributes attrs, Location 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)
{
- Add = add_block;
- Remove = rem_block;
+ 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);
}
add_name, m_attr, null, parameters);
AddBuilder.DefineParameter (1, ParameterAttributes.None, "value");
EventBuilder.SetAddOnMethod (AddBuilder);
- parent.IsInterfaceMethod (null, add_name, null, parameters, true);
+ if (parent.Pending != null)
+ parent.Pending.ImplementMethod (null, add_name, null, parameters, false);
//
// HACK because System.Reflection.Emit is lame
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);
- parent.IsInterfaceMethod (null, remove_name, null, parameters, true);
+ 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.EXTERN |
Modifiers.ABSTRACT;
- public readonly string Type;
+ public readonly Expression Type;
public readonly string InterfaceType;
public readonly Parameters FormalParameters;
public readonly Accessor Get, Set;
public PropertyBuilder PropertyBuilder;
public Type IndexerType;
public string IndexerName;
+
EmitContext ec;
-
- public Indexer (string type, string int_type, int flags, Parameters parms,
+
+ 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;
}
- bool DefineMethod (TypeContainer parent, Type iface_type,
+ bool DefineMethod (TypeContainer parent, Type explicit_iface_type,
Type ret_type, string name,
Type [] parameters, MethodAttributes attr, bool is_get)
{
- 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;
// but it wont get cleared
//
if (implementing != null){
- if (iface_type == null){
+ 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.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;
}
}
MethodAttributes.HideBySig;
//
- // 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);
}
//
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_" + IndexerName;
- if (iface_type != null)
- meth_name = iface_type + ".get_" + IndexerName;
+ string meth_name = prefix + "get_" + IndexerName;
GetBuilder = parent.TypeBuilder.DefineMethod (
meth_name, attr, IndexerType, parameters);
parent.TypeBuilder.DefineMethodOverride (
GetBuilder, implementing);
} else {
- string meth_name = "set_" + IndexerName;
+ string meth_name = prefix + "set_" + IndexerName;
- if (iface_type != null)
- meth_name = iface_type + ".set_" + IndexerName;
-
SetBuilder = parent.TypeBuilder.DefineMethod (
meth_name, attr, null, parameters);
if (implementing != null)
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;
}
if (Get != null){
is_implementing = DefineMethod (
- parent, iface_type, IndexerType, "get_" + IndexerName,
+ parent, explicit_iface_type, IndexerType, "get_" + IndexerName,
parameters, attr, true);
InternalParameters pi = new InternalParameters (parent, FormalParameters);
if (!TypeManager.RegisterMethod (GetBuilder, pi, parameters)) {
Parameters set_formal_params = new Parameters (tmp, null, Location);
is_implementing = DefineMethod (
- parent, iface_type, TypeManager.void_type,
+ parent, explicit_iface_type, TypeManager.void_type,
"set_" + IndexerName, set_pars, attr, false);
InternalParameters ip = new InternalParameters (parent, set_formal_params);
if (!is_implementing){
PropertyBuilder = parent.TypeBuilder.DefineProperty (
IndexerName, prop_attr, IndexerType, parameters);
- TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
if (GetBuilder != null)
PropertyBuilder.SetGetMethod (GetBuilder);
if (SetBuilder != null)
PropertyBuilder.SetSetMethod (SetBuilder);
+
+ TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder);
}
return true;
{
ILGenerator ig;
- 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;
};
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;
projects / mono.git / blobdiff