Nothing,
}
+ /// <remarks>
+ /// This is used to tell Resolve in which types of expressions we're
+ /// interested.
+ /// </remarks>
+ [Flags]
+ public enum ResolveFlags {
+ // Returns Value, Variable, PropertyAccess, EventAccess or IndexerAccess.
+ VariableOrValue = 1,
+
+ // Returns a type expression.
+ Type = 2,
+
+ // Returns a method group.
+ MethodGroup = 4,
+
+ // Allows SimpleNames to be returned.
+ // This is used by MemberAccess to construct long names that can not be
+ // partially resolved (namespace-qualified names for example).
+ SimpleName = 8,
+
+ // Mask of all the expression class flags.
+ MaskExprClass = 15,
+
+ // Disable control flow analysis while resolving the expression.
+ // This is used when resolving the instance expression of a field expression.
+ DisableFlowAnalysis = 16
+ }
+
//
// This is just as a hint to AddressOf of what will be done with the
// address.
void AddressOf (EmitContext ec, AddressOp mode);
}
+ /// <summary>
+ /// This interface is implemented by variables
+ /// </summary>
+ public interface IVariable {
+ /// <summary>
+ /// Checks whether the variable has already been assigned at
+ /// the current position of the method's control flow and
+ /// reports an appropriate error message if not.
+ ///
+ /// If the variable is a struct, then this call checks whether
+ /// all of its fields (including all private ones) have been
+ /// assigned.
+ /// </summary>
+ bool IsAssigned (EmitContext ec, Location loc);
+
+ /// <summary>
+ /// Checks whether field `name' in this struct has been assigned.
+ /// </summary>
+ bool IsFieldAssigned (EmitContext ec, string name, Location loc);
+
+ /// <summary>
+ /// Tells the flow analysis code that the variable has already
+ /// been assigned at the current code position.
+ ///
+ /// If the variable is a struct, this call marks all its fields
+ /// (including private fields) as being assigned.
+ /// </summary>
+ void SetAssigned (EmitContext ec);
+
+ /// <summary>
+ /// Tells the flow analysis code that field `name' in this struct
+ /// has already been assigned atthe current code position.
+ /// </summary>
+ void SetFieldAssigned (EmitContext ec, string name);
+ }
+
+ /// <summary>
+ /// This interface denotes an expression which evaluates to a member
+ /// of a struct or a class.
+ /// </summary>
+ public interface IMemberExpr
+ {
+ /// <summary>
+ /// The name of this member.
+ /// </summary>
+ string Name {
+ get;
+ }
+
+ /// <summary>
+ /// Whether this is an instance member.
+ /// </summary>
+ bool IsInstance {
+ get;
+ }
+
+ /// <summary>
+ /// Whether this is a static member.
+ /// </summary>
+ bool IsStatic {
+ get;
+ }
+
+ /// <summary>
+ /// The type which declares this member.
+ /// </summary>
+ Type DeclaringType {
+ get;
+ }
+
+ /// <summary>
+ /// The instance expression associated with this member, if it's a
+ /// non-static member.
+ /// </summary>
+ Expression InstanceExpression {
+ get; set;
+ }
+ }
+
+ /// <summary>
+ /// Expression which resolves to a type.
+ /// </summary>
+ public interface ITypeExpression
+ {
+ /// <summary>
+ /// Resolve the expression, but only lookup types.
+ /// </summary>
+ Expression DoResolveType (EmitContext ec);
+ }
+
/// <remarks>
/// Base class for expressions
/// </remarks>
/// </summary>
public void Error (int error, string s)
{
- if (Location.IsNull (loc))
+ if (!Location.IsNull (loc))
Report.Error (error, loc, s);
else
Report.Error (error, s);
/// <summary>
/// Utility wrapper routine for Warning, just to beautify the code
/// </summary>
- protected void Warning (int warning, string s)
+ public void Warning (int warning, string s)
{
- if (Location.IsNull (loc))
+ if (!Location.IsNull (loc))
Report.Warning (warning, loc, s);
else
Report.Warning (warning, s);
}
- protected void Warning (int warning, int level, string s)
+ /// <summary>
+ /// Utility wrapper routine for Warning, only prints the warning if
+ /// warnings of level `level' are enabled.
+ /// </summary>
+ public void Warning (int warning, int level, string s)
{
if (level <= RootContext.WarningLevel)
Warning (warning, s);
/// Currently Resolve wraps DoResolve to perform sanity
/// checking and assertion checking on what we expect from Resolve.
/// </remarks>
- public Expression Resolve (EmitContext ec)
+ public Expression Resolve (EmitContext ec, ResolveFlags flags)
{
- Expression e = DoResolve (ec);
+ // Are we doing a types-only search ?
+ if ((flags & ResolveFlags.MaskExprClass) == ResolveFlags.Type) {
+ ITypeExpression type_expr = this as ITypeExpression;
- if (e != null){
-
- if (e is SimpleName){
- SimpleName s = (SimpleName) e;
-
- Report.Error (
- 103, loc,
- "The name `" + s.Name + "' could not be found in `" +
- ec.DeclSpace.Name + "'");
+ if (type_expr == null)
return null;
- }
-
- if (e.eclass == ExprClass.Invalid)
- throw new Exception ("Expression " + e.GetType () +
- " ExprClass is Invalid after resolve");
- if (e.eclass != ExprClass.MethodGroup)
- if (e.type == null)
- throw new Exception (
- "Expression " + e.GetType () +
- " did not set its type after Resolve\n" +
- "called from: " + this.GetType ());
+ return type_expr.DoResolveType (ec);
}
- return e;
- }
+ bool old_do_flow_analysis = ec.DoFlowAnalysis;
+ if ((flags & ResolveFlags.DisableFlowAnalysis) != 0)
+ ec.DoFlowAnalysis = false;
- /// <summary>
- /// Performs expression resolution and semantic analysis, but
- /// allows SimpleNames to be returned.
- /// </summary>
- ///
- /// <remarks>
- /// This is used by MemberAccess to construct long names that can not be
- /// partially resolved (namespace-qualified names for example).
- /// </remarks>
- public Expression ResolveWithSimpleName (EmitContext ec)
- {
Expression e;
-
if (this is SimpleName)
e = ((SimpleName) this).DoResolveAllowStatic (ec);
else
e = DoResolve (ec);
- if (e != null){
- if (e is SimpleName)
- return e;
+ ec.DoFlowAnalysis = old_do_flow_analysis;
- if (e.eclass == ExprClass.Invalid)
- throw new Exception ("Expression " + e +
- " ExprClass is Invalid after resolve");
+ if (e == null)
+ return null;
+
+ if (e is SimpleName){
+ SimpleName s = (SimpleName) e;
+
+ if ((flags & ResolveFlags.SimpleName) == 0) {
+
+ object lookup = TypeManager.MemberLookup (
+ ec.ContainerType, ec.ContainerType, AllMemberTypes,
+ AllBindingFlags | BindingFlags.NonPublic, s.Name);
+ if (lookup != null)
+ Error (122, "`" + s.Name + "' " +
+ "is inaccessible because of its protection level");
+ else
+ Error (103, "The name `" + s.Name + "' could not be " +
+ "found in `" + ec.DeclSpace.Name + "'");
+ return null;
+ }
- if (e.eclass != ExprClass.MethodGroup)
- if (e.type == null)
- throw new Exception ("Expression " + e +
- " did not set its type after Resolve");
+ return s;
}
+ if ((e is TypeExpr) || (e is ComposedCast)) {
+ if ((flags & ResolveFlags.Type) == 0) {
+ e.Error118 (flags);
+ return null;
+ }
+
+ return e;
+ }
+
+ switch (e.eclass) {
+ case ExprClass.Type:
+ if ((flags & ResolveFlags.VariableOrValue) == 0) {
+ e.Error118 (flags);
+ return null;
+ }
+ break;
+
+ case ExprClass.MethodGroup:
+ if ((flags & ResolveFlags.MethodGroup) == 0) {
+ ((MethodGroupExpr) e).ReportUsageError ();
+ return null;
+ }
+ break;
+
+ case ExprClass.Value:
+ case ExprClass.Variable:
+ case ExprClass.PropertyAccess:
+ case ExprClass.EventAccess:
+ case ExprClass.IndexerAccess:
+ if ((flags & ResolveFlags.VariableOrValue) == 0) {
+ e.Error118 (flags);
+ return null;
+ }
+ break;
+
+ default:
+ throw new Exception ("Expression " + e.GetType () +
+ " ExprClass is Invalid after resolve");
+ }
+
+ if (e.type == null)
+ throw new Exception (
+ "Expression " + e.GetType () +
+ " did not set its type after Resolve\n" +
+ "called from: " + this.GetType ());
+
return e;
}
-
+
+ /// <summary>
+ /// Resolves an expression and performs semantic analysis on it.
+ /// </summary>
+ public Expression Resolve (EmitContext ec)
+ {
+ return Resolve (ec, ResolveFlags.VariableOrValue);
+ }
+
/// <summary>
/// Resolves an expression for LValue assignment
/// </summary>
throw new Exception ("Expression " + e +
" ExprClass is Invalid after resolve");
- if (e.eclass != ExprClass.MethodGroup)
- if (e.type == null)
- throw new Exception ("Expression " + e +
- " did not set its type after Resolve");
+ if (e.eclass == ExprClass.MethodGroup) {
+ ((MethodGroupExpr) e).ReportUsageError ();
+ return null;
+ }
+
+ if (e.type == null)
+ throw new Exception ("Expression " + e +
+ " did not set its type after Resolve");
}
return e;
public static Expression MemberLookup (EmitContext ec, Type t, string name,
MemberTypes mt, BindingFlags bf, Location loc)
{
- MemberInfo [] mi = TypeManager.MemberLookup (ec.ContainerType, t, mt, bf, name);
+ return MemberLookup (ec, ec.ContainerType, t, name, mt, bf, loc);
+ }
+
+ //
+ // Lookup type `t' for code in class `invocation_type'. Note that it's important
+ // to set `invocation_type' correctly since this method also checks whether the
+ // invoking class is allowed to access the member in class `t'. When you want to
+ // explicitly do a lookup in the base class, you must set both `t' and `invocation_type'
+ // to the base class (although a derived class can access protected members of its base
+ // class it cannot do so through an instance of the base class (error CS1540)).
+ //
+
+ public static Expression MemberLookup (EmitContext ec, Type invocation_type, Type t,
+ string name, MemberTypes mt, BindingFlags bf,
+ Location loc)
+ {
+ MemberInfo [] mi = TypeManager.MemberLookup (invocation_type, t, mt, bf, name);
if (mi == null)
return null;
public static Expression MemberLookup (EmitContext ec, Type t, string name, Location loc)
{
- return MemberLookup (ec, t, name, AllMemberTypes, AllBindingFlags, loc);
+ return MemberLookup (ec, ec.ContainerType, t, name,
+ AllMemberTypes, AllBindingFlags, loc);
}
public static Expression MethodLookup (EmitContext ec, Type t, string name, Location loc)
{
- return MemberLookup (ec, t, name, MemberTypes.Method, AllBindingFlags, loc);
+ return MemberLookup (ec, ec.ContainerType, t, name,
+ MemberTypes.Method, AllBindingFlags, loc);
}
/// <summary>
int errors = Report.Errors;
- e = MemberLookup (ec, t, name, mt, bf, loc);
+ e = MemberLookup (ec, ec.ContainerType, t, name, mt, bf, loc);
if (e != null)
return e;
expr.Emit (null);
}
-
- if (target_type == TypeManager.object_type) {
+
+ //
+ // notice that it is possible to write "ValueType v = 1", the ValueType here
+ // is an abstract class, and not really a value type, so we apply the same rules.
+ //
+ if (target_type == TypeManager.object_type || target_type == TypeManager.value_type) {
//
// A pointer type cannot be converted to object
//
return new BoxedCast (expr);
if (expr_type.IsClass || expr_type.IsInterface)
return new EmptyCast (expr, target_type);
- } else if (expr_type.IsSubclassOf (target_type)) {
+ } else if (expr_type.IsSubclassOf (target_type))
return new EmptyCast (expr, target_type);
- } else {
+ else {
// This code is kind of mirrored inside StandardConversionExists
// with the small distinction that we only probe there
return new EmptyCast (expr, target_type);
// from any class-type S to any interface-type T.
- if (expr_type.IsClass && target_type.IsInterface) {
- if (TypeManager.ImplementsInterface (expr_type, target_type))
- return new EmptyCast (expr, target_type);
- else
- return null;
+ if (target_type.IsInterface) {
+ if (TypeManager.ImplementsInterface (expr_type, target_type)){
+ if (expr_type.IsClass)
+ return new EmptyCast (expr, target_type);
+ else if (expr_type.IsValueType)
+ return new BoxedCast (expr);
+ }
}
// from any interface type S to interface-type T.
if (expr_type.IsInterface && target_type.IsInterface) {
-
if (TypeManager.ImplementsInterface (expr_type, target_type))
return new EmptyCast (expr, target_type);
else
return null;
}
- /// <summary>
- /// Handles expressions like this: decimal d; d = 1;
- /// and changes them into: decimal d; d = new System.Decimal (1);
- /// </summary>
- static Expression InternalTypeConstructor (EmitContext ec, Expression expr, Type target)
- {
- ArrayList args = new ArrayList ();
-
- args.Add (new Argument (expr, Argument.AType.Expression));
-
- Expression ne = new New (new TypeExpr (target, Location.Null), args, Location.Null);
-
- return ne.Resolve (ec);
- }
-
/// <summary>
/// Implicit Numeric Conversions.
///
return new ULongConstant ((ulong) v);
}
- //
- // If we have an enumeration, extract the underlying type,
- // use this during the comparission, but wrap around the original
- // target_type
- //
- Type real_target_type = target_type;
-
- if (TypeManager.IsEnumType (real_target_type))
- real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+ Type real_target_type = target_type;
- if (expr_type == real_target_type)
- return new EmptyCast (expr, target_type);
-
if (expr_type == TypeManager.sbyte_type){
//
// From sbyte to short, int, long, float, double.
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
if (real_target_type == TypeManager.short_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.byte_type){
//
// From byte to short, ushort, int, uint, long, ulong, float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
if (real_target_type == TypeManager.double_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.short_type){
//
// From short to int, long, float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.ushort_type){
//
// From ushort to int, uint, long, ulong, float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.int32_type){
//
// From int to long, float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.uint32_type){
//
// From uint to long, ulong, float, double
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.int64_type){
//
// From long/ulong to float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.uint64_type){
//
// From ulong to float, double
if (real_target_type == TypeManager.float_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
OpCodes.Conv_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.char_type){
//
// From char to ushort, int, uint, long, ulong, float, double
return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
if (real_target_type == TypeManager.double_type)
return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.float_type){
//
// float to double
// from ImplicitReferenceConversion so make sure code remains in sync
// from any class-type S to any interface-type T.
- if (expr_type.IsClass && target_type.IsInterface) {
+ if (target_type.IsInterface) {
if (TypeManager.ImplementsInterface (expr_type, target_type))
return true;
}
return false;
}
-
+
/// <summary>
/// Determines if a standard implicit conversion exists from
/// expr_type to target_type
public static bool StandardConversionExists (Expression expr, Type target_type)
{
Type expr_type = expr.Type;
+
+ if (expr_type == TypeManager.void_type)
+ return false;
if (expr_type == target_type)
return true;
if (i.Value == 0)
return true;
}
+
+ if (target_type == TypeManager.void_ptr_type && expr_type.IsPointer)
+ return true;
+
return false;
}
/// by making use of FindMostEncomp* methods. Applies the correct rules separately
/// for explicit and implicit conversion operators.
/// </summary>
- static public Type FindMostSpecificSource (MethodGroupExpr me, Type source_type,
+ static public Type FindMostSpecificSource (MethodGroupExpr me, Expression source,
bool apply_explicit_conv_rules,
Location loc)
{
if (priv_fms_expr == null)
priv_fms_expr = new EmptyExpression ();
-
+
//
// If any operator converts from S then Sx = S
//
+ Type source_type = source.Type;
foreach (MethodBase mb in me.Methods){
ParameterData pd = Invocation.GetParameterData (mb);
Type param_type = pd.ParameterType (0);
if (StandardConversionExists (priv_fms_expr, source_type))
src_types_set.Add (param_type);
else {
- priv_fms_expr.SetType (source_type);
- if (StandardConversionExists (priv_fms_expr, param_type))
+ if (StandardConversionExists (source, param_type))
src_types_set.Add (param_type);
}
} else {
//
// Only if S is encompassed by param_type
//
- priv_fms_expr.SetType (source_type);
- if (StandardConversionExists (priv_fms_expr, param_type))
+ if (StandardConversionExists (source, param_type))
src_types_set.Add (param_type);
}
}
ArrayList candidate_set = new ArrayList ();
foreach (Type param_type in src_types_set){
- priv_fms_expr.SetType (source_type);
-
- if (StandardConversionExists (priv_fms_expr, param_type))
+ if (StandardConversionExists (source, param_type))
candidate_set.Add (param_type);
}
//
if (apply_explicit_conv_rules)
return FindMostEncompassedType (tgt_types_set);
- else
+ else
return FindMostEncompassingType (tgt_types_set);
}
}
#endif
- most_specific_source = FindMostSpecificSource (union, source_type, look_for_explicit, loc);
+ most_specific_source = FindMostSpecificSource (union, source, look_for_explicit, loc);
if (most_specific_source == null)
return null;
most_specific_target = FindMostSpecificTarget (union, target, look_for_explicit, loc);
if (most_specific_target == null)
return null;
-
+
int count = 0;
foreach (MethodBase mb in union.Methods){
return new ULongConstant ((ulong) value);
}
- if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type))
- return new EnumConstant (ic, target_type);
-
+ if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type)){
+ Type underlying = TypeManager.EnumToUnderlying (target_type);
+ Constant e = (Constant) ic;
+
+ //
+ // Possibly, we need to create a different 0 literal before passing
+ // to EnumConstant
+ //n
+ if (underlying == TypeManager.int64_type)
+ e = new LongLiteral (0);
+ else if (underlying == TypeManager.uint64_type)
+ e = new ULongLiteral (0);
+
+ return new EnumConstant (e, target_type);
+ }
return null;
}
"Double literal cannot be implicitly converted to " +
"float type, use F suffix to create a float literal");
}
-
+
Error_CannotConvertImplicit (loc, source.Type, target_type);
return null;
/// <summary>
/// Performs the explicit numeric conversions
/// </summary>
- static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type)
+ static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type, Location loc)
{
Type expr_type = expr.Type;
//
// If we have an enumeration, extract the underlying type,
- // use this during the comparission, but wrap around the original
+ // use this during the comparison, but wrap around the original
// target_type
//
Type real_target_type = target_type;
if (TypeManager.IsEnumType (real_target_type))
real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+ if (StandardConversionExists (expr, real_target_type)){
+ Expression ce = ConvertImplicitStandard (ec, expr, real_target_type, loc);
+
+ if (real_target_type != target_type)
+ return new EmptyCast (ce, target_type);
+ return ce;
+ }
+
if (expr_type == TypeManager.sbyte_type){
//
// From sbyte to byte, ushort, uint, ulong, char
return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U8);
if (real_target_type == TypeManager.char_type)
return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_CH);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
} else if (expr_type == TypeManager.double_type){
//
// From double to byte, byte, short,
return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_CH);
if (real_target_type == TypeManager.float_type)
return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_R4);
- if (real_target_type == TypeManager.decimal_type)
- return InternalTypeConstructor (ec, expr, target_type);
}
// decimal is taken care of by the op_Explicit methods.
if (ne != null)
return ne;
- ne = ConvertNumericExplicit (ec, expr, target_type);
+ ne = ConvertNumericExplicit (ec, expr, target_type, loc);
if (ne != null)
return ne;
if (t != null)
return t;
- return ConvertNumericExplicit (ec, e, target_type);
+ t = ConvertNumericExplicit (ec, e, target_type, loc);
+ if (t != null)
+ return t;
+
+ Error_CannotConvertType (loc, expr_type, target_type);
+ return null;
}
ne = ConvertReferenceExplicit (expr, target_type);
if (ci != null)
return ci;
- ce = ConvertNumericExplicit (ec, e, target_type);
+ ce = ConvertNumericExplicit (ec, e, target_type, loc);
if (ce != null)
return ce;
//
if (ne != null)
return ne;
- ne = ConvertNumericExplicit (ec, expr, target_type);
+ ne = ConvertNumericExplicit (ec, expr, target_type, l);
if (ne != null)
return ne;
"' where a `" + expected + "' was expected");
}
+ public void Error118 (ResolveFlags flags)
+ {
+ ArrayList valid = new ArrayList (10);
+
+ if ((flags & ResolveFlags.VariableOrValue) != 0) {
+ valid.Add ("variable");
+ valid.Add ("value");
+ }
+
+ if ((flags & ResolveFlags.Type) != 0)
+ valid.Add ("type");
+
+ if ((flags & ResolveFlags.MethodGroup) != 0)
+ valid.Add ("method group");
+
+ if ((flags & ResolveFlags.SimpleName) != 0)
+ valid.Add ("simple name");
+
+ if (valid.Count == 0)
+ valid.Add ("unknown");
+
+ StringBuilder sb = new StringBuilder ();
+ for (int i = 0; i < valid.Count; i++) {
+ if (i > 0)
+ sb.Append (", ");
+ else if (i == valid.Count)
+ sb.Append (" or ");
+ sb.Append (valid [i]);
+ }
+
+ string kind = ExprClassName (eclass);
+
+ Error (119, "Expression denotes a `" + kind + "' where " +
+ "a `" + sb.ToString () + "' was expected");
+ }
+
static void Error_ConstantValueCannotBeConverted (Location l, string val, Type t)
{
Report.Error (31, l, "Constant value `" + val + "' cannot be converted to " +
//
public static void StoreFromPtr (ILGenerator ig, Type type)
{
- if (type.IsEnum)
+ if (TypeManager.IsEnumType (type))
type = TypeManager.EnumToUnderlying (type);
if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
ig.Emit (OpCodes.Stind_I4);
t == TypeManager.char_type ||
t == TypeManager.ushort_type)
return 2;
+ else if (t == TypeManager.decimal_type)
+ return 16;
else
return 0;
}
/// The downside of this is that we might be hitting `LookupType' too many
/// times with this scheme.
/// </remarks>
- public class SimpleName : Expression {
+ public class SimpleName : Expression, ITypeExpression {
public readonly string Name;
public SimpleName (string name, Location l)
loc = l;
}
- public static void Error_ObjectRefRequired (Location l, string name)
+ public static void Error_ObjectRefRequired (EmitContext ec, Location l, string name)
{
- Report.Error (
- 120, l,
- "An object reference is required " +
- "for the non-static field `"+name+"'");
+ if (ec.IsFieldInitializer)
+ Report.Error (
+ 236, l,
+ "A field initializer cannot reference the non-static field, " +
+ "method or property `"+name+"'");
+ else
+ Report.Error (
+ 120, l,
+ "An object reference is required " +
+ "for the non-static field `"+name+"'");
}
//
// Checks whether we are trying to access an instance
// property, method or field from a static body.
//
- Expression MemberStaticCheck (Expression e)
+ Expression MemberStaticCheck (EmitContext ec, Expression e)
{
- if (e is FieldExpr){
- FieldInfo fi = ((FieldExpr) e).FieldInfo;
+ if (e is IMemberExpr){
+ IMemberExpr member = (IMemberExpr) e;
- if (!fi.IsStatic){
- Error_ObjectRefRequired (loc, Name);
- return null;
- }
- } else if (e is MethodGroupExpr){
- MethodGroupExpr mg = (MethodGroupExpr) e;
-
- if (!mg.RemoveInstanceMethods ()){
- Error_ObjectRefRequired (loc, mg.Methods [0].Name);
- return null;
- }
- return e;
- } else if (e is PropertyExpr){
- if (!((PropertyExpr) e).IsStatic){
- Error_ObjectRefRequired (loc, Name);
- return null;
- }
- } else if (e is EventExpr) {
- if (!((EventExpr) e).IsStatic) {
- Error_ObjectRefRequired (loc, Name);
+ if (!member.IsStatic){
+ Error_ObjectRefRequired (ec, loc, Name);
return null;
}
}
return SimpleNameResolve (ec, null, true);
}
+ public Expression DoResolveType (EmitContext ec)
+ {
+ //
+ // Stage 3: Lookup symbol in the various namespaces.
+ //
+ DeclSpace ds = ec.DeclSpace;
+ Type t;
+ string alias_value;
+
+ if (ec.ResolvingTypeTree){
+ int errors = Report.Errors;
+ Type dt = ec.DeclSpace.FindType (loc, Name);
+ if (Report.Errors != errors)
+ return null;
+
+ if (dt != null)
+ return new TypeExpr (dt, loc);
+ }
+
+ if ((t = RootContext.LookupType (ds, Name, true, loc)) != null)
+ return new TypeExpr (t, loc);
+
+
+ //
+ // Stage 2 part b: Lookup up if we are an alias to a type
+ // or a namespace.
+ //
+ // Since we are cheating: we only do the Alias lookup for
+ // namespaces if the name does not include any dots in it
+ //
+
+ alias_value = ec.DeclSpace.LookupAlias (Name);
+
+ if (Name.IndexOf ('.') == -1 && alias_value != null) {
+ if ((t = RootContext.LookupType (ds, alias_value, true, loc)) != null)
+ return new TypeExpr (t, loc);
+
+ // we have alias value, but it isn't Type, so try if it's namespace
+ return new SimpleName (alias_value, loc);
+ }
+
+ // No match, maybe our parent can compose us
+ // into something meaningful.
+ return this;
+ }
+
/// <remarks>
/// 7.5.2: Simple Names.
///
//
// Stage 1: Performed by the parser (binding to locals or parameters).
//
- if (!ec.OnlyLookupTypes){
- Block current_block = ec.CurrentBlock;
- if (current_block != null && current_block.IsVariableDefined (Name)){
- LocalVariableReference var;
-
- var = new LocalVariableReference (ec.CurrentBlock, Name, loc);
-
- if (right_side != null)
- return var.ResolveLValue (ec, right_side);
- else
- return var.Resolve (ec);
- }
-
- //
- // Stage 2: Lookup members
- //
-
- //
- // For enums, the TypeBuilder is not ec.DeclSpace.TypeBuilder
- // Hence we have two different cases
- //
-
- DeclSpace lookup_ds = ec.DeclSpace;
- do {
- if (lookup_ds.TypeBuilder == null)
- break;
+ Block current_block = ec.CurrentBlock;
+ if (current_block != null && current_block.IsVariableDefined (Name)){
+ LocalVariableReference var;
- e = MemberLookup (ec, lookup_ds.TypeBuilder, Name, loc);
- if (e != null)
- break;
-
- //
- // Classes/structs keep looking, enums break
- //
- if (lookup_ds is TypeContainer)
- lookup_ds = ((TypeContainer) lookup_ds).Parent;
- else
- break;
- } while (lookup_ds != null);
-
- if (e == null && ec.ContainerType != null)
- e = MemberLookup (ec, ec.ContainerType, Name, loc);
- }
+ var = new LocalVariableReference (ec.CurrentBlock, Name, loc);
- // Continuation of stage 2
- if (e == null){
- //
- // Stage 3: Lookup symbol in the various namespaces.
- //
- DeclSpace ds = ec.DeclSpace;
- Type t;
- string alias_value;
-
- if ((t = RootContext.LookupType (ds, Name, true, loc)) != null)
- return new TypeExpr (t, loc);
-
- //
- // Stage 2 part b: Lookup up if we are an alias to a type
- // or a namespace.
- //
- // Since we are cheating: we only do the Alias lookup for
- // namespaces if the name does not include any dots in it
- //
-
- alias_value = ec.DeclSpace.LookupAlias (Name);
-
- if (Name.IndexOf ('.') == -1 && alias_value != null) {
- if ((t = RootContext.LookupType (ds, alias_value, true, loc))
- != null)
- return new TypeExpr (t, loc);
-
- // we have alias value, but it isn't Type, so try if it's namespace
- return new SimpleName (alias_value, loc);
- }
-
- if (ec.ResolvingTypeTree){
- Type dt = ec.DeclSpace.FindType (Name);
- if (dt != null)
- return new TypeExpr (dt, loc);
- }
-
- // No match, maybe our parent can compose us
- // into something meaningful.
- return this;
+ if (right_side != null)
+ return var.ResolveLValue (ec, right_side);
+ else
+ return var.Resolve (ec);
}
-
- //
- // Stage 2 continues here.
- //
- if (e is TypeExpr)
- return e;
- if (ec.OnlyLookupTypes)
- return null;
-
- if (e is FieldExpr){
- FieldExpr fe = (FieldExpr) e;
- FieldInfo fi = fe.FieldInfo;
+ if (current_block != null){
+ int idx = -1;
+ Parameter par = null;
+ Parameters pars = current_block.Parameters;
+ if (pars != null)
+ par = pars.GetParameterByName (Name, out idx);
- if (fi.FieldType.IsPointer && !ec.InUnsafe){
- UnsafeError (loc);
- }
-
- if (ec.IsStatic){
- if (!allow_static && !fi.IsStatic){
- Error_ObjectRefRequired (loc, Name);
- return null;
- }
- } else {
- // If we are not in static code and this
- // field is not static, set the instance to `this'.
-
- if (!fi.IsStatic)
- fe.InstanceExpression = ec.This;
- }
-
-
- if (fi is FieldBuilder) {
- Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
+ if (par != null) {
+ ParameterReference param;
- if (c != null) {
- object o = c.LookupConstantValue (ec);
- if (o == null)
- return null;
- object real_value = ((Constant)c.Expr).GetValue ();
- return Constantify (real_value, fi.FieldType);
- }
- }
+ param = new ParameterReference (pars, idx, Name, loc);
- if (fi.IsLiteral) {
- Type t = fi.FieldType;
- Type decl_type = fi.DeclaringType;
- object o;
-
- if (fi is FieldBuilder)
- o = TypeManager.GetValue ((FieldBuilder) fi);
+ if (right_side != null)
+ return param.ResolveLValue (ec, right_side);
else
- o = fi.GetValue (fi);
-
- if (decl_type.IsSubclassOf (TypeManager.enum_type)) {
- Expression enum_member = MemberLookup (
- ec, decl_type, "value__", MemberTypes.Field,
- AllBindingFlags, loc);
-
- Enum en = TypeManager.LookupEnum (decl_type);
-
- Constant c;
- if (en != null)
- c = Constantify (o, en.UnderlyingType);
- else
- c = Constantify (o, enum_member.Type);
-
- return new EnumConstant (c, decl_type);
- }
-
- Expression exp = Constantify (o, t);
+ return param.Resolve (ec);
}
-
- return e;
}
- if (e is PropertyExpr) {
- PropertyExpr pe = (PropertyExpr) e;
-
- if (ec.IsStatic){
- if (allow_static)
- return e;
+ //
+ // Stage 2: Lookup members
+ //
- return MemberStaticCheck (e);
- } else {
- // If we are not in static code and this
- // field is not static, set the instance to `this'.
+ //
+ // For enums, the TypeBuilder is not ec.DeclSpace.TypeBuilder
+ // Hence we have two different cases
+ //
- if (!pe.IsStatic)
- pe.InstanceExpression = ec.This;
- }
+ DeclSpace lookup_ds = ec.DeclSpace;
+ do {
+ if (lookup_ds.TypeBuilder == null)
+ break;
- return e;
- }
+ e = MemberLookup (ec, lookup_ds.TypeBuilder, Name, loc);
+ if (e != null)
+ break;
- if (e is EventExpr) {
//
- // If the event is local to this class, we transform ourselves into
- // a FieldExpr
+ // Classes/structs keep looking, enums break
//
- EventExpr ee = (EventExpr) e;
+ if (lookup_ds is TypeContainer)
+ lookup_ds = ((TypeContainer) lookup_ds).Parent;
+ else
+ break;
+ } while (lookup_ds != null);
+
+ if (e == null && ec.ContainerType != null)
+ e = MemberLookup (ec, ec.ContainerType, Name, loc);
- Expression ml = MemberLookup (
- ec, ec.ContainerType, ee.EventInfo.Name,
- MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+ if (e == null)
+ return DoResolveType (ec);
- if (ml != null) {
- MemberInfo mi = GetFieldFromEvent ((EventExpr) ml);
+ if (e is TypeExpr)
+ return e;
- if (mi == null) {
- //
- // If this happens, then we have an event with its own
- // accessors and private field etc so there's no need
- // to transform ourselves : we should instead flag an error
- //
- Assign.error70 (ee.EventInfo, loc);
- return null;
- }
+ if (e is IMemberExpr) {
+ e = MemberAccess.ResolveMemberAccess (ec, e, null, loc, this);
+ if (e == null)
+ return null;
- ml = ExprClassFromMemberInfo (ec, mi, loc);
-
- if (ml == null) {
- Report.Error (-200, loc, "Internal error!!");
- return null;
- }
+ IMemberExpr me = e as IMemberExpr;
+ if (me == null)
+ return e;
- Expression instance_expr;
-
- FieldInfo fi = ((FieldExpr) ml).FieldInfo;
+ // This fails if ResolveMemberAccess() was unable to decide whether
+ // it's a field or a type of the same name.
+ if (!me.IsStatic && (me.InstanceExpression == null))
+ return e;
- if (fi.IsStatic)
- instance_expr = null;
- else {
- instance_expr = ec.This;
- instance_expr = instance_expr.Resolve (ec);
- }
-
- return MemberAccess.ResolveMemberAccess (ec, ml, instance_expr, loc, null);
+ if (!me.IsStatic &&
+ TypeManager.IsNestedChildOf (me.InstanceExpression.Type, me.DeclaringType)) {
+ Error (38, "Cannot access nonstatic member `" + me.Name + "' of " +
+ "outer type `" + me.DeclaringType + "' via nested type `" +
+ me.InstanceExpression.Type + "'");
+ return null;
}
+
+ if (right_side != null)
+ e = e.DoResolveLValue (ec, right_side);
+ else
+ e = e.DoResolve (ec);
+
+ return e;
}
-
-
- if (ec.IsStatic){
+
+ if (ec.IsStatic || ec.IsFieldInitializer){
if (allow_static)
return e;
- return MemberStaticCheck (e);
+ return MemberStaticCheck (ec, e);
} else
return e;
}
-
-
public override void Emit (EmitContext ec)
{
/// <summary>
/// Fully resolved expression that evaluates to a type
/// </summary>
- public class TypeExpr : Expression {
+ public class TypeExpr : Expression, ITypeExpression {
public TypeExpr (Type t, Location l)
{
Type = t;
loc = l;
}
+ public virtual Expression DoResolveType (EmitContext ec)
+ {
+ return this;
+ }
+
override public Expression DoResolve (EmitContext ec)
{
return this;
{
throw new Exception ("Should never be called");
}
+
+ public override string ToString ()
+ {
+ return Type.ToString ();
+ }
}
/// <summary>
/// Used to create types from a fully qualified name. These are just used
- /// by the parser to setup the core types. A TypeExpression is always
+ /// by the parser to setup the core types. A TypeLookupExpression is always
/// classified as a type.
/// </summary>
- public class TypeExpression : TypeExpr {
+ public class TypeLookupExpression : TypeExpr {
string name;
- public TypeExpression (string name) : base (null, Location.Null)
+ public TypeLookupExpression (string name) : base (null, Location.Null)
{
this.name = name;
}
- public override Expression DoResolve (EmitContext ec)
+ public override Expression DoResolveType (EmitContext ec)
{
if (type == null)
type = RootContext.LookupType (ec.DeclSpace, name, false, Location.Null);
return this;
}
+ public override Expression DoResolve (EmitContext ec)
+ {
+ return DoResolveType (ec);
+ }
+
public override void Emit (EmitContext ec)
{
- throw new Exception ("Should never be called");
+ throw new Exception ("Should never be called");
}
public override string ToString ()
///
/// This is a fully resolved expression that evaluates to a type
/// </summary>
- public class MethodGroupExpr : Expression {
+ public class MethodGroupExpr : Expression, IMemberExpr {
public MethodBase [] Methods;
Expression instance_expression = null;
+ bool is_explicit_impl = false;
public MethodGroupExpr (MemberInfo [] mi, Location l)
{
eclass = ExprClass.MethodGroup;
type = TypeManager.object_type;
}
+
+ public Type DeclaringType {
+ get {
+ return Methods [0].DeclaringType;
+ }
+ }
//
// `A method group may have associated an instance expression'
instance_expression = value;
}
}
+
+ public bool IsExplicitImpl {
+ get {
+ return is_explicit_impl;
+ }
+
+ set {
+ is_explicit_impl = value;
+ }
+ }
+
+ public string Name {
+ get {
+ return Methods [0].Name;
+ }
+ }
+
+ public bool IsInstance {
+ get {
+ foreach (MethodBase mb in Methods)
+ if (!mb.IsStatic)
+ return true;
+
+ return false;
+ }
+ }
+
+ public bool IsStatic {
+ get {
+ foreach (MethodBase mb in Methods)
+ if (mb.IsStatic)
+ return true;
+
+ return false;
+ }
+ }
override public Expression DoResolve (EmitContext ec)
{
+ if (instance_expression != null) {
+ instance_expression = instance_expression.DoResolve (ec);
+ if (instance_expression == null)
+ return null;
+ }
+
return this;
}
/// <summary>
/// Fully resolved expression that evaluates to a Field
/// </summary>
- public class FieldExpr : Expression, IAssignMethod, IMemoryLocation {
+ public class FieldExpr : Expression, IAssignMethod, IMemoryLocation, IMemberExpr {
public readonly FieldInfo FieldInfo;
- public Expression InstanceExpression;
+ Expression instance_expr;
public FieldExpr (FieldInfo fi, Location l)
{
loc = l;
}
+ public string Name {
+ get {
+ return FieldInfo.Name;
+ }
+ }
+
+ public bool IsInstance {
+ get {
+ return !FieldInfo.IsStatic;
+ }
+ }
+
+ public bool IsStatic {
+ get {
+ return FieldInfo.IsStatic;
+ }
+ }
+
+ public Type DeclaringType {
+ get {
+ return FieldInfo.DeclaringType;
+ }
+ }
+
+ public Expression InstanceExpression {
+ get {
+ return instance_expr;
+ }
+
+ set {
+ instance_expr = value;
+ }
+ }
+
override public Expression DoResolve (EmitContext ec)
{
if (!FieldInfo.IsStatic){
- if (InstanceExpression == null){
+ if (instance_expr == null){
throw new Exception ("non-static FieldExpr without instance var\n" +
"You have to assign the Instance variable\n" +
"Of the FieldExpr to set this\n");
}
- InstanceExpression = InstanceExpression.Resolve (ec);
- if (InstanceExpression == null)
+ // Resolve the field's instance expression while flow analysis is turned
+ // off: when accessing a field "a.b", we must check whether the field
+ // "a.b" is initialized, not whether the whole struct "a" is initialized.
+ instance_expr = instance_expr.Resolve (ec, ResolveFlags.VariableOrValue |
+ ResolveFlags.DisableFlowAnalysis);
+ if (instance_expr == null)
return null;
}
+ // If the instance expression is a local variable or parameter.
+ IVariable var = instance_expr as IVariable;
+ if ((var != null) && !var.IsFieldAssigned (ec, FieldInfo.Name, loc))
+ return null;
+
return this;
}
override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
+ IVariable var = instance_expr as IVariable;
+ if (var != null)
+ var.SetFieldAssigned (ec, FieldInfo.Name);
+
Expression e = DoResolve (ec);
if (e == null)
{
ILGenerator ig = ec.ig;
bool is_volatile = false;
-
+
if (FieldInfo is FieldBuilder){
FieldBase f = TypeManager.GetField (FieldInfo);
ig.Emit (OpCodes.Ldsfld, FieldInfo);
} else {
- if (InstanceExpression.Type.IsValueType){
+ if (instance_expr.Type.IsValueType){
IMemoryLocation ml;
LocalTemporary tempo = null;
- if (!(InstanceExpression is IMemoryLocation)){
+ if (!(instance_expr is IMemoryLocation)){
tempo = new LocalTemporary (
- ec, InstanceExpression.Type);
+ ec, instance_expr.Type);
InstanceExpression.Emit (ec);
tempo.Store (ec);
ml = tempo;
} else
- ml = (IMemoryLocation) InstanceExpression;
+ ml = (IMemoryLocation) instance_expr;
ml.AddressOf (ec, AddressOp.Load);
} else
- InstanceExpression.Emit (ec);
+ instance_expr.Emit (ec);
if (is_volatile)
ig.Emit (OpCodes.Volatile);
}
if (!is_static){
- Expression instance = InstanceExpression;
+ Expression instance = instance_expr;
if (instance.Type.IsValueType){
if (instance is IMemoryLocation){
if (FieldInfo.IsStatic)
ig.Emit (OpCodes.Ldsflda, FieldInfo);
else {
- if (InstanceExpression is IMemoryLocation)
- ((IMemoryLocation)InstanceExpression).AddressOf (ec, AddressOp.LoadStore);
+ if (instance_expr is IMemoryLocation)
+ ((IMemoryLocation)instance_expr).AddressOf (ec, AddressOp.LoadStore);
else
- InstanceExpression.Emit (ec);
+ instance_expr.Emit (ec);
ig.Emit (OpCodes.Ldflda, FieldInfo);
}
}
/// This is not an LValue because we need to re-write the expression, we
/// can not take data from the stack and store it.
/// </summary>
- public class PropertyExpr : ExpressionStatement, IAssignMethod {
+ public class PropertyExpr : ExpressionStatement, IAssignMethod, IMemberExpr {
public readonly PropertyInfo PropertyInfo;
- public readonly bool IsStatic;
public bool IsBase;
MethodInfo [] Accessors;
+ bool is_static;
Expression instance_expr;
-
+
public PropertyExpr (PropertyInfo pi, Location l)
{
PropertyInfo = pi;
eclass = ExprClass.PropertyAccess;
- IsStatic = false;
+ is_static = false;
loc = l;
Accessors = TypeManager.GetAccessors (pi);
foreach (MethodInfo mi in Accessors){
if (mi != null)
if (mi.IsStatic)
- IsStatic = true;
+ is_static = true;
}
else
Accessors = new MethodInfo [2];
type = TypeManager.TypeToCoreType (pi.PropertyType);
}
+ public string Name {
+ get {
+ return PropertyInfo.Name;
+ }
+ }
+
+ public bool IsInstance {
+ get {
+ return !is_static;
+ }
+ }
+
+ public bool IsStatic {
+ get {
+ return is_static;
+ }
+ }
+
+ public Type DeclaringType {
+ get {
+ return PropertyInfo.DeclaringType;
+ }
+ }
+
//
// The instance expression associated with this expression
//
return null;
}
- type = PropertyInfo.PropertyType;
+ if ((instance_expr == null) && ec.IsStatic && !is_static) {
+ SimpleName.Error_ObjectRefRequired (ec, loc, PropertyInfo.Name);
+ return null;
+ }
+
+ if (instance_expr != null) {
+ instance_expr = instance_expr.DoResolve (ec);
+ if (instance_expr == null)
+ return null;
+ }
+
+ return this;
+ }
+
+ override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+ {
+ if (!PropertyInfo.CanWrite){
+ Report.Error (154, loc,
+ "The property `" + PropertyInfo.Name +
+ "' can not be used in " +
+ "this context because it lacks a set accessor");
+ return null;
+ }
+
+ if (instance_expr != null) {
+ instance_expr = instance_expr.DoResolve (ec);
+ if (instance_expr == null)
+ return null;
+ }
return this;
}
//
// Special case: length of single dimension array is turned into ldlen
//
- if (method == TypeManager.int_array_get_length){
+ if ((method == TypeManager.system_int_array_get_length) ||
+ (method == TypeManager.int_array_get_length)){
Type iet = instance_expr.Type;
//
/// <summary>
/// Fully resolved expression that evaluates to an Event
/// </summary>
- public class EventExpr : Expression {
+ public class EventExpr : Expression, IMemberExpr {
public readonly EventInfo EventInfo;
- public Expression InstanceExpression;
-
- public readonly bool IsStatic;
+ public Expression instance_expr;
+ bool is_static;
MethodInfo add_accessor, remove_accessor;
public EventExpr (EventInfo ei, Location loc)
remove_accessor = TypeManager.GetRemoveMethod (ei);
if (add_accessor.IsStatic || remove_accessor.IsStatic)
- IsStatic = true;
+ is_static = true;
if (EventInfo is MyEventBuilder)
type = ((MyEventBuilder) EventInfo).EventType;
type = EventInfo.EventHandlerType;
}
+ public string Name {
+ get {
+ return EventInfo.Name;
+ }
+ }
+
+ public bool IsInstance {
+ get {
+ return !is_static;
+ }
+ }
+
+ public bool IsStatic {
+ get {
+ return is_static;
+ }
+ }
+
+ public Type DeclaringType {
+ get {
+ return EventInfo.DeclaringType;
+ }
+ }
+
+ public Expression InstanceExpression {
+ get {
+ return instance_expr;
+ }
+
+ set {
+ instance_expr = value;
+ }
+ }
+
public override Expression DoResolve (EmitContext ec)
{
- // We are born fully resolved
+ if (instance_expr != null) {
+ instance_expr = instance_expr.DoResolve (ec);
+ if (instance_expr == null)
+ return null;
+ }
+
return this;
}
public override void Emit (EmitContext ec)
{
- throw new Exception ("Should not happen I think");
+ Report.Error (70, loc, "The event `" + Name + "' can only appear on the left hand side of += or -= (except on the defining type)");
}
public void EmitAddOrRemove (EmitContext ec, Expression source)
if (((Binary) source).Oper == Binary.Operator.Addition)
Invocation.EmitCall (
- ec, false, IsStatic, InstanceExpression, add_accessor, args, loc);
+ ec, false, IsStatic, instance_expr, add_accessor, args, loc);
else
Invocation.EmitCall (
- ec, false, IsStatic, InstanceExpression, remove_accessor, args, loc);
+ ec, false, IsStatic, instance_expr, remove_accessor, args, loc);
}
}
}