return ok;
}
-
- protected void CheckObsolete (Type type)
- {
- ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
- if (obsolete_attr == null)
- return;
-
- AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, loc);
- }
-
+
/// <summary>
/// Return value indicates whether all code paths emitted return.
/// </summary>
if (texpr == null)
return false;
- VariableType = texpr.Type;
+ VariableType = texpr.ResolveType (ec);
}
if (VariableType == TypeManager.void_type) {
public abstract void EmitExit (ILGenerator ig);
}
- class ExpressionEmitter: Emitter {
+ class ExpressionEmitter : Emitter {
public ExpressionEmitter (Expression converted, LocalInfo li) :
base (converted, li)
{
}
}
- class StringEmitter: Emitter {
+ class StringEmitter : Emitter {
LocalBuilder pinned_string;
Location loc;
if (texpr == null)
return false;
- expr_type = texpr.Type;
-
- CheckObsolete (expr_type);
+ expr_type = texpr.ResolveType (ec);
data = new Emitter [declarators.Count];
if (!TypeManager.VerifyUnManaged (child.Type, loc))
return false;
+ if (!Convert.ImplicitConversionExists (ec, e, expr_type)) {
+ e.Error_ValueCannotBeConverted (e.Location, expr_type, false);
+ return false;
+ }
+
data [i] = new ExpressionEmitter (e, vi);
i++;
}
}
- public class Catch: Statement {
+ public class Catch : Statement {
public readonly string Name;
public readonly Block Block;
type = te.ResolveType (ec);
- CheckObsolete (type);
-
if (type != TypeManager.exception_type && !type.IsSubclassOf (TypeManager.exception_type)){
Error (155, "The type caught or thrown must be derived from System.Exception");
return false;
ArrayList var_list;
Expression expr;
Type expr_type;
- Expression conv;
Expression [] resolved_vars;
Expression [] converted_vars;
ExpressionStatement [] assign;
if (texpr == null)
return false;
- expr_type = texpr.Type;
+ expr_type = texpr.ResolveType (ec);
//
// The type must be an IDisposable or an implicit conversion
continue;
}
- converted_vars [i] = Convert.ImplicitConversionRequired (
+ converted_vars [i] = Convert.ImplicitConversion (
ec, var, TypeManager.idisposable_type, loc);
- if (converted_vars [i] == null)
+ if (converted_vars [i] == null) {
+ Error_IsNotConvertibleToIDisposable ();
return false;
+ }
i++;
}
return true;
}
+ void Error_IsNotConvertibleToIDisposable ()
+ {
+ Report.Error (1674, loc, "`{0}': type used in a using statement must be implicitly convertible to `System.IDisposable'",
+ TypeManager.CSharpName (expr_type));
+ }
+
bool ResolveExpression (EmitContext ec)
{
if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
if (Convert.ImplicitConversion (ec, expr, TypeManager.idisposable_type, loc) == null) {
- Report.Error (1674, loc, "`{0}': type used in a using statement must be implicitly convertible to `System.IDisposable'",
- TypeManager.CSharpName (expr_type));
+ Error_IsNotConvertibleToIDisposable ();
return false;
}
}
//
ILGenerator ig = ec.ig;
local_copy = ig.DeclareLocal (expr_type);
- if (conv != null)
- conv.Emit (ec);
- else
- expr.Emit (ec);
+
+ expr.Emit (ec);
ig.Emit (OpCodes.Stloc, local_copy);
if (emit_finally)
Type var_type = texpr.Type;
+ if (expr.eclass == ExprClass.MethodGroup || expr is AnonymousMethod) {
+ Report.Error (446, expr.Location, "Foreach statement cannot operate on a `{0}'",
+ expr.ExprClassName);
+ return false;
+ }
+
//
// We need an instance variable. Not sure this is the best
// way of doing this.
//
if (!(expr.eclass == ExprClass.Variable || expr.eclass == ExprClass.Value ||
expr.eclass == ExprClass.PropertyAccess || expr.eclass == ExprClass.IndexerAccess)){
- collection.error1579 ();
+ collection.Error_Enumerator ();
return false;
}
MethodInfo move_next;
Type var_type, enumerator_type;
bool is_disposable;
+ bool enumerator_found;
public CollectionForeach (Type var_type, Expression var,
Expression expr, Statement stmt, Location l)
bool GetEnumeratorFilter (EmitContext ec, MethodInfo mi)
{
- Type [] args = TypeManager.GetArgumentTypes (mi);
- if (args != null){
- if (args.Length != 0)
- return false;
- }
-
- if (TypeManager.IsOverride (mi))
- return false;
-
- // Check whether GetEnumerator is public
- if ((mi.Attributes & MethodAttributes.Public) != MethodAttributes.Public)
- return false;
+ Type return_type = mi.ReturnType;
- if ((mi.ReturnType == TypeManager.ienumerator_type) && (mi.DeclaringType == TypeManager.string_type))
+ if ((return_type == TypeManager.ienumerator_type) && (mi.DeclaringType == TypeManager.string_type))
//
// Apply the same optimization as MS: skip the GetEnumerator
// returning an IEnumerator, and use the one returning a
// with this `GetEnumerator'
//
- Type return_type = mi.ReturnType;
- if (mi.ReturnType == TypeManager.ienumerator_type ||
+ if (return_type == TypeManager.ienumerator_type ||
TypeManager.ienumerator_type.IsAssignableFrom (return_type) ||
(!RootContext.StdLib && TypeManager.ImplementsInterface (return_type, TypeManager.ienumerator_type))) {
//
// find if they support the GetEnumerator pattern.
//
- if (!FetchMoveNext (ec, return_type))
- return false;
-
- if (!FetchGetCurrent (ec, return_type))
+ if (TypeManager.HasElementType (return_type) || !FetchMoveNext (ec, return_type) || !FetchGetCurrent (ec, return_type)) {
+ Report.Error (202, loc, "foreach statement requires that the return type `{0}' of `{1}' must have a suitable public MoveNext method and public Current property",
+ TypeManager.CSharpName (return_type), TypeManager.CSharpSignature (mi));
return false;
+ }
}
enumerator_type = return_type;
return null;
}
- public void error1579 ()
+ public void Error_Enumerator ()
{
+ if (enumerator_found) {
+ return;
+ }
+
Report.Error (1579, loc,
- "foreach statement cannot operate on variables of type `{0}' because it does not contain a definition for `GetEnumerator' or is not accessible",
- TypeManager.CSharpName (expr.Type));
+ "foreach statement cannot operate on variables of type `{0}' because it does not contain a definition for `GetEnumerator' or is not accessible",
+ TypeManager.CSharpName (expr.Type));
}
bool TryType (EmitContext ec, Type t)
PropertyExpr tmp_get_cur = null;
Type tmp_enumerator_type = enumerator_type;
foreach (MethodInfo mi in mg.Methods) {
+ Type [] args = TypeManager.GetArgumentTypes (mi);
+ if (args != null && args.Length != 0)
+ continue;
+
+ // Check whether GetEnumerator is public
+ if ((mi.Attributes & MethodAttributes.Public) != MethodAttributes.Public)
+ continue;
+
+ if (TypeManager.IsOverride (mi))
+ continue;
+
+ enumerator_found = true;
+
if (!GetEnumeratorFilter (ec, mi)) {
continue;
}
is_disposable = true;
if (!ProbeCollectionType (ec, expr.Type)) {
- error1579 ();
+ Error_Enumerator ();
return false;
}
projects / mono.git / blobdiff