throw new Exception ("This should be caught by Resolve");
case Operator.UnaryNegation:
- if (ec.CheckState && type != TypeManager.float_type && type != TypeManager.double_type) {
+ if (ec.CheckState) {
ig.Emit (OpCodes.Ldc_I4_0);
if (type == TypeManager.int64_type)
ig.Emit (OpCodes.Conv_U8);
public override Expression DoResolve (EmitContext ec)
{
- if (left == null)
- return null;
-
if ((oper == Operator.Subtraction) && (left is ParenthesizedExpression)) {
left = ((ParenthesizedExpression) left).Expr;
left = left.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.Type);
/// representation.
/// </summary>
public class ParameterReference : Expression, IAssignMethod, IMemoryLocation, IVariable {
- Parameter par;
- string name;
+ Parameters pars;
+ String name;
int idx;
Block block;
VariableInfo vi;
+ public Parameter.Modifier mod;
public bool is_ref, is_out, prepared;
public bool IsOut {
LocalTemporary temp;
- public ParameterReference (Parameter par, Block block, int idx, Location loc)
+ public ParameterReference (Parameters pars, Block block, int idx, string name, Location loc)
{
- this.par = par;
- this.name = par.Name;
+ this.pars = pars;
this.block = block;
this.idx = idx;
+ this.name = name;
this.loc = loc;
eclass = ExprClass.Variable;
}
+ public ParameterReference (InternalParameters pars, Block block, int idx, Location loc)
+ : this (pars.Parameters, block, idx, pars.ParameterName (idx), loc)
+ { }
+
public VariableInfo VariableInfo {
get { return vi; }
}
public bool VerifyFixed ()
{
// A parameter is fixed if it's a value parameter (i.e., no modifier like out, ref, param).
- return par.ModFlags == Parameter.Modifier.NONE;
+ return mod == Parameter.Modifier.NONE;
}
public bool IsAssigned (EmitContext ec, Location loc)
return true;
Report.Error (269, loc,
- "Use of unassigned out parameter `{0}'", par.Name);
+ "Use of unassigned out parameter `{0}'", name);
return false;
}
protected void DoResolveBase (EmitContext ec)
{
- if (!par.Resolve (ec)) {
- //TODO:
- }
-
- type = par.ParameterType;
- Parameter.Modifier mod = par.ModFlags;
+ type = pars.GetParameterInfo (ec, idx, out mod);
is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
- is_out = (mod & Parameter.Modifier.OUT) == Parameter.Modifier.OUT;
+ is_out = (mod & Parameter.Modifier.OUT) != 0;
eclass = ExprClass.Variable;
if (is_out)
vi = block.ParameterMap [idx];
if (ec.CurrentAnonymousMethod != null){
- if (is_ref && !block.Toplevel.IsLocalParameter (name)){
+ if (is_ref){
Report.Error (1628, Location, "Cannot use ref or out parameter `{0}' inside an anonymous method block",
- par.Name);
+ name);
return;
}
ILGenerator ig = ec.ig;
int arg_idx = idx;
- if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
- ec.EmitParameter (name, leave_copy, prepared, ref temp);
+ if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
+ if (leave_copy)
+ throw new InternalErrorException ();
+
+ ec.EmitParameter (name);
return;
}
public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
{
- prepared = prepare_for_load;
if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
- ec.EmitAssignParameter (name, source, leave_copy, prepare_for_load, ref temp);
+ ec.EmitAssignParameter (name, source, leave_copy, prepare_for_load);
return;
}
ILGenerator ig = ec.ig;
int arg_idx = idx;
-
+ prepared = prepare_for_load;
if (!ec.MethodIsStatic)
arg_idx++;
get {
switch (ArgType) {
case AType.Out:
- return Parameter.Modifier.OUT;
+ return Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF;
case AType.Ref:
- return Parameter.Modifier.REF;
+ return Parameter.Modifier.REF | Parameter.Modifier.ISBYREF;
default:
return Parameter.Modifier.NONE;
if (pd_count != arg_count)
return false;
} else {
- if (!pd.HasParams)
+ if (pd.ParameterModifier (count) != Parameter.Modifier.PARAMS)
return false;
}
Argument a = (Argument) arguments [i];
Parameter.Modifier a_mod = a.Modifier &
- (unchecked (~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK)));
+ (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
Parameter.Modifier p_mod = pd.ParameterModifier (i) &
- (unchecked (~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK)));
+ (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
if (a_mod == p_mod) {
if (!Convert.ImplicitConversionExists (ec,
a.Expr,
pd.ParameterType (i)))
- return false;
-
+ return false;
+
if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
Type pt = pd.ParameterType (i);
/// Determines if the candidate method is applicable (section 14.4.2.1)
/// to the given set of arguments
/// </summary>
- public static bool IsApplicable (EmitContext ec, ArrayList arguments, int arg_count,
- MethodBase candidate)
+ static bool IsApplicable (EmitContext ec, ArrayList arguments, int arg_count,
+ MethodBase candidate)
{
ParameterData pd = TypeManager.GetParameterData (candidate);
Argument a = (Argument) arguments [i];
Parameter.Modifier a_mod = a.Modifier &
- ~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK);
-
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
Parameter.Modifier p_mod = pd.ParameterModifier (i) &
- ~(Parameter.Modifier.OUTMASK | Parameter.Modifier.REFMASK | Parameter.Modifier.PARAMS);
-
- if (a_mod == p_mod) {
- Type pt = pd.ParameterType (i);
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
+ if (a_mod == p_mod ||
+ (a_mod == Parameter.Modifier.NONE && p_mod == Parameter.Modifier.PARAMS)) {
if (a_mod == Parameter.Modifier.NONE) {
- if (!TypeManager.IsEqual (a.Type, pt) &&
- !Convert.ImplicitConversionExists (ec, a.Expr, pt))
+ if (!TypeManager.IsEqual (a.Type, pd.ParameterType (i)) && !Convert.ImplicitConversionExists (ec,
+ a.Expr,
+ pd.ParameterType (i)))
return false;
- continue;
- }
+ }
- if (pt != a.Type)
- return false;
+ if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
+ Type pt = pd.ParameterType (i);
+
+ if (!pt.IsByRef)
+ pt = TypeManager.GetReferenceType (pt);
+
+ if (pt != a.Type)
+ return false;
+ }
} else
return false;
}
return true;
}
- static internal bool IsAncestralType (Type first_type, Type second_type)
+ static private bool IsAncestralType (Type first_type, Type second_type)
{
return first_type != second_type &&
(second_type.IsSubclassOf (first_type) ||
MethodBase[] methods = me.Methods;
- int nmethods = methods.Length;
-
- if (!me.IsBase) {
- //
- // Methods marked 'override' don't take part in 'applicable_type'
- // computation, nor in the actual overload resolution.
- // However, they still need to be emitted instead of a base virtual method.
- // So, we salt them away into the 'candidate_overrides' array.
- //
- // In case of reflected methods, we replace each overriding method with
- // its corresponding base virtual method. This is to improve compatibility
- // with non-C# libraries which change the visibility of overrides (#75636)
- //
- int j = 0;
- for (int i = 0; i < methods.Length; ++i) {
- MethodBase m = methods [i];
- if (TypeManager.IsOverride (m)) {
- if (candidate_overrides == null)
- candidate_overrides = new ArrayList ();
- candidate_overrides.Add (m);
- m = TypeManager.TryGetBaseDefinition (m);
- }
- if (m != null)
- methods [j++] = m;
- }
- nmethods = j;
- }
-
//
// First we construct the set of applicable methods
//
bool is_sorted = true;
- for (int i = 0; i < nmethods; i++){
+ for (int i = 0; i < methods.Length; i++){
Type decl_type = methods [i].DeclaringType;
//
// If we have already found an applicable method
// we eliminate all base types (Section 14.5.5.1)
//
- if (applicable_type != null && IsAncestralType (decl_type, applicable_type))
+ if ((applicable_type != null) &&
+ IsAncestralType (decl_type, applicable_type))
continue;
+ //
+ // Methods marked 'override' don't take part in 'applicable_type'
+ // computation, nor in the actual overload resolution.
+ // However, they still need to be emitted instead of a base virtual method.
+ // We avoid doing the 'applicable' test here, since it'll anyway be applied
+ // to the base virtual function, and IsOverride is much faster than IsApplicable.
+ //
+ if (!me.IsBase && TypeManager.IsOverride (methods [i])) {
+ if (candidate_overrides == null)
+ candidate_overrides = new ArrayList ();
+ candidate_overrides.Add (methods [i]);
+ continue;
+ }
+
//
// Check if candidate is applicable (section 14.4.2.1)
// Is candidate applicable in normal form?
//
- bool is_applicable = IsApplicable (ec, me, Arguments, arg_count, ref methods [i]);
+ bool is_applicable = IsApplicable (
+ ec, me, Arguments, arg_count, ref methods [i]);
- if (!is_applicable && IsParamsMethodApplicable (ec, me, Arguments, arg_count, ref methods [i])) {
+ if (!is_applicable &&
+ (IsParamsMethodApplicable (
+ ec, me, Arguments, arg_count, ref methods [i]))) {
MethodBase candidate = methods [i];
if (candidate_to_form == null)
candidate_to_form = new PtrHashtable ();
// return by providing info about the closest match
//
int errors = Report.Errors;
- for (int i = 0; i < nmethods; ++i) {
+ for (int i = 0; i < methods.Length; ++i) {
MethodBase c = (MethodBase) methods [i];
ParameterData pd = TypeManager.GetParameterData (c);
method_params, null, may_fail, loc))
return null;
- if (method == null)
- return null;
-
- MethodBase the_method = method;
- if (the_method.Mono_IsInflatedMethod) {
- the_method = the_method.GetGenericMethodDefinition ();
-
- if ((method is MethodInfo) &&
- !ConstraintChecker.CheckConstraints (ec, the_method, method, loc))
- return null;
+ if (method != null) {
+ MethodBase the_method = method;
+ if (the_method.Mono_IsInflatedMethod)
+ the_method = the_method.GetGenericMethodDefinition ();
+ IMethodData data = TypeManager.GetMethod (the_method);
+ if (data != null)
+ data.SetMemberIsUsed ();
}
-
- IMethodData data = TypeManager.GetMethod (the_method);
- if (data != null)
- data.SetMemberIsUsed ();
-
return method;
}
return true;
}
- private bool resolved = false;
public override Expression DoResolve (EmitContext ec)
{
- if (resolved)
- return this.method == null ? null : this;
-
- resolved = true;
//
// First, resolve the expression that is used to
// trigger the invocation
}
MethodGroupExpr mg = (MethodGroupExpr) expr;
- MethodBase method = OverloadResolve (ec, mg, Arguments, false, loc);
+ method = OverloadResolve (ec, mg, Arguments, false, loc);
if (method == null)
return null;
mg.InstanceExpression.CheckMarshallByRefAccess (ec.ContainerType);
eclass = ExprClass.Value;
- this.method = method;
return this;
}
if (array_type_expr == null)
return false;
- type = array_type_expr.ResolveType (ec);
+ type = array_type_expr.ResolveType (ec);
+
+ if (!type.IsArray) {
+ Error (622, "Can only use array initializer expressions to assign to array types. Try using a new expression instead.");
+ return false;
+ }
underlying_type = TypeManager.GetElementType (type);
dimensions = type.GetArrayRank ();
ILGenerator ig = ec.ig;
if (ec.TypeContainer is Struct){
- ec.EmitThis (false);
+ ec.EmitThis ();
source.Emit (ec);
-
- LocalTemporary t = null;
- if (leave_copy) {
- t = new LocalTemporary (ec, type);
+ if (leave_copy)
ec.ig.Emit (OpCodes.Dup);
- t.Store (ec);
- }
-
ig.Emit (OpCodes.Stobj, type);
-
- if (leave_copy)
- t.Emit (ec);
} else {
throw new Exception ("how did you get here");
}
{
ILGenerator ig = ec.ig;
- ec.EmitThis (false);
+ ec.EmitThis ();
if (ec.TypeContainer is Struct)
ig.Emit (OpCodes.Ldobj, type);
}
public void AddressOf (EmitContext ec, AddressOp mode)
{
- ec.EmitThis (true);
+ ec.EmitThis ();
// FIMXE
// FIGURE OUT WHY LDARG_S does not work
return null;
}
- if (expr_type == TypeManager.void_type) {
- Error (23, "The `.' operator can not be applied to operands of type 'void'");
- return null;
- }
-
Expression member_lookup;
member_lookup = MemberLookup (
ec, expr_type, expr_type, Identifier, loc);
return null;
bool old = ec.TestObsoleteMethodUsage;
- ec.TestObsoleteMethodUsage = false;
+ ec.TestObsoleteMethodUsage = true;
Type ltype = lexpr.ResolveType (ec);
ec.TestObsoleteMethodUsage = old;
}
public override string Name {
- get { return left + dim; }
+ get {
+ return left + dim;
+ }
}
public override string FullName {
- get { return type.FullName; }
- }
-
- public override string GetSignatureForError ()
- {
- return left.GetSignatureForError () + dim;
+ get {
+ return type.FullName;
+ }
}
}
projects / mono.git / blobdiff