op_name = oper_names [(int) Oper];
- mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+ mg = MemberLookup (ec.ContainerType, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
if (mg != null) {
Expression e = StaticCallExpr.MakeSimpleCall (
throw new Exception ("This should be caught by Resolve");
case Operator.UnaryNegation:
- if (ec.CheckState) {
+ if (ec.CheckState && type != TypeManager.float_type && type != TypeManager.double_type) {
ig.Emit (OpCodes.Ldc_I4_0);
if (type == TypeManager.int64_type)
ig.Emit (OpCodes.Conv_U8);
Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temporary = new LocalTemporary (ec, expr.Type);
+ temporary = new LocalTemporary (expr.Type);
temporary.Store (ec);
}
}
source.Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temporary = new LocalTemporary (ec, expr.Type);
+ temporary = new LocalTemporary (expr.Type);
temporary.Store (ec);
}
else
op_name = "op_Decrement";
- mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+ mg = MemberLookup (ec.ContainerType, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
if (mg != null) {
method = StaticCallExpr.MakeSimpleCall (
if (expr == null)
return null;
} else {
- expr.Error_UnexpectedKind (ec, "variable, indexer or property access", loc);
+ expr.Error_UnexpectedKind (ec.DeclContainer, "variable, indexer or property access", loc);
return null;
}
this.is_expr = is_expr;
((IAssignMethod) expr).EmitAssign (ec, this, is_expr && (mode == Mode.PreIncrement || mode == Mode.PreDecrement), true);
}
-
public override void Emit (EmitContext ec)
{
TypeExpr texpr = ProbeType.ResolveAsTypeTerminal (ec, false);
if (texpr == null)
return null;
- probe_type = texpr.ResolveType (ec);
+
+ probe_type = texpr.Type;
expr = expr.Resolve (ec);
if (expr == null)
}
return this;
- }
+ }
}
/// <summary>
Error_CannotConvertType (etype, probe_type, loc);
return null;
- }
+ }
+
+ public override bool GetAttributableValue (Type valueType, out object value)
+ {
+ return expr.GetAttributableValue (valueType, out value);
+ }
}
/// <summary>
this.target_type = cast_type;
this.expr = expr;
this.loc = loc;
+
+ if (target_type == TypeManager.system_void_expr)
+ Report.Error (1547, loc, "Keyword `void' cannot be used in this context");
}
public Expression TargetType {
- get {
- return target_type;
- }
+ get { return target_type; }
}
public Expression Expr {
- get {
- return expr;
- }
- set {
- expr = value;
- }
- }
-
- public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
- {
- expr = expr.DoResolveLValue (ec, right_side);
- if (expr == null)
- return null;
-
- return ResolveRest (ec);
+ get { return expr; }
+ set { expr = value; }
}
public override Expression DoResolve (EmitContext ec)
if (expr == null)
return null;
- return ResolveRest (ec);
- }
-
- Expression ResolveRest (EmitContext ec)
- {
TypeExpr target = target_type.ResolveAsTypeTerminal (ec, false);
if (target == null)
return null;
- type = target.ResolveType (ec);
+ type = target.Type;
if (type.IsAbstract && type.IsSealed) {
Report.Error (716, loc, "Cannot convert to static type `{0}'", TypeManager.CSharpName (type));
Constant c = expr as Constant;
if (c != null) {
- c = c.TryReduce (ec, type, loc);
- if (c != null)
- return c;
+ try {
+ c = c.TryReduce (ec, type, loc);
+ if (c != null)
+ return c;
+ }
+ catch (OverflowException) {
+ return null;
+ }
}
if (type.IsPointer && !ec.InUnsafe) {
public override void Emit (EmitContext ec)
{
- //
- // This one will never happen
- //
throw new Exception ("Should not happen");
}
}
+ "'");
}
- bool IsOfType (EmitContext ec, Type l, Type r, Type t, bool check_user_conversions)
+ static bool IsOfType (EmitContext ec, Type l, Type r, Type t, bool check_user_conversions)
{
if ((l == t) || (r == t))
return true;
if (ll >= 0)
right = new ULongConstant ((ulong) ll, right.Location);
} else {
- e = Convert.ImplicitNumericConversion (ec, right, l);
+ e = Convert.ImplicitNumericConversion (right, l);
if (e != null)
right = e;
}
if (ll > 0)
left = new ULongConstant ((ulong) ll, right.Location);
} else {
- e = Convert.ImplicitNumericConversion (ec, left, r);
+ e = Convert.ImplicitNumericConversion (left, r);
if (e != null)
left = e;
}
string op = oper_names [(int) oper];
MethodGroupExpr union;
- left_operators = MemberLookup (ec, l, op, MemberTypes.Method, AllBindingFlags, loc);
+ left_operators = MemberLookup (ec.ContainerType, l, op, MemberTypes.Method, AllBindingFlags, loc);
if (r != l){
right_operators = MemberLookup (
- ec, r, op, MemberTypes.Method, AllBindingFlags, loc);
+ ec.ContainerType, r, op, MemberTypes.Method, AllBindingFlags, loc);
union = Invocation.MakeUnionSet (left_operators, right_operators, loc);
} else
union = (MethodGroupExpr) left_operators;
// Also, a standard conversion must exist from either one
//
bool left_to_right =
- Convert.ImplicitStandardConversionExists (ec, left, r);
+ Convert.ImplicitStandardConversionExists (left, r);
bool right_to_left = !left_to_right &&
- Convert.ImplicitStandardConversionExists (ec, right, l);
+ Convert.ImplicitStandardConversionExists (right, l);
if (!left_to_right && !right_to_left) {
Error_OperatorCannotBeApplied ();
// +, -, *, /, %, &, |, ^, ==, !=, <, >, <=, >=
//
if (oper == Operator.Addition || oper == Operator.Subtraction) {
- if (l.IsSubclassOf (TypeManager.delegate_type)){
+ if (TypeManager.IsDelegateType (l)){
if (((right.eclass == ExprClass.MethodGroup) ||
(r == TypeManager.anonymous_method_type))){
if ((RootContext.Version != LanguageVersion.ISO_1)){
r = right.Type;
}
}
-
- if (r.IsSubclassOf (TypeManager.delegate_type)){
+
+ if (TypeManager.IsDelegateType (r)){
MethodInfo method;
ArrayList args = new ArrayList (2);
-
+
args = new ArrayList (2);
args.Add (new Argument (left, Argument.AType.Expression));
args.Add (new Argument (right, Argument.AType.Expression));
-
+
if (oper == Operator.Addition)
method = TypeManager.delegate_combine_delegate_delegate;
else
Error_OperatorCannotBeApplied ();
return null;
}
-
+
return new BinaryDelegate (l, method, args);
}
}
-
+
//
// Pointer arithmetic:
//
return this;
}
- Constant EnumLiftUp (EmitContext ec, Constant left, Constant right)
+ Constant EnumLiftUp (Constant left, Constant right)
{
switch (oper) {
case Operator.BitwiseOr:
// The conversion rules are ignored in enum context but why
if (!ec.InEnumContext && lc != null && rc != null && (TypeManager.IsEnumType (left.Type) || TypeManager.IsEnumType (right.Type))) {
- left = lc = EnumLiftUp (ec, lc, rc);
+ left = lc = EnumLiftUp (lc, rc);
if (lc == null)
return null;
- right = rc = EnumLiftUp (ec, rc, lc);
+ right = rc = EnumLiftUp (rc, lc);
if (rc == null)
return null;
}
return ResolveOperator (ec);
}
+ public override TypeExpr ResolveAsTypeTerminal (IResolveContext ec, bool silent)
+ {
+ return null;
+ }
+
private void CheckUselessComparison (Constant c, Type type)
{
if (c == null || !IsTypeIntegral (type)
//
// Constant folding
//
- if (operand is StringConstant && operands.Count != 0) {
- StringConstant last_operand = operands [operands.Count - 1] as StringConstant;
- if (last_operand != null) {
- operands [operands.Count - 1] = new StringConstant (last_operand.Value + ((StringConstant) operand).Value, last_operand.Location);
- return;
+ StringConstant sc = operand as StringConstant;
+ if (sc != null) {
+// TODO: it will be better to do this silently as an optimalization
+// int i = 0;
+// string s = "" + i;
+// because this code has poor performace
+// if (sc.Value.Length == 0)
+// Report.Warning (-300, 3, Location, "Appending an empty string has no effect. Did you intend to append a space string?");
+
+ if (operands.Count != 0) {
+ StringConstant last_operand = operands [operands.Count - 1] as StringConstant;
+ if (last_operand != null) {
+ operands [operands.Count - 1] = new StringConstant (last_operand.Value + ((StringConstant) operand).Value, last_operand.Location);
+ return;
+ }
}
}
return null;
}
- left_temp = new LocalTemporary (ec, type);
+ left_temp = new LocalTemporary (type);
ArrayList arguments = new ArrayList ();
arguments.Add (new Argument (left_temp, Argument.AType.Expression));
return this;
}
+ public override TypeExpr ResolveAsTypeTerminal (IResolveContext ec, bool silent)
+ {
+ return null;
+ }
+
public override void Emit (EmitContext ec)
{
ILGenerator ig = ec.ig;
bool is_readonly;
bool prepared;
LocalTemporary temp;
-
+
public LocalVariableReference (Block block, string name, Location l)
{
Block = block;
}
public VariableInfo VariableInfo {
- get {
- return local_info.VariableInfo;
- }
+ get { return local_info.VariableInfo; }
}
public bool IsReadOnly {
- get {
- return is_readonly;
- }
+ get { return is_readonly; }
}
public bool VerifyAssigned (EmitContext ec)
return variable_info == null || variable_info.IsAssigned (ec, loc);
}
- protected Expression DoResolveBase (EmitContext ec, Expression lvalue_right_side)
+ void ResolveLocalInfo ()
{
if (local_info == null) {
local_info = Block.GetLocalInfo (Name);
-
- // is out param
- if (lvalue_right_side == EmptyExpression.Null)
- local_info.Used = true;
-
is_readonly = local_info.ReadOnly;
}
+ }
+ protected Expression DoResolveBase (EmitContext ec)
+ {
type = local_info.VariableType;
- VariableInfo variable_info = local_info.VariableInfo;
- if (lvalue_right_side != null){
- if (is_readonly){
- if (lvalue_right_side is LocalVariableReference || lvalue_right_side == EmptyExpression.Null)
- Report.Error (1657, loc, "Cannot pass `{0}' as a ref or out argument because it is a `{1}'",
- Name, local_info.GetReadOnlyContext ());
- else
- Report.Error (1656, loc, "Cannot assign to `{0}' because it is a `{1}'",
- Name, local_info.GetReadOnlyContext ());
- return null;
- }
-
- if (variable_info != null)
- variable_info.SetAssigned (ec);
- }
-
Expression e = Block.GetConstantExpression (Name);
- if (e != null) {
- local_info.Used = true;
- eclass = ExprClass.Value;
+ if (e != null)
return e.Resolve (ec);
- }
if (!VerifyAssigned (ec))
return null;
- if (lvalue_right_side == null)
- local_info.Used = true;
-
if (ec.CurrentAnonymousMethod != null){
//
// If we are referencing a variable from the external block
return this;
}
-
+
public override Expression DoResolve (EmitContext ec)
{
- return DoResolveBase (ec, null);
+ ResolveLocalInfo ();
+ local_info.Used = true;
+ return DoResolveBase (ec);
}
override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
- return DoResolveBase (ec, right_side);
+ ResolveLocalInfo ();
+
+ if (is_readonly) {
+ int code;
+ string msg;
+ if (right_side == EmptyExpression.OutAccess) {
+ code = 1657; msg = "Cannot pass `{0}' as a ref or out argument because it is a `{1}'";
+ } else if (right_side == EmptyExpression.LValueMemberAccess) {
+ code = 1654; msg = "Cannot assign to members of `{0}' because it is a `{1}'";
+ } else if (right_side == EmptyExpression.LValueMemberOutAccess) {
+ code = 1655; msg = "Cannot pass members of `{0}' as ref or out arguments because it is a `{1}'";
+ } else {
+ code = 1656; msg = "Cannot assign to `{0}' because it is a `{1}'";
+ }
+ Report.Error (code, loc, msg, Name, local_info.GetReadOnlyContext ());
+ return null;
+ }
+
+ // is out param
+ if (right_side == EmptyExpression.OutAccess)
+ local_info.Used = true;
+
+ if (VariableInfo != null)
+ VariableInfo.SetAssigned (ec);
+
+ return DoResolveBase (ec);
}
public bool VerifyFixed ()
return true;
}
- public override int GetHashCode()
+ public override int GetHashCode ()
{
return Name.GetHashCode ();
}
if (leave_copy){
ec.ig.Emit (OpCodes.Dup);
if (local_info.FieldBuilder != null){
- temp = new LocalTemporary (ec, Type);
+ temp = new LocalTemporary (Type);
temp.Store (ec);
}
}
source.Emit (ec);
if (leave_copy){
ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, Type);
+ temp = new LocalTemporary (Type);
temp.Store (ec);
}
ig.Emit (OpCodes.Stfld, local_info.FieldBuilder);
ec.CurrentBranching.SetAssigned (vi);
}
- public void SetFieldAssigned (EmitContext ec, string field_name)
+ public void SetFieldAssigned (EmitContext ec, string field_name)
{
if (is_out && ec.DoFlowAnalysis)
ec.CurrentBranching.SetFieldAssigned (vi, field_name);
}
- protected void DoResolveBase (EmitContext ec)
+ protected bool DoResolveBase (EmitContext ec)
{
if (!par.Resolve (ec)) {
//TODO:
if (is_ref && !block.Toplevel.IsLocalParameter (name)){
Report.Error (1628, Location, "Cannot use ref or out parameter `{0}' inside an anonymous method block",
par.Name);
- return;
+ return false;
}
//
ec.CaptureParameter (name, type, idx);
}
}
+
+ return true;
}
public override int GetHashCode()
//
public override Expression DoResolve (EmitContext ec)
{
- DoResolveBase (ec);
+ if (!DoResolveBase (ec))
+ return null;
if (is_out && ec.DoFlowAnalysis && (!ec.OmitStructFlowAnalysis || !vi.TypeInfo.IsStruct) && !IsAssigned (ec, loc))
return null;
override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
- DoResolveBase (ec);
+ if (!DoResolveBase (ec))
+ return null;
SetAssigned (ec);
ec.ig.Emit (OpCodes.Dup);
if (is_ref) {
- temp = new LocalTemporary (ec, type);
+ temp = new LocalTemporary (type);
temp.Store (ec);
}
}
if (is_ref) {
if (leave_copy) {
- temp = new LocalTemporary (ec, type);
+ temp = new LocalTemporary (type);
temp.Store (ec);
}
TypeManager.CSharpName (a.Expr.Type);
}
- public bool ResolveMethodGroup (EmitContext ec, Location loc)
+ public bool ResolveMethodGroup (EmitContext ec)
{
// FIXME: csc doesn't report any error if you try to use `ref' or
// `out' in a delegate creation expression.
return true;
}
-
- void Error_LValueRequired (Location loc)
- {
- Report.Error (1510, loc, "A ref or out argument must be an assignable variable");
- }
public bool Resolve (EmitContext ec, Location loc)
{
bool old_do_flow_analysis = ec.DoFlowAnalysis;
ec.DoFlowAnalysis = true;
- if (ArgType == AType.Ref) {
- ec.InRefOutArgumentResolving = true;
+ // Verify that the argument is readable
+ if (ArgType != AType.Out)
Expr = Expr.Resolve (ec);
- ec.InRefOutArgumentResolving = false;
- if (Expr == null) {
- ec.DoFlowAnalysis = old_do_flow_analysis;
- return false;
- }
- Expr = Expr.DoResolveLValue (ec, Expr);
- if (Expr == null)
- Error_LValueRequired (loc);
- } else if (ArgType == AType.Out) {
- ec.InRefOutArgumentResolving = true;
- Expr = Expr.DoResolveLValue (ec, EmptyExpression.Null);
- ec.InRefOutArgumentResolving = false;
-
- if (Expr == null)
- Error_LValueRequired (loc);
- }
- else
- Expr = Expr.Resolve (ec);
+ // Verify that the argument is writeable
+ if (Expr != null && (ArgType == AType.Out || ArgType == AType.Ref))
+ Expr = Expr.ResolveLValue (ec, EmptyExpression.OutAccess, loc);
ec.DoFlowAnalysis = old_do_flow_analysis;
- if (Expr == null)
- return false;
+ return Expr != null;
+ }
- if (ArgType == AType.Expression)
- return true;
- else {
- //
- // Catch errors where fields of a MarshalByRefObject are passed as ref or out
- // This is only allowed for `this'
- //
- FieldExpr fe = Expr as FieldExpr;
- if (fe != null && !fe.IsStatic){
- Expression instance = fe.InstanceExpression;
-
- if (instance.GetType () != typeof (This)){
- if (fe.InstanceExpression.Type.IsSubclassOf (TypeManager.mbr_type)){
- Report.SymbolRelatedToPreviousError (fe.InstanceExpression.Type);
- Report.Warning (197, 1, loc,
- "Passing `{0}' as ref or out or taking its address may cause a runtime exception because it is a field of a marshal-by-reference class",
- fe.GetSignatureForError ());
- return false;
- }
- }
- }
+ public void Emit (EmitContext ec)
+ {
+ if (ArgType != AType.Ref && ArgType != AType.Out) {
+ Expr.Emit (ec);
+ return;
}
- if (Expr.eclass != ExprClass.Variable){
- //
- // We just probe to match the CSC output
- //
- if (Expr.eclass == ExprClass.PropertyAccess ||
- Expr.eclass == ExprClass.IndexerAccess){
- Report.Error (206, loc, "A property or indexer `{0}' may not be passed as an out or ref parameter",
- Expr.GetSignatureForError ());
- } else {
- Error_LValueRequired (loc);
- }
- return false;
- }
+ AddressOp mode = AddressOp.Store;
+ if (ArgType == AType.Ref)
+ mode |= AddressOp.Load;
- return true;
- }
+ IMemoryLocation ml = (IMemoryLocation) Expr;
+ ParameterReference pr = ml as ParameterReference;
- public void Emit (EmitContext ec)
- {
- //
- // Ref and Out parameters need to have their addresses taken.
//
// ParameterReferences might already be references, so we want
// to pass just the value
//
- if (ArgType == AType.Ref || ArgType == AType.Out){
- AddressOp mode = AddressOp.Store;
-
- if (ArgType == AType.Ref)
- mode |= AddressOp.Load;
-
- if (Expr is ParameterReference){
- ParameterReference pr = (ParameterReference) Expr;
-
- if (pr.IsRef)
- pr.EmitLoad (ec);
- else {
-
- pr.AddressOf (ec, mode);
- }
- } else {
- if (Expr is IMemoryLocation)
- ((IMemoryLocation) Expr).AddressOf (ec, mode);
- else {
- Error_LValueRequired (Expr.Location);
- return;
- }
- }
- } else
- Expr.Emit (ec);
+ if (pr != null && pr.IsRef)
+ pr.EmitLoad (ec);
+ else
+ ml.AddressOf (ec, mode);
}
}
/// q if a->q is better,
/// null if neither is better
/// </summary>
- static Type BetterConversion (EmitContext ec, Argument a, Type p, Type q, Location loc)
+ static Type BetterConversion (EmitContext ec, Argument a, Type p, Type q)
{
Type argument_type = a.Type;
Expression argument_expr = a.Expr;
/// and the current best match
/// </summary>
/// <remarks>
- /// Returns an integer indicating :
+ /// Returns a boolean indicating :
/// false if candidate ain't better
- /// true if candidate is better than the current best match
+ /// true if candidate is better than the current best match
/// </remarks>
static bool BetterFunction (EmitContext ec, ArrayList args, int argument_count,
MethodBase candidate, bool candidate_params,
- MethodBase best, bool best_params, Location loc)
+ MethodBase best, bool best_params)
{
ParameterData candidate_pd = TypeManager.GetParameterData (candidate);
ParameterData best_pd = TypeManager.GetParameterData (best);
continue;
same = false;
- Type better = BetterConversion (ec, a, ct, bt, loc);
+ Type better = BetterConversion (ec, a, ct, bt);
// for each argument, the conversion to 'ct' should be no worse than
// the conversion to 'bt'.
static internal bool IsAncestralType (Type first_type, Type second_type)
{
return first_type != second_type &&
- (second_type.IsSubclassOf (first_type) ||
+ (TypeManager.IsSubclassOf (second_type, first_type) ||
TypeManager.ImplementsInterface (second_type, first_type));
}
///
/// </summary>
public static MethodBase OverloadResolve (EmitContext ec, MethodGroupExpr me,
- ArrayList Arguments, bool may_fail,
+ ArrayList Arguments, bool may_fail,
Location loc)
{
MethodBase method = null;
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;
+ }
+
+ int applicable_errors = Report.Errors;
+
//
// First we construct the set of applicable methods
//
bool is_sorted = true;
- for (int i = 0; i < methods.Length; i++){
+ for (int i = 0; i < nmethods; 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))
- 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]);
+ if (applicable_type != null && IsAncestralType (decl_type, applicable_type))
continue;
- }
//
// Check if candidate is applicable (section 14.4.2.1)
// Is candidate applicable in normal form?
//
- bool is_applicable = IsApplicable (
- ec, Arguments, arg_count, methods [i]);
+ bool is_applicable = IsApplicable (ec, Arguments, arg_count, methods [i]);
- if (!is_applicable &&
- (IsParamsMethodApplicable (
- ec, Arguments, arg_count, methods [i]))) {
+ if (!is_applicable && IsParamsMethodApplicable (ec, Arguments, arg_count, methods [i])) {
MethodBase candidate = methods [i];
if (candidate_to_form == null)
candidate_to_form = new PtrHashtable ();
}
}
+ if (applicable_errors != Report.Errors)
+ return null;
+
int candidate_top = candidates.Count;
if (applicable_type == null) {
// return by providing info about the closest match
//
int errors = Report.Errors;
- for (int i = 0; i < methods.Length; ++i) {
+ for (int i = 0; i < nmethods; ++i) {
MethodBase c = (MethodBase) methods [i];
ParameterData pd = TypeManager.GetParameterData (c);
if (BetterFunction (ec, Arguments, arg_count,
candidate, cand_params,
- method, method_params, loc)) {
+ method, method_params)) {
method = candidate;
method_params = cand_params;
}
bool cand_params = candidate_to_form != null && candidate_to_form.Contains (candidate);
if (!BetterFunction (ec, Arguments, arg_count,
method, method_params,
- candidate, cand_params,
- loc)) {
+ candidate, cand_params)) {
Report.SymbolRelatedToPreviousError (candidate);
ambiguous = candidate;
}
method_params, null, may_fail, loc))
return null;
- if (method != null) {
- IMethodData data = TypeManager.GetMethod (method);
- if (data != null)
- data.SetMemberIsUsed ();
- }
+ if (method == null)
+ return null;
+
+ IMethodData data = TypeManager.GetMethod (method);
+ if (data != null)
+ data.SetMemberIsUsed ();
+
return method;
}
Location loc)
{
ParameterData pd = TypeManager.GetParameterData (method);
- int pd_count = pd.Count;
-
- for (int j = 0; j < arg_count; j++) {
+ int j;
+ for (j = 0; j < arg_count; j++) {
Argument a = (Argument) Arguments [j];
Expression a_expr = a.Expr;
Type parameter_type = pd.ParameterType (j);
Parameter.Modifier pm = pd.ParameterModifier (j);
-
- if (pm == Parameter.Modifier.PARAMS){
- if ((pm & ~Parameter.Modifier.PARAMS) != a.Modifier) {
- if (!may_fail)
- Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
- return false;
- }
+ Parameter.Modifier am = a.Modifier;
+ if (pm == Parameter.Modifier.ARGLIST) {
+ if (!(a.Expr is Arglist))
+ break;
+ continue;
+ }
+
+ if (pm == Parameter.Modifier.PARAMS) {
+ pm = Parameter.Modifier.NONE;
if (chose_params_expanded)
parameter_type = TypeManager.GetElementType (parameter_type);
- } else if (pm == Parameter.Modifier.ARGLIST) {
- if (!(a.Expr is Arglist)) {
- if (!may_fail)
- Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
- return false;
- }
- continue;
- } else {
- //
- // Check modifiers
- //
- if (pd.ParameterModifier (j) != a.Modifier){
- if (!may_fail)
- Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
- return false;
- }
}
- //
- // Check Type
- //
- if (!a.Type.Equals (parameter_type)){
- Expression conv;
-
- conv = Convert.ImplicitConversion (ec, a_expr, parameter_type, loc);
+ if (pm != am)
+ break;
+
+ if (!a.Type.Equals (parameter_type)) {
+ if (pm == Parameter.Modifier.OUT || pm == Parameter.Modifier.REF)
+ break;
+
+ Expression conv = Convert.ImplicitConversion (ec, a_expr, parameter_type, loc);
+ if (conv == null)
+ break;
- if (conv == null) {
- if (!may_fail)
- Error_InvalidArguments (loc, j, method, delegate_type, a, pd);
- return false;
- }
-
- //
// Update the argument with the implicit conversion
- //
if (a_expr != conv)
a.Expr = conv;
}
- if (parameter_type.IsPointer){
- if (!ec.InUnsafe){
- UnsafeError (loc);
- return false;
- }
- }
-
- Parameter.Modifier a_mod = a.Modifier &
- unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
- Parameter.Modifier p_mod = pd.ParameterModifier (j) &
- unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
-
- if (a_mod != p_mod &&
- pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS) {
- if (!may_fail) {
- Invocation.Error_InvalidArguments (loc, j, method, null, a, pd);
- }
-
+ if (parameter_type.IsPointer && !ec.InUnsafe) {
+ UnsafeError (loc);
return false;
}
}
- return true;
+ if (j == arg_count)
+ return true;
+
+ if (!may_fail)
+ Error_InvalidArguments (loc, j, method, delegate_type, (Argument) Arguments [j], pd);
+ return false;
}
+ 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;
- method = OverloadResolve (ec, mg, Arguments, false, loc);
+ MethodBase method = OverloadResolve (ec, mg, Arguments, false, loc);
if (method == null)
return null;
}
if (mg.InstanceExpression != null)
- mg.InstanceExpression.CheckMarshallByRefAccess (ec.ContainerType);
+ mg.InstanceExpression.CheckMarshalByRefAccess ();
eclass = ExprClass.Value;
+ this.method = method;
return this;
}
a.Emit (ec);
if (dup_args) {
ec.ig.Emit (OpCodes.Dup);
- (temps [i] = new LocalTemporary (ec, a.Type)).Store (ec);
+ (temps [i] = new LocalTemporary (a.Type)).Store (ec);
}
}
}
}
- static Type[] GetVarargsTypes (EmitContext ec, MethodBase mb,
- ArrayList arguments)
+ static Type[] GetVarargsTypes (MethodBase mb, ArrayList arguments)
{
ParameterData pd = TypeManager.GetParameterData (mb);
/// <summary>
/// This checks the ConditionalAttribute on the method
/// </summary>
- static bool IsMethodExcluded (MethodBase method, EmitContext ec)
+ static bool IsMethodExcluded (MethodBase method)
{
if (method.IsConstructor)
return false;
IMethodData md = TypeManager.GetMethod (method);
if (md != null)
- return md.IsExcluded (ec);
+ return md.IsExcluded ();
// For some methods (generated by delegate class) GetMethod returns null
// because they are not included in builder_to_method table
method = TypeManager.void_array_copyto_array_int;
}
- if (ec.TestObsoleteMethodUsage) {
+ if (!ec.IsInObsoleteScope) {
//
// This checks ObsoleteAttribute on the method and on the declaring type
//
if (oa != null)
AttributeTester.Report_ObsoleteMessage (oa, TypeManager.CSharpSignature (method), loc);
-
oa = AttributeTester.GetObsoleteAttribute (method.DeclaringType);
if (oa != null) {
AttributeTester.Report_ObsoleteMessage (oa, method.DeclaringType.FullName, loc);
}
}
- if (IsMethodExcluded (method, ec))
+ if (IsMethodExcluded (method))
return;
if (!is_static){
this_call = instance_expr is This;
if (decl_type.IsValueType || (!this_call && instance_expr.Type.IsValueType))
struct_call = true;
-
+
+ //
+ // If this is ourselves, push "this"
+ //
if (!omit_args) {
Type t = null;
//
// Push the instance expression
//
- if (instance_expr.Type.IsValueType) {
+ if (TypeManager.IsValueType (instance_expr.Type)) {
//
// Special case: calls to a function declared in a
// reference-type with a value-type argument need
((IMemoryLocation)instance_expr).
AddressOf (ec, AddressOp.LoadStore);
} else {
- LocalTemporary temp = new LocalTemporary (ec, instance_expr.Type);
+ LocalTemporary temp = new LocalTemporary (instance_expr.Type);
instance_expr.Emit (ec);
temp.Store (ec);
temp.AddressOf (ec, AddressOp.Load);
if (dup_args) {
ig.Emit (OpCodes.Dup);
if (Arguments != null && Arguments.Count != 0) {
- this_arg = new LocalTemporary (ec, t);
+ this_arg = new LocalTemporary (t);
this_arg.Store (ec);
}
}
call_op = OpCodes.Callvirt;
if ((method.CallingConvention & CallingConventions.VarArgs) != 0) {
- Type[] varargs_types = GetVarargsTypes (ec, method, Arguments);
+ Type[] varargs_types = GetVarargsTypes (method, Arguments);
ig.EmitCall (call_op, (MethodInfo) method, varargs_types);
return;
}
if (texpr == null)
return null;
- type = texpr.ResolveType (ec);
+ type = texpr.Type;
if (Arguments == null) {
Expression c = Constantify (type);
MethodGroupExpr mg = ml as MethodGroupExpr;
if (mg == null) {
- ml.Error_UnexpectedKind (ec, "method group", loc);
+ ml.Error_UnexpectedKind (ec.DeclContainer, "method group", loc);
return null;
}
method = Invocation.OverloadResolve (ec, mg, Arguments, false, loc);
if (method == null) {
if (almostMatchedMembers.Count != 0)
- MemberLookupFailed (ec, type, type, ".ctor", null, true, loc);
+ MemberLookupFailed (ec.ContainerType, type, type, ".ctor", null, true, loc);
return null;
}
//
bool DoEmit (EmitContext ec, bool need_value_on_stack)
{
- bool is_value_type = type.IsValueType;
+ bool is_value_type = TypeManager.IsValueType (type);
ILGenerator ig = ec.ig;
if (is_value_type){
// We need to create a new LocalTemporary each time since
// you can't share LocalBuilders among ILGeneators.
if (!value_target_set)
- value_target = new LocalTemporary (ec, type);
+ value_target = new LocalTemporary (type);
ml = (IMemoryLocation) value_target;
ml.AddressOf (ec, AddressOp.Store);
}
if (!value_target_set)
- value_target = new LocalTemporary (ec, type);
+ value_target = new LocalTemporary (type);
IMemoryLocation ml = (IMemoryLocation) value_target;
ml.AddressOf (ec, AddressOp.Store);
ArrayList array_data;
- Hashtable bounds;
+ IDictionary bounds;
- //
- // The number of array initializers that we can handle
- // via the InitializeArray method - through EmitStaticInitializers
- //
- int num_automatic_initializers;
-
- const int max_automatic_initializers = 6;
+ // The number of constants in array initializers
+ int const_initializers_count;
public ArrayCreation (Expression requested_base_type, ArrayList exprs, string rank, ArrayList initializers, Location l)
{
Error (178, "Invalid rank specifier: expected `,' or `]'");
}
- public bool CheckIndices (EmitContext ec, ArrayList probe, int idx, bool specified_dims)
+ bool CheckIndices (EmitContext ec, ArrayList probe, int idx, bool specified_dims)
{
if (specified_dims) {
Argument a = (Argument) arguments [idx];
Error_IncorrectArrayInitializer ();
return false;
}
- if (specified_dims && (idx + 1 >= arguments.Count)){
+ if (idx + 1 >= dimensions){
Error (623, "Array initializers can only be used in a variable or field initializer. Try using a new expression instead");
return false;
}
Expression tmp = (Expression) o;
tmp = tmp.Resolve (ec);
- probe [i] = tmp;
if (tmp == null)
return false;
- // Console.WriteLine ("I got: " + tmp);
- // Handle initialization from vars, fields etc.
-
Expression conv = Convert.ImplicitConversionRequired (
ec, tmp, underlying_type, loc);
if (conv == null)
return false;
+
+ // Initializers with the default values can be ignored
+ Constant c = tmp as Constant;
+ if (c != null) {
+ if (c.IsDefaultInitializer (array_element_type)) {
+ conv = null;
+ }
+ else {
+ ++const_initializers_count;
+ }
+ } else {
+ // Used to invalidate static initializer
+ const_initializers_count = int.MinValue;
+ }
- if (conv is StringConstant || conv is DecimalConstant || conv is NullCast) {
- // These are subclasses of Constant that can appear as elements of an
- // array that cannot be statically initialized (with num_automatic_initializers
- // > max_automatic_initializers), so num_automatic_initializers should be left as zero.
- array_data.Add (conv);
- } else if (conv is Constant) {
- // These are the types of Constant that can appear in arrays that can be
- // statically allocated.
- array_data.Add (conv);
- num_automatic_initializers++;
- } else
- array_data.Add (conv);
+ array_data.Add (conv);
}
}
return true;
}
- public void UpdateIndices (EmitContext ec)
+ public void UpdateIndices ()
{
int i = 0;
for (ArrayList probe = initializers; probe != null;) {
arguments.Add (new Argument (e, Argument.AType.Expression));
bounds [i++] = probe.Count;
- probe = null;
+ return;
}
}
}
- public bool ValidateInitializers (EmitContext ec, Type array_type)
+ bool ResolveInitializers (EmitContext ec)
{
if (initializers == null) {
- if (expect_initializers)
- return false;
- else
- return true;
+ return !expect_initializers;
}
if (underlying_type == null)
// will need to store them in the byte blob later
//
array_data = new ArrayList ();
- bounds = new Hashtable ();
+ bounds = new System.Collections.Specialized.HybridDictionary ();
- bool ret;
+ if (arguments != null)
+ return CheckIndices (ec, initializers, 0, true);
- if (arguments != null) {
- ret = CheckIndices (ec, initializers, 0, true);
- return ret;
- } else {
- arguments = new ArrayList ();
+ arguments = new ArrayList ();
- ret = CheckIndices (ec, initializers, 0, false);
-
- if (!ret)
- return false;
+ if (!CheckIndices (ec, initializers, 0, false))
+ return false;
- UpdateIndices (ec);
+ UpdateIndices ();
- if (arguments.Count != dimensions) {
- Error_IncorrectArrayInitializer ();
- return false;
- }
-
- return ret;
+ if (arguments.Count != dimensions) {
+ Error_IncorrectArrayInitializer ();
+ return false;
}
+
+ return true;
}
//
if (array_type_expr == null)
return false;
- type = array_type_expr.ResolveType (ec);
+ type = array_type_expr.Type;
underlying_type = TypeManager.GetElementType (type);
dimensions = type.GetArrayRank ();
public override Expression DoResolve (EmitContext ec)
{
- int arg_count;
+ if (type != null)
+ return this;
if (!LookupType (ec))
return null;
+ array_element_type = TypeManager.GetElementType (type);
+ if (array_element_type.IsAbstract && array_element_type.IsSealed) {
+ Report.Error (719, loc, "`{0}': array elements cannot be of static type", TypeManager.CSharpName (array_element_type));
+ return null;
+ }
+
//
// First step is to validate the initializers and fill
// in any missing bits
//
- if (!ValidateInitializers (ec, type))
+ if (!ResolveInitializers (ec))
return null;
+ int arg_count;
if (arguments == null)
arg_count = 0;
else {
}
}
- array_element_type = TypeManager.GetElementType (type);
-
- if (array_element_type.IsAbstract && array_element_type.IsSealed) {
- Report.Error (719, loc, "`{0}': array elements cannot be of static type", TypeManager.CSharpName (array_element_type));
- return null;
- }
-
if (arg_count == 1) {
is_one_dimensional = true;
eclass = ExprClass.Value;
if (is_builtin_type) {
Expression ml;
- ml = MemberLookup (ec, type, ".ctor", MemberTypes.Constructor,
+ ml = MemberLookup (ec.ContainerType, type, ".ctor", MemberTypes.Constructor,
AllBindingFlags, loc);
if (!(ml is MethodGroupExpr)) {
- ml.Error_UnexpectedKind (ec, "method group", loc);
+ ml.Error_UnexpectedKind (ec.DeclContainer, "method group", loc);
return null;
}
}
}
- public static byte [] MakeByteBlob (ArrayList array_data, Type underlying_type, Location loc)
+ byte [] MakeByteBlob ()
{
int factor;
byte [] data;
data = new byte [(count * factor + 4) & ~3];
int idx = 0;
-
+
for (int i = 0; i < count; ++i) {
object v = array_data [i];
FieldBuilder fb;
ILGenerator ig = ec.ig;
- byte [] data = MakeByteBlob (array_data, underlying_type, loc);
+ byte [] data = MakeByteBlob ();
fb = RootContext.MakeStaticData (data);
ILGenerator ig = ec.ig;
int dims = bounds.Count;
int [] current_pos = new int [dims];
- int top = array_data.Count;
MethodInfo set = null;
if (dims != 1){
- Type [] args;
- ModuleBuilder mb = null;
- mb = CodeGen.Module.Builder;
- args = new Type [dims + 1];
+ Type [] args = new Type [dims + 1];
- int j;
- for (j = 0; j < dims; j++)
+ for (int j = 0; j < dims; j++)
args [j] = TypeManager.int32_type;
-
- args [j] = array_element_type;
+ args [dims] = array_element_type;
- set = mb.GetArrayMethod (
+ set = CodeGen.Module.Builder.GetArrayMethod (
type, "Set",
CallingConventions.HasThis | CallingConventions.Standard,
TypeManager.void_type, args);
}
-
- for (int i = 0; i < top; i++){
- Expression e = null;
+ for (int i = 0; i < array_data.Count; i++){
- if (array_data [i] is Expression)
- e = (Expression) array_data [i];
+ Expression e = (Expression)array_data [i];
if (e != null) {
- //
- // Basically we do this for string literals and
- // other non-literal expressions
- //
- if (e is EnumConstant){
- e = ((EnumConstant) e).Child;
- }
-
- if (e is StringConstant || e is DecimalConstant || !(e is Constant) ||
- num_automatic_initializers <= max_automatic_initializers) {
- Type etype = e.Type;
+ Type etype = e.Type;
- ig.Emit (OpCodes.Dup);
+ ig.Emit (OpCodes.Dup);
- for (int idx = 0; idx < dims; idx++)
- IntConstant.EmitInt (ig, current_pos [idx]);
+ for (int idx = 0; idx < dims; idx++)
+ IntConstant.EmitInt (ig, current_pos [idx]);
- //
- // If we are dealing with a struct, get the
- // address of it, so we can store it.
- //
- if ((dims == 1) &&
- TypeManager.IsValueType (etype) &&
- (!TypeManager.IsBuiltinOrEnum (etype) ||
- etype == TypeManager.decimal_type)) {
- if (e is New){
- New n = (New) e;
-
- //
- // Let new know that we are providing
- // the address where to store the results
- //
- n.DisableTemporaryValueType ();
- }
+ //
+ // If we are dealing with a struct, get the
+ // address of it, so we can store it.
+ //
+ if ((dims == 1) &&
+ TypeManager.IsValueType (etype) &&
+ (!TypeManager.IsBuiltinOrEnum (etype) ||
+ etype == TypeManager.decimal_type)) {
+ if (e is New){
+ New n = (New) e;
- ig.Emit (OpCodes.Ldelema, etype);
+ //
+ // Let new know that we are providing
+ // the address where to store the results
+ //
+ n.DisableTemporaryValueType ();
}
- e.Emit (ec);
+ ig.Emit (OpCodes.Ldelema, etype);
+ }
- if (dims == 1) {
- bool is_stobj;
- OpCode op = ArrayAccess.GetStoreOpcode (etype, out is_stobj);
- if (is_stobj)
- ig.Emit (OpCodes.Stobj, etype);
- else
- ig.Emit (op);
- } else
- ig.Emit (OpCodes.Call, set);
+ e.Emit (ec);
+
+ if (dims == 1) {
+ bool is_stobj;
+ OpCode op = ArrayAccess.GetStoreOpcode (etype, out is_stobj);
+ if (is_stobj)
+ ig.Emit (OpCodes.Stobj, etype);
+ else
+ ig.Emit (op);
+ } else
+ ig.Emit (OpCodes.Call, set);
- }
}
//
ig.Emit (OpCodes.Newobj, (MethodInfo) new_method);
}
- if (initializers != null){
- //
- // FIXME: Set this variable correctly.
- //
- bool dynamic_initializers = true;
+ if (initializers == null)
+ return;
- // This will never be true for array types that cannot be statically
- // initialized. num_automatic_initializers will always be zero. See
- // CheckIndices.
- if (num_automatic_initializers > max_automatic_initializers)
- EmitStaticInitializers (ec);
-
- if (dynamic_initializers)
- EmitDynamicInitializers (ec);
+ // This is a treshold for static initializers
+ // I tried to make more accurate but it seems to me that Array.Initialize is
+ // always slower (managed -> unmanaged switch?)
+ const int max_automatic_initializers = 200;
+
+ if (const_initializers_count > max_automatic_initializers && TypeManager.IsPrimitiveType (array_element_type)) {
+ EmitStaticInitializers (ec);
+ return;
}
+
+ EmitDynamicInitializers (ec);
}
- public object EncodeAsAttribute ()
+ public override bool GetAttributableValue (Type valueType, out object value)
{
if (!is_one_dimensional){
- Report.Error (-211, Location, "attribute can not encode multi-dimensional arrays");
- return null;
+// Report.Error (-211, Location, "attribute can not encode multi-dimensional arrays");
+ return base.GetAttributableValue (null, out value);
}
- if (array_data == null){
- Report.Error (-212, Location, "array should be initialized when passing it to an attribute");
- return null;
+ if (array_data == null) {
+ Constant c = (Constant)((Argument)arguments [0]).Expr;
+ if (c.IsDefaultValue) {
+ value = Array.CreateInstance (array_element_type, 0);
+ return true;
+ }
+// Report.Error (-212, Location, "array should be initialized when passing it to an attribute");
+ return base.GetAttributableValue (null, out value);
}
- object [] ret = new object [array_data.Count];
- int i = 0;
- foreach (Expression e in array_data){
- object v;
-
- if (e is NullLiteral)
- v = null;
- else {
- if (!Attribute.GetAttributeArgumentExpression (e, Location, array_element_type, out v))
- return null;
+ Array ret = Array.CreateInstance (array_element_type, array_data.Count);
+ object element_value;
+ for (int i = 0; i < ret.Length; ++i)
+ {
+ Expression e = (Expression)array_data [i];
+ if (e == null) // Is null when initializer is optimized away
+ e = (Expression)initializers [i];
+
+ if (!e.GetAttributableValue (array_element_type, out element_value)) {
+ value = null;
+ return false;
}
- ret [i++] = v;
+ ret.SetValue (element_value, i);
}
- return ret;
+ value = ret;
+ return true;
+ }
+ }
+
+ public sealed class CompilerGeneratedThis : This
+ {
+ public static This Instance = new CompilerGeneratedThis ();
+
+ private CompilerGeneratedThis ()
+ : base (Location.Null)
+ {
+ }
+
+ public override Expression DoResolve (EmitContext ec)
+ {
+ eclass = ExprClass.Variable;
+ type = ec.ContainerType;
+ return this;
}
}
ILGenerator ig = ec.ig;
if (ec.TypeContainer is Struct){
- ec.EmitThis ();
+ ec.EmitThis (false);
source.Emit (ec);
- if (leave_copy)
+
+ LocalTemporary t = null;
+ if (leave_copy) {
+ t = new LocalTemporary (type);
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 ();
+ ec.EmitThis (false);
if (ec.TypeContainer is Struct)
ig.Emit (OpCodes.Ldobj, type);
}
public void AddressOf (EmitContext ec, AddressOp mode)
{
- ec.EmitThis ();
+ ec.EmitThis (true);
// FIMXE
// FIGURE OUT WHY LDARG_S does not work
this.loc = loc;
}
- public bool ResolveBase (EmitContext ec)
+ public override Expression DoResolve (EmitContext ec)
{
eclass = ExprClass.Variable;
type = TypeManager.runtime_argument_handle_type;
- return true;
- }
-
- public override Expression DoResolve (EmitContext ec)
- {
- if (!ResolveBase (ec))
- return null;
- if (ec.IsFieldInitializer || !ec.CurrentBlock.Toplevel.HasVarargs) {
+ if (ec.IsFieldInitializer || !ec.CurrentBlock.Toplevel.HasVarargs)
+ {
Error (190, "The __arglist construct is valid only within " +
"a variable argument method.");
return null;
/// Implements the typeof operator
/// </summary>
public class TypeOf : Expression {
- public Expression QueriedType;
+ readonly Expression QueriedType;
protected Type typearg;
public TypeOf (Expression queried_type, Location l)
if (texpr == null)
return null;
- typearg = texpr.ResolveType (ec);
+ typearg = texpr.Type;
if (typearg == TypeManager.void_type) {
Error (673, "System.Void cannot be used from C#. Use typeof (void) to get the void type object");
ec.ig.Emit (OpCodes.Call, TypeManager.system_type_get_type_from_handle);
}
- public Type TypeArg {
- get { return typearg; }
+ public override bool GetAttributableValue (Type valueType, out object value)
+ {
+ if (valueType == TypeManager.object_type) {
+ value = (object)typearg;
+ return true;
+ }
+ value = typearg;
+ return true;
}
}
if (texpr == null)
return null;
- type_queried = texpr.ResolveType (ec);
+ type_queried = texpr.Type;
int size_of = GetTypeSize (type_queried);
if (size_of > 0) {
loc = l;
}
- public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
+ public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
{
if (alias == "global")
- return new MemberAccess (RootNamespace.Global, identifier, loc).ResolveAsTypeStep (ec, silent);
+ return new MemberAccess (RootNamespace.Global, identifier).ResolveAsTypeStep (ec, silent);
int errors = Report.Errors;
- FullNamedExpression fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
+ FullNamedExpression fne = ec.DeclContainer.NamespaceEntry.LookupAlias (alias);
if (fne == null) {
if (errors == Report.Errors)
Report.Error (432, loc, "Alias `{0}' not found", alias);
Report.Error (431, loc, "`{0}' cannot be used with '::' since it denotes a type", alias);
return null;
}
- return new MemberAccess (fne, identifier, loc).ResolveAsTypeStep (ec, silent);
+ return new MemberAccess (fne, identifier).ResolveAsTypeStep (ec, silent);
}
public override Expression DoResolve (EmitContext ec)
fne = RootNamespace.Global;
} else {
int errors = Report.Errors;
- fne = ec.DeclSpace.NamespaceEntry.LookupAlias (alias);
+ fne = ec.DeclContainer.NamespaceEntry.LookupAlias (alias);
if (fne == null) {
if (errors == Report.Errors)
Report.Error (432, loc, "Alias `{0}' not found", alias);
}
}
- Expression retval = new MemberAccess (fne, identifier, loc).DoResolve (ec);
+ Expression retval = new MemberAccess (fne, identifier).DoResolve (ec);
if (retval == null)
return null;
public readonly string Identifier;
Expression expr;
- // TODO: Location can be removed
- public MemberAccess (Expression expr, string id, Location l)
+ public MemberAccess (Expression expr, string id)
{
this.expr = expr;
Identifier = id;
if (new_expr is Namespace) {
Namespace ns = (Namespace) new_expr;
- FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
+ FullNamedExpression retval = ns.Lookup (ec.DeclContainer, Identifier, loc);
if (retval == null)
Report.Error (234, loc, "The type or namespace name `{0}' does not exist in the namespace `{1}'. Are you missing an assembly reference?",
Identifier, ns.FullName);
Error (23, "The `.' operator can not be applied to pointer operands (" +
TypeManager.CSharpName (expr_type) + ")");
return null;
+ } else if (expr_type == TypeManager.void_type) {
+ Error (23, "The `.' operator can not be applied to operands of type 'void'");
+ return null;
+ } else if (expr_type == TypeManager.anonymous_method_type){
+ Error (23, "The `.' operator can not be applied to anonymous methods");
}
+
Expression member_lookup;
member_lookup = MemberLookupFinal (ec, expr_type, expr_type, Identifier, loc);
return DoResolve (ec, right_side);
}
- public override FullNamedExpression ResolveAsTypeStep (EmitContext ec, bool silent)
+ public override FullNamedExpression ResolveAsTypeStep (IResolveContext ec, bool silent)
{
return ResolveNamespaceOrType (ec, silent);
}
- public FullNamedExpression ResolveNamespaceOrType (EmitContext ec, bool silent)
+ public FullNamedExpression ResolveNamespaceOrType (IResolveContext rc, bool silent)
{
- FullNamedExpression new_expr = expr.ResolveAsTypeStep (ec, silent);
+ FullNamedExpression new_expr = expr.ResolveAsTypeStep (rc, silent);
if (new_expr == null)
return null;
if (new_expr is Namespace) {
Namespace ns = (Namespace) new_expr;
- FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
+ FullNamedExpression retval = ns.Lookup (rc.DeclContainer, Identifier, loc);
if (!silent && retval == null)
Report.Error (234, loc, "The type or namespace name `{0}' does not exist in the namespace `{1}'. Are you missing an assembly reference?",
Identifier, ns.FullName);
return null;
}
- Expression member_lookup = MemberLookup (ec, expr_type, expr_type, Identifier, loc);
+ Expression member_lookup = MemberLookup (rc.DeclContainer.TypeBuilder, expr_type, expr_type, Identifier, loc);
if (member_lookup == null) {
int errors = Report.Errors;
- MemberLookupFailed (ec, expr_type, expr_type, Identifier, null, false, loc);
+ MemberLookupFailed (rc.DeclContainer.TypeBuilder, expr_type, expr_type, Identifier, null, false, loc);
if (!silent && errors == Report.Errors) {
Report.Error (426, loc, "The nested type `{0}' does not exist in the type `{1}'",
}
if (!(member_lookup is TypeExpr)) {
- new_expr.Error_UnexpectedKind (ec, "type", loc);
+ new_expr.Error_UnexpectedKind (rc.DeclContainer, "type", loc);
return null;
}
- member_lookup = member_lookup.Resolve (ec, ResolveFlags.Type);
- return (member_lookup as TypeExpr);
+ return member_lookup.ResolveAsTypeTerminal (rc, silent);
}
public override void Emit (EmitContext ec)
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, this.type);
+ temp = new LocalTemporary (this.type);
temp.Store (ec);
}
}
source.Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, this.type);
+ temp = new LocalTemporary (this.type);
temp.Store (ec);
}
StoreFromPtr (ec.ig, t);
source.Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, this.type);
+ temp = new LocalTemporary (this.type);
temp.Store (ec);
}
source.Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, this.type);
+ temp = new LocalTemporary (this.type);
temp.Store (ec);
}
BindingFlags.DeclaredOnly, p_name, null);
}
- static public Indexers GetIndexersForType (Type caller_type, Type lookup_type, Location loc)
+ static public Indexers GetIndexersForType (Type caller_type, Type lookup_type)
{
Indexers ix = empty;
bool found_any = false, found_any_getters = false;
Type lookup_type = indexer_type;
- Indexers ilist = Indexers.GetIndexersForType (current_type, lookup_type, loc);
+ Indexers ilist = Indexers.GetIndexersForType (current_type, lookup_type);
if (ilist.Properties != null) {
found_any = true;
foreach (Indexers.Indexer ix in ilist.Properties) {
return null;
}
- instance_expr.CheckMarshallByRefAccess (ec.ContainerType);
+ instance_expr.CheckMarshalByRefAccess ();
eclass = ExprClass.IndexerAccess;
return this;
public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
+ if (right_side == EmptyExpression.OutAccess) {
+ Report.Error (206, loc, "A property or indexer `{0}' may not be passed as an out or ref parameter",
+ GetSignatureForError ());
+ return null;
+ }
+
+ // if the indexer returns a value type, and we try to set a field in it
+ if (right_side == EmptyExpression.LValueMemberAccess || right_side == EmptyExpression.LValueMemberOutAccess) {
+ Report.Error (1612, loc, "Cannot modify the return value of `{0}' because it is not a variable",
+ GetSignatureForError ());
+ return null;
+ }
+
ArrayList AllSetters = new ArrayList();
if (!CommonResolve (ec))
return null;
bool found_any = false, found_any_setters = false;
- Indexers ilist = Indexers.GetIndexersForType (current_type, indexer_type, loc);
+ Indexers ilist = Indexers.GetIndexersForType (current_type, indexer_type);
if (ilist.Properties != null) {
found_any = true;
foreach (Indexers.Indexer ix in ilist.Properties) {
}
}
- instance_expr.CheckMarshallByRefAccess (ec.ContainerType);
+ instance_expr.CheckMarshalByRefAccess ();
eclass = ExprClass.IndexerAccess;
return this;
Invocation.EmitCall (ec, is_base_indexer, false, instance_expr, get, arguments, loc, prepared, false);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, Type);
+ temp = new LocalTemporary (Type);
temp.Store (ec);
}
}
source.Emit (ec);
if (leave_copy) {
ec.ig.Emit (OpCodes.Dup);
- temp = new LocalTemporary (ec, Type);
+ temp = new LocalTemporary (Type);
temp.Store (ec);
}
} else if (leave_copy) {
- temp = new LocalTemporary (ec, Type);
+ temp = new LocalTemporary (Type);
source.Emit (ec);
temp.Store (ec);
a.Expr = temp;
{
Emit (ec, false);
}
+
+ public override string GetSignatureForError ()
+ {
+ // FIXME: print the argument list of the indexer
+ return instance_expr.GetSignatureForError () + ".this[...]";
+ }
}
/// <summary>
return null;
}
- member_lookup = MemberLookup (ec, ec.ContainerType, null, base_type, member,
+ member_lookup = MemberLookup (ec.ContainerType, null, base_type, member,
AllMemberTypes, AllBindingFlags, loc);
if (member_lookup == null) {
- MemberLookupFailed (ec, base_type, base_type, member, null, true, loc);
+ MemberLookupFailed (ec.ContainerType, base_type, base_type, member, null, true, loc);
return null;
}
public class EmptyExpression : Expression {
public static readonly EmptyExpression Null = new EmptyExpression ();
+ public static readonly EmptyExpression OutAccess = new EmptyExpression ();
+ public static readonly EmptyExpression LValueMemberAccess = new EmptyExpression ();
+ public static readonly EmptyExpression LValueMemberOutAccess = new EmptyExpression ();
+
static EmptyExpression temp = new EmptyExpression ();
public static EmptyExpression Grab ()
{
loc = l;
}
- public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
+ protected override TypeExpr DoResolveAsTypeStep (IResolveContext ec)
{
TypeExpr lexpr = left.ResolveAsTypeTerminal (ec, false);
if (lexpr == null)
return null;
- bool old = ec.TestObsoleteMethodUsage;
- ec.TestObsoleteMethodUsage = false;
- Type ltype = lexpr.ResolveType (ec);
- ec.TestObsoleteMethodUsage = old;
-
+ Type ltype = lexpr.Type;
if ((ltype == TypeManager.void_type) && (dim != "*")) {
Report.Error (1547, Location,
"Keyword 'void' cannot be used in this context");
throw new InternalErrorException ("Couldn't create computed type " + ltype + dim);
}
- if (!ec.InUnsafe && type.IsPointer){
+ if (type.IsPointer && !ec.IsInUnsafeScope){
UnsafeError (loc);
return null;
}
if (texpr == null)
return null;
- otype = texpr.ResolveType (ec);
+ otype = texpr.Type;
if (!TypeManager.VerifyUnManaged (otype, loc))
return null;