diff options
Diffstat (limited to 'mcs/mcs/statement.cs')
| -rw-r--r-- | mcs/mcs/statement.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs index 897b3ab1a14..2baa1717521 100644 --- a/mcs/mcs/statement.cs +++ b/mcs/mcs/statement.cs @@ -844,7 +844,7 @@ namespace Mono.CSharp { if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess || eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) { - expr.Error_UnexpectedKind (ec.DeclContainer, "value, variable, property or indexer access ", loc); + expr.Error_UnexpectedKind (ec, "value, variable, property or indexer access ", loc); return false; } @@ -3939,7 +3939,7 @@ namespace Mono.CSharp { converted_vars [i].Emit (ec); ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void); } else { - Expression ml = Expression.MemberLookup(ec.ContainerType, TypeManager.idisposable_type, var.Type, "Dispose", Mono.CSharp.Location.Null); + Expression ml = Expression.MemberLookup(ec, TypeManager.idisposable_type, var.Type, "Dispose", Mono.CSharp.Location.Null); if (!(ml is MethodGroupExpr)) { var.Emit (ec); @@ -4009,7 +4009,7 @@ namespace Mono.CSharp { ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void); ig.MarkLabel (skip); } else { - Expression ml = Expression.MemberLookup(ec.ContainerType, TypeManager.idisposable_type, local_copy.LocalType, "Dispose", Mono.CSharp.Location.Null); + Expression ml = Expression.MemberLookup(ec, TypeManager.idisposable_type, local_copy.LocalType, "Dispose", Mono.CSharp.Location.Null); if (!(ml is MethodGroupExpr)) { ig.Emit (OpCodes.Ldloc, local_copy); @@ -4390,7 +4390,7 @@ namespace Mono.CSharp { !FetchGetCurrent (ec, return_type)) { move_next = TypeManager.bool_movenext_void; get_current = new PropertyExpr ( - ec.ContainerType, TypeManager.ienumerator_getcurrent, loc); + ec, TypeManager.ienumerator_getcurrent, loc); return true; } } else { @@ -4447,7 +4447,7 @@ namespace Mono.CSharp { bool FetchGetCurrent (EmitContext ec, Type t) { PropertyExpr pe = Expression.MemberLookup ( - ec.ContainerType, t, "Current", MemberTypes.Property, + ec, t, "Current", MemberTypes.Property, Expression.AllBindingFlags, loc) as PropertyExpr; if (pe == null) return false; @@ -4495,7 +4495,7 @@ namespace Mono.CSharp { bool TryType (EmitContext ec, Type t) { MethodGroupExpr mg = Expression.MemberLookup ( - ec.ContainerType, t, "GetEnumerator", MemberTypes.Method, + ec, t, "GetEnumerator", MemberTypes.Method, Expression.AllBindingFlags, loc) as MethodGroupExpr; if (mg == null) return false; |