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) {
}
} 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 sense 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);
}
}
+ // Dead code optimalization
if (expr is BoolConstant){
BoolConstant bc = (BoolConstant) expr;
- if (bc.Value)
- return trueExpr;
- else
- return falseExpr;
+ Report.Warning (429, 4, bc.Value ? falseExpr.Location : trueExpr.Location, "Unreachable expression code detected");
+ return bc.Value ? trueExpr : falseExpr;
}
return this;
pr.AddressOf (ec, mode);
}
} else {
- ((IMemoryLocation)Expr).AddressOf (ec, mode);
+ if (Expr is IMemoryLocation)
+ ((IMemoryLocation) Expr).AddressOf (ec, mode);
+ else {
+ Report.Error (
+ 1510, Expr.Location,
+ "An lvalue is required as an argument to out or ref");
+ return;
+ }
}
} else
Expr.Emit (ec);
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;
}
}
method = Invocation.OverloadResolve (
- ec, (MethodGroupExpr) ml, Arguments, false, loc);
+ ec, (MethodGroupExpr) ml, Arguments, true, loc);
}
- if (method == null) {
+ if (method == null) {
+ if (almostMatchedMembers.Count != 0) {
+ MemberLookupFailed (ec, type, type, ".ctor", null, loc);
+ return null;
+ }
+
if (!is_struct || Arguments.Count > 0) {
Error (1501, String.Format (
"New invocation: Can not find a constructor in `{0}' for this argument list",
if (sn == null || left == null || left.Type.Name != sn.Name)
return false;
- return RootContext.LookupType (ec.DeclSpace, sn.Name, true, loc) != null;
+ return ec.DeclSpace.LookupType (sn.Name, true, loc) != null;
}
// TODO: possible optimalization
if (expr == null)
return null;
- if (expr is SimpleName){
- SimpleName child_expr = (SimpleName) expr;
-
- Expression new_expr = new SimpleName (child_expr.Name, Identifier, loc);
-
- return new_expr.Resolve (ec, flags);
+ if (expr is Namespace) {
+ Namespace ns = (Namespace) expr;
+ FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
+ if (retval == null)
+ Report.Error (234, loc, "The type or namespace name `{0}' could not be found in namespace `{1}'", Identifier, ns.FullName);
+ return retval;
}
//
return null;
if (member_lookup is TypeExpr) {
- if (!(expr is TypeExpr) && !(expr is SimpleName)) {
+ if (!(expr is TypeExpr)) {
Error (572, "Can't reference type `" + Identifier + "' through an expression; try `" +
member_lookup.Type + "' instead");
return null;
public override Expression DoResolve (EmitContext ec)
{
- return DoResolve (ec, null, ResolveFlags.VariableOrValue |
- ResolveFlags.SimpleName | ResolveFlags.Type);
+ return DoResolve (ec, null, ResolveFlags.VariableOrValue | ResolveFlags.Type);
}
public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
{
- return DoResolve (ec, right_side, ResolveFlags.VariableOrValue |
- ResolveFlags.SimpleName | ResolveFlags.Type);
+ return DoResolve (ec, right_side, ResolveFlags.VariableOrValue | ResolveFlags.Type);
}
- public override Expression ResolveAsTypeStep (EmitContext ec)
+ public override FullNamedExpression ResolveAsTypeStep (EmitContext ec)
{
- string fname = null;
- MemberAccess full_expr = this;
- while (full_expr != null) {
- if (fname != null)
- fname = String.Concat (full_expr.Identifier, ".", fname);
- else
- fname = full_expr.Identifier;
-
- if (full_expr.Expr is SimpleName) {
- string full_name = String.Concat (((SimpleName) full_expr.Expr).Name, ".", fname);
- Type fully_qualified = ec.DeclSpace.FindType (loc, full_name);
- if (fully_qualified != null)
- return new TypeExpression (fully_qualified, loc);
- }
-
- full_expr = full_expr.Expr as MemberAccess;
- }
-
- Expression new_expr = expr.ResolveAsTypeStep (ec);
+ FullNamedExpression new_expr = expr.ResolveAsTypeStep (ec);
if (new_expr == null)
return null;
- if (new_expr is SimpleName){
- SimpleName child_expr = (SimpleName) new_expr;
-
- new_expr = new SimpleName (child_expr.Name, Identifier, loc);
-
- return new_expr.ResolveAsTypeStep (ec);
+ if (new_expr is Namespace) {
+ Namespace ns = (Namespace) new_expr;
+ FullNamedExpression retval = ns.Lookup (ec.DeclSpace, Identifier, loc);
+ if (retval == null)
+ Report.Error (234, loc, "The type or namespace name `{0}' could not be found in namespace `{1}'", Identifier, ns.FullName);
+ return retval;
}
Type expr_type = new_expr.Type;
return null;
}
- Expression member_lookup;
- member_lookup = MemberLookupFinal (ec, expr_type, expr_type, Identifier, loc);
- if (member_lookup == null)
+ Expression member_lookup = MemberLookupFinal (ec, expr_type, expr_type, Identifier, loc);
+ if (member_lookup == null) {
+ Report.Error (234, loc, "The type name `{0}' could not be found in type `{1}'",
+ Identifier, new_expr.FullName);
return null;
+ }
- if (member_lookup is TypeExpr){
- member_lookup.Resolve (ec, ResolveFlags.Type);
- return member_lookup;
+ if (!(member_lookup is TypeExpr)) {
+ Report.Error (118, loc, "'{0}.{1}' denotes a '{2}', where a type was expected",
+ new_expr.FullName, Identifier, member_lookup.ExprClassName ());
+ return null;
}
- return null;
+ member_lookup = member_lookup.Resolve (ec, ResolveFlags.Type);
+ return (member_lookup as TypeExpr);
}
public override void Emit (EmitContext ec)
//
// For now, fall back to the full lookup in that case.
//
- type = RootContext.LookupType (
- ec.DeclSpace, cname, false, loc);
-
+ FullNamedExpression e = ec.DeclSpace.LookupType (cname, false, loc);
+ if (e is TypeExpr)
+ type = ((TypeExpr) e).ResolveType (ec);
if (type == null)
return null;
}
UnsafeError (loc);
return null;
}
+
+ if (type.IsArray && (type.GetElementType () == TypeManager.arg_iterator_type ||
+ type.GetElementType () == TypeManager.typed_reference_type)) {
+ Report.Error (611, loc, "Array elements cannot be of type '{0}'", TypeManager.CSharpName (type.GetElementType ()));
+ return null;
+ }
eclass = ExprClass.Type;
return this;
return left + dim;
}
}
+
+ public override string FullName {
+ get {
+ return type.FullName;
+ }
+ }
}
//
projects / mono.git / blobdiff