if (TypeBuilder != null)
return TypeBuilder;
- ec = new EmitContext (this, this, Location, null, null, ModFlags, false);
-
if (TypeManager.multicast_delegate_type == null && !RootContext.StdLib) {
Namespace system = RootNamespace.Global.GetNamespace ("System", true);
TypeExpr expr = system.Lookup (this, "MulticastDelegate", Location) as TypeExpr;
- TypeManager.multicast_delegate_type = expr.ResolveType (ec);
+ TypeManager.multicast_delegate_type = expr.Type;
}
if (TypeManager.multicast_delegate_type == null)
public override bool Define ()
{
- MethodAttributes mattr;
- int i;
-
- if (ec == null)
- throw new InternalErrorException ("Define called before DefineType?");
-
// FIXME: POSSIBLY make this static, as it is always constant
//
Type [] const_arg_types = new Type [2];
const_arg_types [0] = TypeManager.object_type;
const_arg_types [1] = TypeManager.intptr_type;
- mattr = MethodAttributes.RTSpecialName | MethodAttributes.SpecialName |
+ const MethodAttributes ctor_mattr = MethodAttributes.RTSpecialName | MethodAttributes.SpecialName |
MethodAttributes.HideBySig | MethodAttributes.Public;
- ConstructorBuilder = TypeBuilder.DefineConstructor (mattr,
+ ConstructorBuilder = TypeBuilder.DefineConstructor (ctor_mattr,
CallingConventions.Standard,
const_arg_types);
// First, call the `out of band' special method for
// defining recursively any types we need:
- if (!Parameters.Resolve (ec))
+ if (!Parameters.Resolve (this))
return false;
//
"accessible than delegate `" + Name + "'");
return false;
}
- if (partype.IsPointer && !UnsafeOK (Parent))
- return false;
}
- ReturnType = ReturnType.ResolveAsTypeTerminal (ec, false);
+ ReturnType = ReturnType.ResolveAsTypeTerminal (this, false);
if (ReturnType == null)
return false;
-
- ret_type = ReturnType.Type;
- if (ret_type == null)
- return false;
-
- CheckObsoleteType (ReturnType);
+ ret_type = ReturnType.Type;
+
if (!Parent.AsAccessible (ret_type, ModFlags)) {
Report.Error (58, Location,
"Inconsistent accessibility: return type `" +
return false;
}
- if (ret_type.IsPointer && !UnsafeOK (Parent))
- return false;
-
if (RootContext.StdLib && (ret_type == TypeManager.arg_iterator_type || ret_type == TypeManager.typed_reference_type)) {
Method.Error1599 (Location, ret_type);
return false;
CallingConventions cc = Parameters.CallingConvention;
- mattr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual;
+ const MethodAttributes mattr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual | MethodAttributes.NewSlot;
InvokeBuilder = TypeBuilder.DefineMethod ("Invoke",
mattr,
cc,
ret_type,
Parameters.Types);
-
- //
- // Define parameters, and count out/ref parameters
- //
- int out_params = 0;
- foreach (Parameter p in Parameters.FixedParameters) {
- if ((p.ModFlags & Parameter.Modifier.ISBYREF) != 0)
- out_params++;
- }
InvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
//
// BeginInvoke
//
- int params_num = Parameters.Count;
- Type [] async_param_types = new Type [params_num + 2];
-
- Parameters.Types.CopyTo (async_param_types, 0);
-
- async_param_types [params_num] = TypeManager.asynccallback_type;
- async_param_types [params_num + 1] = TypeManager.object_type;
-
- mattr = MethodAttributes.Public | MethodAttributes.HideBySig |
- MethodAttributes.Virtual | MethodAttributes.NewSlot;
+
+ Parameters async_parameters = Parameters.MergeGenerated (Parameters,
+ new Parameter (TypeManager.asynccallback_type, "callback", Parameter.Modifier.NONE, null, Location),
+ new Parameter (TypeManager.object_type, "object", Parameter.Modifier.NONE, null, Location));
BeginInvokeBuilder = TypeBuilder.DefineMethod ("BeginInvoke",
- mattr,
- cc,
- TypeManager.iasyncresult_type,
- async_param_types);
+ mattr, cc, TypeManager.iasyncresult_type, async_parameters.Types);
- i = Parameters.Count;
- Parameters.ApplyAttributes (ec, BeginInvokeBuilder);
- BeginInvokeBuilder.DefineParameter (i + 1, ParameterAttributes.None, "callback");
- BeginInvokeBuilder.DefineParameter (i + 2, ParameterAttributes.None, "object");
-
BeginInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
-
- Parameter [] async_params = new Parameter [params_num + 2];
- Parameters.FixedParameters.CopyTo (async_params, 0);
-
- async_params [params_num] = new Parameter (
- TypeManager.asynccallback_type, "callback",
- Parameter.Modifier.NONE, null, Location);
- async_params [params_num + 1] = new Parameter (
- TypeManager.object_type, "object",
- Parameter.Modifier.NONE, null, Location);
-
- Parameters async_parameters = new Parameters (async_params);
- async_parameters.Resolve (ec);
- async_parameters.ApplyAttributes (ec, BeginInvokeBuilder);
-
+ async_parameters.ApplyAttributes (BeginInvokeBuilder);
TypeManager.RegisterMethod (BeginInvokeBuilder, async_parameters);
//
// EndInvoke is a bit more interesting, all the parameters labeled as
// out or ref have to be duplicated here.
//
-
- Type [] end_param_types = new Type [out_params + 1];
- Parameter [] end_params = new Parameter [out_params + 1];
- int param = 0;
- if (out_params > 0){
- int top = Parameters.FixedParameters.Length;
- for (i = 0; i < top; i++){
+
+ //
+ // Define parameters, and count out/ref parameters
+ //
+ Parameters end_parameters;
+ int out_params = 0;
+
+ foreach (Parameter p in Parameters.FixedParameters) {
+ if ((p.ModFlags & Parameter.Modifier.ISBYREF) != 0)
+ ++out_params;
+ }
+
+ if (out_params > 0) {
+ Type [] end_param_types = new Type [out_params];
+ Parameter [] end_params = new Parameter [out_params ];
+
+ int param = 0;
+ for (int i = 0; i < Parameters.FixedParameters.Length; ++i) {
Parameter p = Parameters.FixedParameters [i];
if ((p.ModFlags & Parameter.Modifier.ISBYREF) == 0)
continue;
- end_param_types [param] = Parameters.Types [i];
+ end_param_types [param] = p.ExternalType();
end_params [param] = p;
- param++;
+ ++param;
}
+ end_parameters = new Parameters (end_params, end_param_types);
+ }
+ else {
+ end_parameters = Parameters.EmptyReadOnlyParameters;
}
- end_param_types [out_params] = TypeManager.iasyncresult_type;
- end_params [out_params] = new Parameter (TypeManager.system_iasyncresult_expr, "result", Parameter.Modifier.NONE, null, Location);
+ end_parameters = Parameters.MergeGenerated (end_parameters,
+ new Parameter (TypeManager.iasyncresult_type, "result", Parameter.Modifier.NONE, null, Location));
+
//
// Create method, define parameters, register parameters with type system
//
- EndInvokeBuilder = TypeBuilder.DefineMethod ("EndInvoke", mattr, cc, ret_type, end_param_types);
+ EndInvokeBuilder = TypeBuilder.DefineMethod ("EndInvoke", mattr, cc, ret_type, end_parameters.Types);
EndInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
- //
- // EndInvoke: Label the parameters
- //
- EndInvokeBuilder.DefineParameter (out_params + 1, ParameterAttributes.None, "result");
- for (i = 0; i < end_params.Length-1; i++){
- EndInvokeBuilder.DefineParameter (i + 1, end_params [i].Attributes, end_params [i].Name);
- }
-
- Parameters end_parameters = new Parameters (end_params);
- end_parameters.Resolve (ec);
-
+ end_parameters.ApplyAttributes (EndInvokeBuilder);
TypeManager.RegisterMethod (EndInvokeBuilder, end_parameters);
return true;
public override void Emit ()
{
- Parameters.ApplyAttributes (ec, InvokeBuilder);
+ Parameters.ApplyAttributes (InvokeBuilder);
if (OptAttributes != null) {
- OptAttributes.Emit (ec, this);
+ OptAttributes.Emit ();
}
base.Emit ();
}
//TODO: duplicate
- protected override bool VerifyClsCompliance (DeclSpace ds)
+ protected override bool VerifyClsCompliance ()
{
- if (!base.VerifyClsCompliance (ds)) {
+ if (!base.VerifyClsCompliance ()) {
return false;
}
method_desc = Invocation.FullMethodDesc (found_method);
Expression invoke_method = Expression.MemberLookup (
- ec, type, "Invoke", MemberTypes.Method,
+ ec.ContainerType, type, "Invoke", MemberTypes.Method,
Expression.AllBindingFlags, loc);
MethodInfo method = ((MethodGroupExpr) invoke_method).Methods [0] as MethodInfo;
IMethodData md = TypeManager.GetMethod (delegate_method);
if (md == null) {
if (System.Attribute.GetCustomAttribute (delegate_method, TypeManager.conditional_attribute_type) != null) {
+ Report.SymbolRelatedToPreviousError (delegate_method);
Report.Error (1618, loc, "Cannot create delegate with `{0}' because it has a Conditional attribute", TypeManager.CSharpSignature (delegate_method));
+ return null;
}
} else {
md.SetMemberIsUsed ();
- if (md.OptAttributes != null && md.OptAttributes.Search (TypeManager.conditional_attribute_type, ec) != null) {
+ if (md.OptAttributes != null && md.OptAttributes.Search (TypeManager.conditional_attribute_type) != null) {
+ Report.SymbolRelatedToPreviousError (delegate_method);
Report.Error (1618, loc, "Cannot create delegate with `{0}' because it has a Conditional attribute", TypeManager.CSharpSignature (delegate_method));
+ return null;
}
}
}
method_group = Expression.MemberLookup (
- ec, type, "Invoke", MemberTypes.Method,
+ ec.ContainerType, type, "Invoke", MemberTypes.Method,
Expression.AllBindingFlags, loc) as MethodGroupExpr;
if (method_group == null) {
EventInfo ei = ((EventExpr) InstanceExpr).EventInfo;
Expression ml = MemberLookup (
- ec, ec.ContainerType, ei.Name,
+ ec.ContainerType, ec.ContainerType, ei.Name,
MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
if (ml == null) {