e = new IntConstant (-((ShortConstant) expr).Value);
else if (expr is UShortConstant)
e = new IntConstant (-((UShortConstant) expr).Value);
+ else if (expr is SByteConstant)
+ e = new IntConstant (-((SByteConstant) expr).Value);
+ else if (expr is ByteConstant)
+ e = new IntConstant (-((ByteConstant) expr).Value);
return e;
}
case Operator.UnaryNegation:
result = TryReduceNegative (e);
- return true;
+ return result != null;
case Operator.LogicalNot:
if (expr_type != TypeManager.bool_type) {
Expression ResolveOperator (EmitContext ec)
{
- Type expr_type = Expr.Type;
+ //
+ // Step 1: Default operations on CLI native types.
+ //
+
+ // Attempt to use a constant folding operation.
+ if (Expr is Constant){
+ Expression result;
+
+ if (Reduce (ec, (Constant) Expr, out result))
+ return result;
+ }
//
- // Step 1: Perform Operator Overload location
+ // Step 2: Perform Operator Overload location
//
+ Type expr_type = Expr.Type;
Expression mg;
string op_name;
if (expr_type == null)
return null;
- //
- // Step 2: Default operations on CLI native types.
- //
-
- // Attempt to use a constant folding operation.
- if (Expr is Constant){
- Expression result;
-
- if (Reduce (ec, (Constant) Expr, out result))
- return result;
- }
-
switch (Oper){
case Operator.LogicalNot:
if (expr_type != TypeManager.bool_type) {
return null;
}
+ LocalVariableReference lr = Expr as LocalVariableReference;
+ if (lr != null){
+ if (lr.local_info.IsCaptured){
+ AnonymousMethod.Error_AddressOfCapturedVar (lr.Name, loc);
+ return null;
+ }
+ lr.local_info.AddressTaken = true;
+ lr.local_info.Used = true;
+ }
+
// According to the specs, a variable is considered definitely assigned if you take
// its address.
if ((variable != null) && (variable.VariableInfo != null))
public override Expression DoResolve (EmitContext ec)
{
- ProbeType = ProbeType.ResolveAsTypeTerminal (ec, false);
- if (ProbeType == null)
+ TypeExpr texpr = ProbeType.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
- probe_type = ProbeType.Type;
+ probe_type = texpr.Type;
CheckObsoleteAttribute (probe_type);
warning_always_matches = true;
} else if (Convert.ExplicitReferenceConversionExists (etype, probe_type)){
+ if (etype.IsGenericParameter)
+ expr = new BoxedCast (expr, etype);
+
//
// Second case: explicit reference convresion
//
warning_never_matches = true;
}
- if (warning_always_matches)
+ if (warning_always_matches)
Warning (183, "The given expression is always of the provided ('{0}') type", TypeManager.CSharpName (probe_type));
- else if (warning_never_matches){
- if (!(probe_type.IsInterface || expr.Type.IsInterface))
+ else if (warning_never_matches){
+ if (!(probe_type.IsInterface || expr.Type.IsInterface))
Warning (184, "The given expression is never of the provided ('{0}') type", TypeManager.CSharpName (probe_type));
}
return this;
- }
+ }
}
/// <summary>
}
if (Convert.ExplicitReferenceConversionExists (etype, probe_type)){
+ if (etype.IsGenericParameter)
+ expr = new BoxedCast (expr, etype);
+
do_isinst = true;
return this;
}
if (expr == null)
return null;
- TypeExpr target = target_type.ResolveAsTypeTerminal (ec, false);
+ TypeExpr target = target_type.ResolveAsTypeTerminal (ec);
if (target == null)
return null;
-
+
type = target.Type;
CheckObsoleteAttribute (type);
// Special cases: string or type parameter comapred to null
//
if (oper == Operator.Equality || oper == Operator.Inequality){
- if ((!TypeManager.IsValueType (l) && (right is NullLiteral)) ||
- (!TypeManager.IsValueType (r) && (left is NullLiteral))) {
+ if ((!TypeManager.IsValueType (l) && r == TypeManager.null_type) ||
+ (!TypeManager.IsValueType (r) && l == TypeManager.null_type)) {
Type = TypeManager.bool_type;
return this;
//
// Also, a standard conversion must exist from either one
//
- if (!(Convert.ImplicitStandardConversionExists (left, r) ||
- Convert.ImplicitStandardConversionExists (right, l))){
+ if (!(Convert.ImplicitStandardConversionExists (ec, left, r) ||
+ Convert.ImplicitStandardConversionExists (ec, right, l))){
Error_OperatorCannotBeApplied ();
return null;
}
//
if (oper == Operator.Addition || oper == Operator.Subtraction) {
if (TypeManager.IsDelegateType (l)){
- if ((right.eclass == ExprClass.MethodGroup) &&
- (RootContext.Version != LanguageVersion.ISO_1)){
+ if (((right.eclass == ExprClass.MethodGroup) ||
+ (r == TypeManager.anonymous_method_type))){
+ if ((RootContext.Version != LanguageVersion.ISO_1)){
Expression tmp = Convert.ImplicitConversionRequired (ec, right, l, loc);
if (tmp == null)
return null;
right = tmp;
r = right.Type;
}
+ }
if (TypeManager.IsDelegateType (r)){
MethodInfo method;
}
} else
left = left.Resolve (ec);
- right = right.Resolve (ec);
- if (left == null || right == null)
+ if (left == null)
+ return null;
+
+ Constant lc = left as Constant;
+ if (lc != null && lc.Type == TypeManager.bool_type &&
+ ((oper == Operator.LogicalAnd && (bool)lc.GetValue () == false) ||
+ (oper == Operator.LogicalOr && (bool)lc.GetValue () == true))) {
+
+ // TODO: make a sence to resolve unreachable expression as we do for statement
+ Report.Warning (429, 4, loc, "Unreachable expression code detected");
+ return left;
+ }
+
+ right = right.Resolve (ec);
+ if (right == null)
return null;
eclass = ExprClass.Value;
Constant rc = right as Constant;
- Constant lc = left as Constant;
-
if (rc != null & lc != null){
Expression e = ConstantFold.BinaryFold (
ec, oper, lc, rc, loc);
public class StringConcat : Expression {
ArrayList operands;
bool invalid = false;
-
+ bool emit_conv_done = false;
+ //
+ // Are we also concating objects?
+ //
+ bool is_strings_only = true;
public StringConcat (EmitContext ec, Location loc, Expression left, Expression right)
{
{
MethodInfo concat_method = null;
- //
- // Are we also concating objects?
- //
- bool is_strings_only = true;
-
//
// Do conversion to arguments; check for strings only
//
+
+ // This can get called multiple times, so we have to deal with that.
+ if (!emit_conv_done) {
+ emit_conv_done = true;
for (int i = 0; i < operands.Count; i ++) {
Expression e = (Expression) operands [i];
is_strings_only &= e.Type == TypeManager.string_type;
// method might look at the type of this expression, see it is a
// string and emit a string [] when we want an object [];
- e = Convert.ImplicitConversion (ec, e, TypeManager.object_type, loc);
+ e = new EmptyCast (e, TypeManager.object_type);
}
operands [i] = new Argument (e, Argument.AType.Expression);
}
+ }
//
// Find the right method
Label false_target = ig.DefineLabel ();
Label end_target = ig.DefineLabel ();
- ig.Emit (OpCodes.Nop);
-
left.Emit (ec);
left_temp.Store (ec);
ig.MarkLabel (false_target);
op.Emit (ec);
ig.MarkLabel (end_target);
-
- ig.Emit (OpCodes.Nop);
}
}
if (trueExpr == null || falseExpr == null)
return null;
- if ((trueExpr is NullLiteral) && (falseExpr is NullLiteral))
- return trueExpr;
-
eclass = ExprClass.Value;
if (trueExpr.Type == falseExpr.Type)
type = trueExpr.Type;
public class LocalVariableReference : Expression, IAssignMethod, IMemoryLocation, IVariable {
public readonly string Name;
public readonly Block Block;
- LocalInfo local_info;
+ public LocalInfo local_info;
bool is_readonly;
+ bool prepared;
+ LocalTemporary temp;
public LocalVariableReference (Block block, string name, Location l)
{
eclass = ExprClass.Variable;
}
+ //
// Setting `is_readonly' to false will allow you to create a writable
// reference to a read-only variable. This is used by foreach and using.
+ //
public LocalVariableReference (Block block, string name, Location l,
LocalInfo local_info, bool is_readonly)
: this (block, name, l)
}
public VariableInfo VariableInfo {
- get { return local_info.VariableInfo; }
+ get {
+ return local_info.VariableInfo;
+ }
}
public bool IsReadOnly {
}
}
- protected void DoResolveBase (EmitContext ec)
+ protected Expression DoResolveBase (EmitContext ec, Expression lvalue_right_side)
{
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;
}
type = local_info.VariableType;
-#if false
- if (ec.InAnonymousMethod)
- Block.LiftVariable (local_info);
-#endif
+
+ VariableInfo variable_info = local_info.VariableInfo;
+ if (lvalue_right_side != null){
+ if (is_readonly){
+ Error (1604, "cannot assign to `" + Name + "' because it is readonly");
+ return null;
+ }
+
+ if (variable_info != null)
+ variable_info.SetAssigned (ec);
}
- protected Expression DoResolve (EmitContext ec, bool is_lvalue)
- {
Expression e = Block.GetConstantExpression (Name);
if (e != null) {
local_info.Used = true;
return e.Resolve (ec);
}
- VariableInfo variable_info = local_info.VariableInfo;
if ((variable_info != null) && !variable_info.IsAssigned (ec, loc))
return null;
- if (!is_lvalue)
+ if (lvalue_right_side == null)
local_info.Used = true;
- if (local_info.LocalBuilder == null)
- return ec.RemapLocal (local_info);
+ if (ec.CurrentAnonymousMethod != null){
+ //
+ // If we are referencing a variable from the external block
+ // flag it for capturing
+ //
+ if (local_info.Block.Toplevel != ec.CurrentBlock.Toplevel){
+ if (local_info.AddressTaken){
+ AnonymousMethod.Error_AddressOfCapturedVar (local_info.Name, loc);
+ return null;
+ }
+ ec.CaptureVariable (local_info);
+ }
+ }
return this;
}
public override Expression DoResolve (EmitContext ec)
{
- DoResolveBase (ec);
-
- return DoResolve (ec, false);
+ return DoResolveBase (ec, null);
}
override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
- DoResolveBase (ec);
-
- VariableInfo variable_info = local_info.VariableInfo;
- if (variable_info != null)
- variable_info.SetAssigned (ec);
-
- Expression e = DoResolve (ec, right_side != EmptyExpression.Null);
-
- if (e == null)
- return null;
+ Expression ret = DoResolveBase (ec, right_side);
+ if (ret != null)
+ CheckObsoleteAttribute (ret.Type);
- if (is_readonly){
- Error (1604, "cannot assign to `" + Name + "' because it is readonly");
- return null;
- }
-
- CheckObsoleteAttribute (e.Type);
-
- if (local_info.LocalBuilder == null)
- return ec.RemapLocalLValue (local_info, right_side);
-
- return this;
+ return ret;
}
public bool VerifyFixed (bool is_expression)
{
ILGenerator ig = ec.ig;
+ if (local_info.FieldBuilder == null){
+ //
+ // A local variable on the local CLR stack
+ //
ig.Emit (OpCodes.Ldloc, local_info.LocalBuilder);
+ } else {
+ //
+ // A local variable captured by anonymous methods.
+ //
+ if (!prepared)
+ ec.EmitCapturedVariableInstance (local_info);
+
+ ig.Emit (OpCodes.Ldfld, local_info.FieldBuilder);
+ }
}
public void Emit (EmitContext ec, bool leave_copy)
{
Emit (ec);
- if (leave_copy)
+ if (leave_copy){
ec.ig.Emit (OpCodes.Dup);
+ if (local_info.FieldBuilder != null){
+ temp = new LocalTemporary (ec, Type);
+ temp.Store (ec);
+ }
+ }
}
public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
{
+ ILGenerator ig = ec.ig;
+ prepared = prepare_for_load;
+
+ if (local_info.FieldBuilder == null){
+ //
+ // A local variable on the local CLR stack
+ //
+ if (local_info.LocalBuilder == null)
+ throw new Exception ("This should not happen: both Field and Local are null");
+
source.Emit (ec);
if (leave_copy)
ec.ig.Emit (OpCodes.Dup);
- ec.ig.Emit (OpCodes.Stloc, local_info.LocalBuilder);
+ ig.Emit (OpCodes.Stloc, local_info.LocalBuilder);
+ } else {
+ //
+ // A local variable captured by anonymous methods or itereators.
+ //
+ ec.EmitCapturedVariableInstance (local_info);
+
+ if (prepare_for_load)
+ ig.Emit (OpCodes.Dup);
+ source.Emit (ec);
+ if (leave_copy){
+ ig.Emit (OpCodes.Dup);
+ temp = new LocalTemporary (ec, Type);
+ temp.Store (ec);
+ }
+ ig.Emit (OpCodes.Stfld, local_info.FieldBuilder);
+ if (temp != null)
+ temp.Emit (ec);
+ }
}
public void AddressOf (EmitContext ec, AddressOp mode)
{
ILGenerator ig = ec.ig;
+ if (local_info.FieldBuilder == null){
+ //
+ // A local variable on the local CLR stack
+ //
ig.Emit (OpCodes.Ldloca, local_info.LocalBuilder);
+ } else {
+ //
+ // A local variable captured by anonymous methods or iterators
+ //
+ ec.EmitCapturedVariableInstance (local_info);
+ ig.Emit (OpCodes.Ldflda, local_info.FieldBuilder);
+ }
}
public override string ToString ()
VariableInfo vi;
public Parameter.Modifier mod;
public bool is_ref, is_out, prepared;
+
+ public bool IsOut {
+ get {
+ return is_out;
+ }
+ }
+
+ public bool IsRef {
+ get {
+ return is_ref;
+ }
+ }
+
LocalTemporary temp;
public ParameterReference (Parameters pars, Block block, int idx, string name, Location loc)
public bool IsAssigned (EmitContext ec, Location loc)
{
- if (!ec.DoFlowAnalysis || !is_out ||
- ec.CurrentBranching.IsAssigned (vi))
+ if (!ec.DoFlowAnalysis || !is_out || ec.CurrentBranching.IsAssigned (vi))
return true;
Report.Error (165, loc,
public bool IsFieldAssigned (EmitContext ec, string field_name, Location loc)
{
- if (!ec.DoFlowAnalysis || !is_out ||
- ec.CurrentBranching.IsFieldAssigned (vi, field_name))
+ if (!ec.DoFlowAnalysis || !is_out || ec.CurrentBranching.IsFieldAssigned (vi, field_name))
return true;
Report.Error (170, loc,
protected void DoResolveBase (EmitContext ec)
{
- type = pars.GetParameterInfo (ec.DeclSpace, idx, out mod);
+ type = pars.GetParameterInfo (ec, idx, out mod);
is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
is_out = (mod & Parameter.Modifier.OUT) != 0;
eclass = ExprClass.Variable;
if (is_out)
vi = block.ParameterMap [idx];
+
+ if (ec.CurrentAnonymousMethod != null){
+ if (is_ref){
+ Report.Error (1628, Location,
+ "Can not reference a ref or out parameter in an anonymous method");
+ return;
+ }
+
+ //
+ // If we are referencing the parameter from the external block
+ // flag it for capturing
+ //
+ //Console.WriteLine ("Is parameter `{0}' local? {1}", name, block.IsLocalParameter (name));
+ if (!block.IsLocalParameter (name)){
+ ec.CaptureParameter (name, type, idx);
+ }
+ }
}
//
arg_idx++;
EmitLdArg (ig, arg_idx);
+
+ //
+ // FIXME: Review for anonymous methods
+ //
}
public override void Emit (EmitContext ec)
{
+ if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
+ ec.EmitParameter (name);
+ return;
+ }
+
Emit (ec, false);
}
public void Emit (EmitContext ec, bool leave_copy)
{
ILGenerator ig = ec.ig;
-
int arg_idx = idx;
if (!ec.IsStatic)
public void EmitAssign (EmitContext ec, Expression source, bool leave_copy, bool prepare_for_load)
{
+ if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
+ ec.EmitAssignParameter (name, source, leave_copy, prepare_for_load);
+ return;
+ }
+
ILGenerator ig = ec.ig;
int arg_idx = idx;
public void AddressOf (EmitContext ec, AddressOp mode)
{
+ if (ec.HaveCaptureInfo && ec.IsParameterCaptured (name)){
+ ec.EmitAddressOfParameter (name);
+ return;
+ }
+
int arg_idx = idx;
if (!ec.IsStatic)
if (instance.GetType () != typeof (This)){
if (fe.InstanceExpression.Type.IsSubclassOf (TypeManager.mbr_type)){
- Report.Error (197, loc,
- "Can not pass a type that derives from MarshalByRefObject with out or ref");
+ Report.SymbolRelatedToPreviousError (fe.InstanceExpression.Type);
+ Report.Error (197, loc, "Cannot pass '{0}' as ref or out or take its address because it is a member of a marshal-by-reference class",
+ fe.Name);
return false;
}
}
if (Expr is ParameterReference){
ParameterReference pr = (ParameterReference) Expr;
- if (pr.is_ref)
+ if (pr.IsRef)
pr.EmitLoad (ec);
else {
return null;
if (argument_expr is NullLiteral) {
- //
+ //
// If the argument is null and one of the types to compare is 'object' and
// the other is a reference type, we prefer the other.
- //
+ //
// This follows from the usual rules:
// * There is an implicit conversion from 'null' to type 'object'
// * There is an implicit conversion from 'null' to any reference type
// * There is no implicit conversion from type 'object' to other reference types
// => Conversion of 'null' to a reference type is better than conversion to 'object'
//
- // FIXME: This probably isn't necessary, since the type of a NullLiteral is 'System.Null'.
- // I think it used to be 'object' and thus needed a special case to avoid the
- // immediately following two checks.
+ // FIXME: This probably isn't necessary, since the type of a NullLiteral is the
+ // null type. I think it used to be 'object' and thus needed a special
+ // case to avoid the immediately following two checks.
//
if (!p.IsValueType && q == TypeManager.object_type)
return p;
if (!q.IsValueType && p == TypeManager.object_type)
return q;
}
-
+
if (argument_type == p)
return p;
Expression p_tmp = new EmptyExpression (p);
Expression q_tmp = new EmptyExpression (q);
-
+
bool p_to_q = Convert.ImplicitConversionExists (ec, p_tmp, q);
bool q_to_p = Convert.ImplicitConversionExists (ec, q_tmp, p);
/// 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 candidate, bool candidate_params,
+ MethodBase best, bool best_params, Location loc)
{
ParameterData candidate_pd = GetParameterData (candidate);
ParameterData best_pd = GetParameterData (best);
// }
//
// interface IFooBar : IFoo, IBar {}
- //
+ //
// We cant tell if IFoo.DoIt is better than IBar.DoIt
//
// However, we have to consider that
(candidate_pd.ParameterModifier (cand_count - 1) != Parameter.Modifier.ARGLIST))
if (cand_count != argument_count)
return false;
-
+
bool better_at_least_one = false;
+ bool is_equal = true;
+
for (int j = 0; j < argument_count; ++j) {
Argument a = (Argument) args [j];
- Type ct = candidate_pd.ParameterType (j);
- Type bt = best_pd.ParameterType (j);
+ Type ct = TypeManager.TypeToCoreType (candidate_pd.ParameterType (j));
+ Type bt = TypeManager.TypeToCoreType (best_pd.ParameterType (j));
if (candidate_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
if (candidate_params)
if (best_params)
bt = TypeManager.GetElementType (bt);
- Type better = BetterConversion (ec, a, ct, bt, loc);
+ if (!ct.Equals (bt))
+ is_equal = false;
+ Type better = BetterConversion (ec, a, ct, bt, loc);
// for each argument, the conversion to 'ct' should be no worse than
// the conversion to 'bt'.
if (better == bt)
if (!candidate_params && best_params && cand_count == argument_count)
return true;
+ //
+ // If two methods have equal parameter types, but
+ // only one of them is generic, the non-generic one wins.
+ //
+ if (is_equal) {
+ if (TypeManager.IsGenericMethod (best) && !TypeManager.IsGenericMethod (candidate))
+ return true;
+ else if (!TypeManager.IsGenericMethod (best) && TypeManager.IsGenericMethod (candidate))
+ return false;
+ }
+
return better_at_least_one;
}
bool do_varargs, ref MethodBase candidate)
{
if (!me.HasTypeArguments &&
- !InferParamsTypeArguments (ec, arguments, ref candidate))
+ !TypeManager.InferParamsTypeArguments (ec, arguments, ref candidate))
return false;
return IsParamsMethodApplicable (
Argument a = (Argument) arguments [i];
Parameter.Modifier a_mod = a.GetParameterModifier () &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
Parameter.Modifier p_mod = pd.ParameterModifier (i) &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ (unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF)));
if (a_mod == p_mod) {
ref MethodBase candidate)
{
if (!me.HasTypeArguments &&
- !InferTypeArguments (ec, arguments, ref candidate))
+ !TypeManager.InferTypeArguments (ec, arguments, ref candidate))
return false;
return IsApplicable (ec, arguments, arg_count, candidate);
Argument a = (Argument) arguments [i];
Parameter.Modifier a_mod = a.GetParameterModifier () &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
Parameter.Modifier p_mod = pd.ParameterModifier (i) &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
if (a_mod == p_mod ||
if (pd.Count != arg_count)
continue;
- if (!InferTypeArguments (ec, Arguments, ref c))
+ if (!TypeManager.InferTypeArguments (ec, Arguments, ref c))
continue;
VerifyArgumentsCompat (ec, Arguments, arg_count,
if (pd.Count != arg_count)
continue;
- if (InferTypeArguments (ec, Arguments, ref c))
+ if (TypeManager.InferTypeArguments (ec, Arguments, ref c))
continue;
Report.Error (
"method `{0}' cannot be infered from " +
"the usage. Try specifying the type " +
"arguments explicitly.", report_name);
- break;
+ return null;
}
Error_WrongNumArguments (
a.Expr = conv;
}
+ if (parameter_type.IsPointer){
+ if (!ec.InUnsafe){
+ UnsafeError (loc);
+ return false;
+ }
+ }
+
Parameter.Modifier a_mod = a.GetParameterModifier () &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
Parameter.Modifier p_mod = pd.ParameterModifier (j) &
- ~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+ unchecked (~(Parameter.Modifier.OUT | Parameter.Modifier.REF));
if (a_mod != p_mod &&
pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS) {
return true;
}
- static bool InferType (Type pt, Type at, ref Type[] infered)
- {
- if (pt.IsGenericParameter && (pt.DeclaringMethod != null)) {
- int pos = pt.GenericParameterPosition;
-
- if (infered [pos] == null) {
- Type check = at;
- while (check.IsArray)
- check = check.GetElementType ();
-
- if (pt == check)
- return false;
-
- infered [pos] = at;
- return true;
- }
-
- if (infered [pos] != at)
- return false;
-
- return true;
- }
-
- if (!pt.ContainsGenericParameters)
- return true;
-
- if (at.IsArray) {
- if (!pt.IsArray ||
- (at.GetArrayRank () != pt.GetArrayRank ()))
- return false;
-
- return InferType (pt.GetElementType (), at.GetElementType (),
- ref infered);
- }
-
- if (pt.IsArray) {
- if (!at.IsArray ||
- (pt.GetArrayRank () != at.GetArrayRank ()))
- return false;
-
- return InferType (pt.GetElementType (), at.GetElementType (),
- ref infered);
- }
-
- if (!at.IsGenericInstance)
- return false;
-
- Type[] at_args = at.GetGenericArguments ();
- Type[] pt_args = pt.GetGenericArguments ();
-
- if (at_args.Length != pt_args.Length)
- return false;
-
- Type[] infered_types = new Type [at_args.Length];
-
- for (int i = 0; i < at_args.Length; i++)
- if (!InferType (pt_args [i], at_args [i], ref infered_types))
- return false;
-
- for (int i = 0; i < infered_types.Length; i++)
- if (infered_types [i] == null)
- return false;
-
- for (int i = 0; i < infered_types.Length; i++) {
- if (infered [i] == null) {
- infered [i] = infered_types [i];
- continue;
- }
-
- if (infered [i] != infered_types [i])
- return false;
- }
-
- return true;
- }
-
- static bool InferParamsTypeArguments (EmitContext ec, ArrayList arguments,
- ref MethodBase method)
- {
- if ((arguments == null) || !TypeManager.IsGenericMethod (method))
- return true;
-
- int arg_count;
-
- if (arguments == null)
- arg_count = 0;
- else
- arg_count = arguments.Count;
-
- ParameterData pd = GetParameterData (method);
-
- int pd_count = pd.Count;
-
- if (pd_count == 0)
- return false;
-
- if (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS)
- return false;
-
- if (pd_count - 1 > arg_count)
- return false;
-
- if (pd_count == 1 && arg_count == 0)
- return true;
-
- Type[] method_args = method.GetGenericArguments ();
- Type[] infered_types = new Type [method_args.Length];
-
- //
- // If we have come this far, the case which
- // remains is when the number of parameters is
- // less than or equal to the argument count.
- //
- for (int i = 0; i < pd_count - 1; ++i) {
- Argument a = (Argument) arguments [i];
-
- if ((a.Expr is NullLiteral) || (a.Expr is MethodGroupExpr))
- continue;
-
- Type pt = pd.ParameterType (i);
- Type at = a.Type;
-
- if (!InferType (pt, at, ref infered_types))
- return false;
- }
-
- Type element_type = TypeManager.GetElementType (pd.ParameterType (pd_count - 1));
-
- for (int i = pd_count - 1; i < arg_count; i++) {
- Argument a = (Argument) arguments [i];
-
- if ((a.Expr is NullLiteral) || (a.Expr is MethodGroupExpr))
- continue;
-
- if (!InferType (element_type, a.Type, ref infered_types))
- return false;
- }
-
- for (int i = 0; i < infered_types.Length; i++)
- if (infered_types [i] == null)
- return false;
-
- method = method.BindGenericParameters (infered_types);
- return true;
- }
-
- public static bool InferTypeArguments (Type[] param_types, Type[] arg_types,
- ref Type[] infered_types)
- {
- if (infered_types == null)
- return false;
-
- for (int i = 0; i < arg_types.Length; i++) {
- if (arg_types [i] == null)
- continue;
-
- if (!InferType (param_types [i], arg_types [i],
- ref infered_types))
- return false;
- }
-
- for (int i = 0; i < infered_types.Length; i++)
- if (infered_types [i] == null)
- return false;
-
- return true;
- }
-
- static bool InferTypeArguments (EmitContext ec, ArrayList arguments,
- ref MethodBase method)
- {
- if (!TypeManager.IsGenericMethod (method))
- return true;
-
- int arg_count;
- if (arguments != null)
- arg_count = arguments.Count;
- else
- arg_count = 0;
-
- ParameterData pd = GetParameterData (method);
- if (arg_count != pd.Count)
- return false;
-
- Type[] method_args = method.GetGenericArguments ();
- Type[] infered_types = new Type [method_args.Length];
-
- Type[] param_types = new Type [pd.Count];
- Type[] arg_types = new Type [pd.Count];
-
- for (int i = 0; i < arg_count; i++) {
- param_types [i] = pd.ParameterType (i);
-
- Argument a = (Argument) arguments [i];
- if ((a.Expr is NullLiteral) || (a.Expr is MethodGroupExpr))
- continue;
-
- arg_types [i] = a.Type;
- }
-
- if (!InferTypeArguments (param_types, arg_types, ref infered_types))
- return false;
-
- method = method.BindGenericParameters (infered_types);
- return true;
- }
-
- public static bool InferTypeArguments (EmitContext ec, ParameterData apd,
- ref MethodBase method)
- {
- if (!TypeManager.IsGenericMethod (method))
- return true;
-
- ParameterData pd = GetParameterData (method);
- if (apd.Count != pd.Count)
- return false;
-
- Type[] method_args = method.GetGenericArguments ();
- Type[] infered_types = new Type [method_args.Length];
-
- Type[] param_types = new Type [pd.Count];
- Type[] arg_types = new Type [pd.Count];
-
- for (int i = 0; i < apd.Count; i++) {
- param_types [i] = pd.ParameterType (i);
- arg_types [i] = apd.ParameterType (i);
- }
-
- if (!InferTypeArguments (param_types, arg_types, ref infered_types))
- return false;
-
- method = method.BindGenericParameters (infered_types);
- return true;
- }
-
public override Expression DoResolve (EmitContext ec)
{
//
}
}
+ if (mg.InstanceExpression != null)
+ mg.InstanceExpression.CheckMarshallByRefAccess (ec.ContainerType);
+
eclass = ExprClass.Value;
return this;
}
//
// First try to resolve it as a cast.
//
- TypeExpr te = expr.ResolveAsTypeTerminal (ec, true);
- if (te != null) {
+ TypeExpr te = expr.ResolveAsTypeStep (ec) as TypeExpr;
+ if ((te != null) && (te.eclass == ExprClass.Type)) {
Cast cast = new Cast (te, argument, loc);
return cast.Resolve (ec);
}
//
// First try to resolve it as a cast.
//
- TypeExpr te = expr.ResolveAsTypeTerminal (ec, true);
- if (te != null) {
+ TypeExpr te = expr.ResolveAsTypeStep (ec) as TypeExpr;
+ if ((te != null) && (te.eclass == ExprClass.Type)) {
error201 ();
return null;
}
return this;
}
- RequestedType = RequestedType.ResolveAsTypeTerminal (ec, false);
- if (RequestedType == null)
+ TypeExpr texpr = RequestedType.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
- type = RequestedType.Type;
+ type = texpr.Type;
+ if (type == null)
+ return null;
CheckObsoleteAttribute (type);
if (IsDelegate){
RequestedType = (new NewDelegate (type, Arguments, loc)).Resolve (ec);
if (RequestedType != null)
- if (!(RequestedType is NewDelegate))
+ if (!(RequestedType is DelegateCreation))
throw new Exception ("NewDelegate.Resolve returned a non NewDelegate: " + RequestedType.GetType ());
return RequestedType;
}
return null;
}
- bool is_struct = type.IsValueType && !type.IsGenericInstance;
+ bool is_struct = type.IsValueType;
eclass = ExprClass.Value;
//
//
// Lookup the type
//
- Expression array_type_expr;
+ TypeExpr array_type_expr;
array_type_expr = new ComposedCast (requested_base_type, array_qualifier.ToString (), loc);
- array_type_expr = array_type_expr.ResolveAsTypeTerminal (ec, false);
+ array_type_expr = array_type_expr.ResolveAsTypeTerminal (ec);
if (array_type_expr == null)
return false;
type = array_type_expr.Type;
-
+
if (!type.IsArray) {
Error (622, "Can only use array initializer expressions to assign to array types. Try using a new expression instead.");
return false;
eclass = ExprClass.Variable;
if (ec.TypeContainer.CurrentType != null)
- type = ec.TypeContainer.CurrentType.ResolveType (ec);
+ type = ec.TypeContainer.CurrentType;
else
type = ec.ContainerType;
public override Expression DoResolve (EmitContext ec)
{
- QueriedType = QueriedType.ResolveAsTypeTerminal (ec, false);
- if (QueriedType == null)
+ TypeExpr texpr = QueriedType.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
- typearg = QueriedType.Type;
+ typearg = texpr.Type;
if (typearg == TypeManager.void_type) {
Error (673, "System.Void cannot be used from C# - " +
return null;
}
- QueriedType = QueriedType.ResolveAsTypeTerminal (ec, false);
- if (QueriedType == null)
+ TypeExpr texpr = QueriedType.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
- if (QueriedType is TypeParameterExpr){
- ((TypeParameterExpr)QueriedType).Error_CannotUseAsUnmanagedType (loc);
+ if (texpr is TypeParameterExpr){
+ ((TypeParameterExpr)texpr).Error_CannotUseAsUnmanagedType (loc);
return null;
}
- type_queried = QueriedType.Type;
+ type_queried = texpr.Type;
CheckObsoleteAttribute (type_queried);
return RootContext.LookupType (ec.DeclSpace, sn.Name, true, loc) != null;
}
+ // TODO: possible optimalization
+ // Cache resolved constant result in FieldBuilder <-> expresion map
public static Expression ResolveMemberAccess (EmitContext ec, Expression member_lookup,
Expression left, Location loc,
Expression left_original)
FieldInfo fi = fe.FieldInfo.Mono_GetGenericFieldDefinition ();
Type decl_type = fi.DeclaringType;
- if (fi is FieldBuilder) {
+ bool is_emitted = fi is FieldBuilder;
+ Type t = fi.FieldType;
+
+ if (is_emitted) {
Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
if (c != null) {
object real_value = ((Constant) c.Expr).GetValue ();
- return Constantify (real_value, fi.FieldType);
+ return Constantify (real_value, t);
}
}
+ // IsInitOnly is because of MS compatibility, I don't know why but they emit decimal constant as InitOnly
+ if (fi.IsInitOnly && !is_emitted && t == TypeManager.decimal_type) {
+ object[] attrs = fi.GetCustomAttributes (TypeManager.decimal_constant_attribute_type, false);
+ if (attrs.Length == 1)
+ return new DecimalConstant (((System.Runtime.CompilerServices.DecimalConstantAttribute) attrs [0]).Value);
+ }
+
if (fi.IsLiteral) {
- Type t = fi.FieldType;
-
object o;
- if (fi is FieldBuilder)
+ if (is_emitted)
o = TypeManager.GetValue ((FieldBuilder) fi);
else
o = fi.GetValue (fi);
return exp;
}
- if (fi.FieldType.IsPointer && !ec.InUnsafe){
+ if (t.IsPointer && !ec.InUnsafe){
UnsafeError (loc);
return null;
}
Type expr_type;
if (expr is TypeExpr){
- expr_type = ((TypeExpr) expr).ResolveType (ec);
+ expr_type = expr.Type;
if (!ec.DeclSpace.CheckAccessLevel (expr_type)){
Report.Error (122, loc, "'{0}' is inaccessible due to its protection level", expr_type);
string full_name = String.Concat (((SimpleName) full_expr.Expr).Name, ".", fname);
Type fully_qualified = ec.DeclSpace.FindType (loc, full_name);
if (fully_qualified != null) {
- if (args != null)
- return new ConstructedType (
- fully_qualified, args, loc);
- else
- return new TypeExpression (
- fully_qualified, loc);
+ if (args == null)
+ return new TypeExpression (fully_qualified, loc);
+
+ ConstructedType ctype = new ConstructedType (fully_qualified, args, loc);
+ return ctype.ResolveAsTypeStep (ec);
}
}
return new_expr.ResolveAsTypeStep (ec);
}
- Type expr_type = ((TypeExpr) new_expr).ResolveType (ec);
- if (expr_type == null)
+ TypeExpr tnew_expr = new_expr.ResolveAsTypeTerminal (ec);
+ if (tnew_expr == null)
return null;
+ Type expr_type = tnew_expr.Type;
+
if (expr_type.IsPointer){
Error (23, "The `.' operator can not be applied to pointer operands (" +
TypeManager.CSharpName (expr_type) + ")");
if (texpr == null)
return null;
- Type t = texpr.ResolveType (ec);
- if (t == null)
+ texpr = texpr.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
+ TypeArguments the_args = args;
if (TypeManager.HasGenericArguments (expr_type)) {
Type[] decl_args = TypeManager.GetTypeArguments (expr_type);
if (args != null)
new_args.Add (args);
- args = new_args;
+ the_args = new_args;
}
- if (args != null) {
- ConstructedType ctype = new ConstructedType (t, args, loc);
+ if (the_args != null) {
+ ConstructedType ctype = new ConstructedType (texpr.Type, the_args, loc);
return ctype.ResolveAsTypeStep (ec);
}
UnsafeError (loc);
return null;
}
+
+ instance_expr.CheckMarshallByRefAccess (ec.ContainerType);
eclass = ExprClass.IndexerAccess;
return this;
}
}
+ instance_expr.CheckMarshallByRefAccess (ec.ContainerType);
+
eclass = ExprClass.IndexerAccess;
return this;
}
loc = l;
}
+ public Expression Source {
+ get {
+ return source;
+ }
+ }
+
public override Expression DoResolve (EmitContext ec)
{
//
loc = l;
}
- public override TypeExpr DoResolveAsTypeStep (EmitContext ec)
+ protected override TypeExpr DoResolveAsTypeStep (EmitContext ec)
{
- left = left.ResolveAsTypeTerminal (ec, false);
- if (left == null)
+ TypeExpr lexpr = left.ResolveAsTypeTerminal (ec);
+ if (lexpr == null)
return null;
- Type ltype = left.Type;
+ Type ltype = lexpr.Type;
if ((ltype == TypeManager.void_type) && (dim != "*")) {
Report.Error (1547, Location,
//
// For now, fall back to the full lookup in that case.
//
- TypeExpr texpr = RootContext.LookupType (
- ec.DeclSpace, cname, false, loc);
-
- if (texpr == null)
- return null;
-
- type = texpr.ResolveType (ec);
+ type = RootContext.LookupType (ec.DeclSpace, cname, false, loc);
if (type == null)
return null;
}
- if (!ec.ResolvingTypeTree){
- //
- // If the above flag is set, this is being invoked from the ResolveType function.
- // Upper layers take care of the type validity in this context.
- //
if (!ec.InUnsafe && type.IsPointer){
UnsafeError (loc);
return null;
}
- }
eclass = ExprClass.Type;
return this;
return null;
}
- t = t.ResolveAsTypeTerminal (ec, false);
- if (t == null)
+ TypeExpr texpr = t.ResolveAsTypeTerminal (ec);
+ if (texpr == null)
return null;
- otype = t.Type;
+ otype = texpr.Type;
if (!TypeManager.VerifyUnManaged (otype, loc))
return null;
projects / mono.git / blobdiff