//
using System;
-using System.Collections;
+using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
namespace Mono.CSharp {
- public class Yield : ResumableStatement {
+ class Yield : ResumableStatement {
Expression expr;
bool unwind_protect;
-
+ Iterator iterator;
int resume_pc;
public Yield (Expression expr, Location l)
loc = l;
}
- public static bool CheckContext (EmitContext ec, Location loc)
+ public static bool CheckContext (ResolveContext ec, Location loc)
{
- for (Block block = ec.CurrentBlock; block != null; block = block.Parent) {
- if (!block.Unsafe)
- continue;
-
- Report.Error (1629, loc, "Unsafe code may not appear in iterators");
- return false;
- }
-
//
// We can't use `ec.InUnsafe' here because it's allowed to have an iterator
// inside an unsafe class. See test-martin-29.cs for an example.
//
if (!ec.CurrentAnonymousMethod.IsIterator) {
- Report.Error (1621, loc,
+ ec.Report.Error (1621, loc,
"The yield statement cannot be used inside " +
"anonymous method blocks");
return false;
expr.MutateHoistedGenericType (storey);
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
expr = expr.Resolve (ec);
if (expr == null)
if (!CheckContext (ec, loc))
return false;
- Iterator iterator = ec.CurrentIterator;
+ iterator = ec.CurrentIterator;
if (expr.Type != iterator.OriginalIteratorType) {
expr = Convert.ImplicitConversionRequired (
ec, expr, iterator.OriginalIteratorType, loc);
protected override void DoEmit (EmitContext ec)
{
- ec.CurrentIterator.MarkYield (ec, expr, resume_pc, unwind_protect, resume_point);
+ iterator.MarkYield (ec, expr, resume_pc, unwind_protect, resume_point);
}
protected override void CloneTo (CloneContext clonectx, Statement t)
}
}
- public class YieldBreak : ExitStatement {
+ public class YieldBreak : ExitStatement
+ {
+ Iterator iterator;
+
public YieldBreak (Location l)
{
loc = l;
}
- public override void Error_FinallyClause ()
+ public override void Error_FinallyClause (Report Report)
{
Report.Error (1625, loc, "Cannot yield in the body of a finally clause");
}
throw new NotSupportedException ();
}
- protected override bool DoResolve (EmitContext ec)
+ protected override bool DoResolve (BlockContext ec)
{
+ iterator = ec.CurrentIterator;
return Yield.CheckContext (ec, loc);
}
protected override void DoEmit (EmitContext ec)
{
- ec.CurrentIterator.EmitYieldBreak (ec.ig, unwind_protect);
+ iterator.EmitYieldBreak (ec.ig, unwind_protect);
}
public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
class IteratorStatement : Statement
{
Iterator iterator;
- ExplicitBlock original_block;
+ Block original_block;
- public IteratorStatement (Iterator iterator, ExplicitBlock original_block)
+ public IteratorStatement (Iterator iterator, Block original_block)
{
this.iterator = iterator;
this.original_block = original_block;
t.iterator = (Iterator) iterator.Clone (clonectx);
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
ec.StartFlowBranching (iterator);
bool ok = original_block.Resolve (ec);
{
readonly IteratorStorey host;
- public IteratorMethod (IteratorStorey host, FullNamedExpression returnType, int mod, MemberName name)
+ public IteratorMethod (IteratorStorey host, FullNamedExpression returnType, Modifiers mod, MemberName name)
: base (host, null, returnType, mod | Modifiers.DEBUGGER_HIDDEN | Modifiers.COMPILER_GENERATED,
- name, Parameters.EmptyReadOnlyParameters, null)
+ name, ParametersCompiled.EmptyReadOnlyParameters, null)
{
this.host = host;
- Block = new ToplevelBlock (host.Iterator.Container.Toplevel, null, Location);
+ Block = new ToplevelBlock (Compiler, host.Iterator.Container.Toplevel, ParametersCompiled.EmptyReadOnlyParameters, Location);
}
- public override EmitContext CreateEmitContext (DeclSpace tc, ILGenerator ig)
+ public override EmitContext CreateEmitContext (ILGenerator ig)
{
- EmitContext ec = new EmitContext (
- this, tc, this.ds, Location, ig, MemberType, ModFlags, false);
+ EmitContext ec = new EmitContext (this, ig, MemberType);
ec.CurrentAnonymousMethod = host.Iterator;
return ec;
sealed class GetEnumeratorStatement : Statement
{
IteratorStorey host;
- Expression type;
+ IteratorMethod host_method;
Expression new_storey;
- public GetEnumeratorStatement (IteratorStorey host, Expression type)
+ public GetEnumeratorStatement (IteratorStorey host, IteratorMethod host_method)
{
this.host = host;
- this.type = type;
- loc = host.Location;
+ this.host_method = host_method;
+ loc = host_method.Location;
}
protected override void CloneTo (CloneContext clonectx, Statement target)
throw new NotSupportedException ();
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
- type = type.ResolveAsTypeTerminal (ec, false);
- if ((type == null) || (type.Type == null))
- return false;
-
TypeExpression storey_type_expr = new TypeExpression (host.TypeBuilder, loc);
- ArrayList init = null;
+ List<Expression> init = null;
if (host.hoisted_this != null) {
- init = new ArrayList (host.hoisted_params == null ? 1 : host.HoistedParameters.Count + 1);
+ init = new List<Expression> (host.hoisted_params == null ? 1 : host.HoistedParameters.Count + 1);
HoistedThis ht = host.hoisted_this;
- FieldExpr from = new FieldExpr (ht.Field.FieldBuilder, loc);
+ FieldExpr from = new FieldExpr (ht.Field, loc);
from.InstanceExpression = CompilerGeneratedThis.Instance;
init.Add (new ElementInitializer (ht.Field.Name, from, loc));
}
if (host.hoisted_params != null) {
if (init == null)
- init = new ArrayList (host.HoistedParameters.Count);
+ init = new List<Expression> (host.HoistedParameters.Count);
for (int i = 0; i < host.hoisted_params.Count; ++i) {
HoistedParameter hp = (HoistedParameter) host.hoisted_params [i];
HoistedParameter hp_cp = (HoistedParameter) host.hoisted_params_copy [i];
- FieldExpr from = new FieldExpr (hp_cp.Field.FieldBuilder, loc);
+ FieldExpr from = new FieldExpr (hp_cp.Field, loc);
from.InstanceExpression = CompilerGeneratedThis.Instance;
init.Add (new ElementInitializer (hp.Field.Name, from, loc));
}
if (init != null) {
- new_storey = new NewInitialize (storey_type_expr, new ArrayList (0),
+ new_storey = new NewInitialize (storey_type_expr, null,
new CollectionOrObjectInitializers (init, loc), loc);
} else {
- new_storey = new New (storey_type_expr, new ArrayList (0), loc);
+ new_storey = new New (storey_type_expr, null, loc);
}
new_storey = new_storey.Resolve (ec);
if (new_storey != null)
- new_storey = Convert.ImplicitConversionRequired (ec, new_storey, type.Type, loc);
+ new_storey = Convert.ImplicitConversionRequired (ec, new_storey, host_method.MemberType, loc);
if (TypeManager.int_interlocked_compare_exchange == null) {
- Type t = TypeManager.CoreLookupType ("System.Threading", "Interlocked", Kind.Class, true);
+ Type t = TypeManager.CoreLookupType (ec.Compiler, "System.Threading", "Interlocked", Kind.Class, true);
if (t != null) {
TypeManager.int_interlocked_compare_exchange = TypeManager.GetPredefinedMethod (
t, "CompareExchange", loc, TypeManager.int32_type,
Label label_init = ig.DefineLabel ();
ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldflda, host.PC.FieldBuilder);
+ ig.Emit (OpCodes.Ldflda, host.PC.Spec.MetaInfo);
IntConstant.EmitInt (ig, (int) Iterator.State.Start);
IntConstant.EmitInt (ig, (int) Iterator.State.Uninitialized);
ig.Emit (OpCodes.Call, TypeManager.int_interlocked_compare_exchange);
public GetEnumeratorMethod (IteratorStorey host, FullNamedExpression returnType, MemberName name)
: base (host, returnType, 0, name)
{
- Block.AddStatement (new GetEnumeratorStatement (host, type_name));
+ Block.AddStatement (new GetEnumeratorStatement (host, this));
}
}
throw new NotSupportedException ();
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
return true;
}
{
host.AddMethod (this);
- Block = new ToplevelBlock (host.Iterator.Container, null, Location);
+ Block = new ToplevelBlock (Compiler, host.Iterator.Container, ParametersCompiled.EmptyReadOnlyParameters, Location);
Block.AddStatement (new DisposeMethodStatement (host.Iterator));
}
}
: base (null, loc)
{
this.method = method;
+ eclass = ExprClass.Unresolved;
}
- public override Expression DoResolve (EmitContext ec)
+ protected override Expression DoResolve (ResolveContext ec)
{
Methods = new MethodBase [] { method.MethodBuilder };
type = method.Parent.TypeBuilder;
}
}
+ class DynamicFieldExpr : FieldExpr
+ {
+ readonly Field field;
+
+ public DynamicFieldExpr (Field field, Location loc)
+ : base (loc)
+ {
+ this.field = field;
+ }
+
+ protected override Expression DoResolve (ResolveContext ec)
+ {
+ spec = field.Spec;
+ type = TypeManager.TypeToCoreType (spec.FieldType);
+ InstanceExpression = new CompilerGeneratedThis (type, Location);
+ return base.DoResolve (ec);
+ }
+ }
+
public readonly Iterator Iterator;
TypeExpr iterator_type_expr;
TypeExpr enumerator_type;
TypeExpr enumerable_type;
-#if GMCS_SOURCE
TypeArguments generic_args;
TypeExpr generic_enumerator_type;
TypeExpr generic_enumerable_type;
-#else
- const TypeArguments generic_args = null;
-#endif
- ArrayList hoisted_params_copy;
+ List<HoistedParameter> hoisted_params_copy;
int local_name_idx;
public IteratorStorey (Iterator iterator)
iterator.OriginalMethod as MemberBase, iterator.GenericMethod, "Iterator")
{
this.Iterator = iterator;
- HasHoistedVariables = true;
}
public Field PC {
get { return current_field; }
}
- public ArrayList HoistedParameters {
+ public IList<HoistedParameter> HoistedParameters {
get { return hoisted_params; }
}
protected override TypeExpr [] ResolveBaseTypes (out TypeExpr base_class)
{
iterator_type_expr = new TypeExpression (MutateType (Iterator.OriginalIteratorType), Location);
+ generic_args = new TypeArguments (iterator_type_expr);
-#if GMCS_SOURCE
- generic_args = new TypeArguments (Location);
- generic_args.Add (iterator_type_expr);
-#endif
-
- ArrayList list = new ArrayList ();
+ var list = new List<FullNamedExpression> ();
if (Iterator.IsEnumerable) {
enumerable_type = new TypeExpression (
TypeManager.ienumerable_type, Location);
list.Add (enumerable_type);
-#if GMCS_SOURCE
- generic_enumerable_type = new GenericTypeExpr (
- TypeManager.generic_ienumerable_type,
- generic_args, Location);
- list.Add (generic_enumerable_type);
-#endif
+ if (TypeManager.generic_ienumerable_type != null) {
+ generic_enumerable_type = new GenericTypeExpr (
+ TypeManager.generic_ienumerable_type,
+ generic_args, Location);
+ list.Add (generic_enumerable_type);
+ }
}
enumerator_type = new TypeExpression (
list.Add (new TypeExpression (TypeManager.idisposable_type, Location));
-#if GMCS_SOURCE
- generic_enumerator_type = new GenericTypeExpr (
- TypeManager.generic_ienumerator_type,
- generic_args, Location);
- list.Add (generic_enumerator_type);
-#endif
+ if (TypeManager.generic_ienumerator_type != null) {
+ generic_enumerator_type = new GenericTypeExpr (
+ TypeManager.generic_ienumerator_type,
+ generic_args, Location);
+ list.Add (generic_enumerator_type);
+ }
type_bases = list;
//
// TODO: Do it for assigned/modified parameters only
//
- hoisted_params_copy = new ArrayList (hoisted_params.Count);
+ hoisted_params_copy = new List<HoistedParameter> (hoisted_params.Count);
foreach (HoistedParameter hp in hoisted_params) {
hoisted_params_copy.Add (new HoistedParameter (hp, "<$>" + hp.Field.Name));
}
}
-#if GMCS_SOURCE
- Define_Current (true);
-#endif
+ if (generic_enumerator_type != null)
+ Define_Current (true);
+
Define_Current (false);
new DisposeMethod (this);
Define_Reset ();
if (Iterator.IsEnumerable) {
- MemberName name = new MemberName (
- new MemberName ("System.Collections.IEnumerable", Location), "GetEnumerator", Location);
-
-#if GMCS_SOURCE
- Method get_enumerator = new IteratorMethod (this, enumerator_type, 0, name);
-
- name = new MemberName (
- new MemberName ("System.Collections.Generic.IEnumerable", generic_args, Location), "GetEnumerator", Location);
- Method gget_enumerator = new GetEnumeratorMethod (this, generic_enumerator_type, name);
-
- //
- // Just call generic GetEnumerator implementation
- //
- get_enumerator.Block.AddStatement (
- new Return (new Invocation (new DynamicMethodGroupExpr (gget_enumerator, Location), new ArrayList (0)), Location));
-
- AddMethod (get_enumerator);
- AddMethod (gget_enumerator);
-#else
- AddMethod (new GetEnumeratorMethod (this, enumerator_type, name));
-#endif
+ MemberName name = new MemberName (QualifiedAliasMember.GlobalAlias, "System", null, Location);
+ name = new MemberName (name, "Collections", Location);
+ name = new MemberName (name, "IEnumerable", Location);
+ name = new MemberName (name, "GetEnumerator", Location);
+
+ if (generic_enumerator_type != null) {
+ Method get_enumerator = new IteratorMethod (this, enumerator_type, 0, name);
+
+ name = new MemberName (name.Left.Left, "Generic", Location);
+ name = new MemberName (name, "IEnumerable", generic_args, Location);
+ name = new MemberName (name, "GetEnumerator", Location);
+ Method gget_enumerator = new GetEnumeratorMethod (this, generic_enumerator_type, name);
+
+ //
+ // Just call generic GetEnumerator implementation
+ //
+ get_enumerator.Block.AddStatement (
+ new Return (new Invocation (new DynamicMethodGroupExpr (gget_enumerator, Location), null), Location));
+
+ AddMethod (get_enumerator);
+ AddMethod (gget_enumerator);
+ } else {
+ AddMethod (new GetEnumeratorMethod (this, enumerator_type, name));
+ }
}
}
- protected override void EmitHoistedParameters (EmitContext ec, ArrayList hoisted)
+ protected override void EmitHoistedParameters (EmitContext ec, IList<HoistedParameter> hoisted)
{
base.EmitHoistedParameters (ec, hoisted);
base.EmitHoistedParameters (ec, hoisted_params_copy);
void Define_Current (bool is_generic)
{
- MemberName left;
TypeExpr type;
+ MemberName name = new MemberName (QualifiedAliasMember.GlobalAlias, "System", null, Location);
+ name = new MemberName (name, "Collections", Location);
+
if (is_generic) {
- left = new MemberName (
- "System.Collections.Generic.IEnumerator",
- generic_args, Location);
+ name = new MemberName (name, "Generic", Location);
+ name = new MemberName (name, "IEnumerator", generic_args, Location);
type = iterator_type_expr;
} else {
- left = new MemberName ("System.Collections.IEnumerator", Location);
+ name = new MemberName (name, "IEnumerator");
type = TypeManager.system_object_expr;
}
- MemberName name = new MemberName (left, "Current", null, Location);
-
- ToplevelBlock get_block = new ToplevelBlock (Location);
- get_block.AddStatement (new CurrentBlock (this, is_generic));
+ name = new MemberName (name, "Current", Location);
+ ToplevelBlock get_block = new ToplevelBlock (Compiler, Location);
+ get_block.AddStatement (new Return (new DynamicFieldExpr (CurrentField, Location), Location));
+
Accessor getter = new Accessor (get_block, 0, null, null, Location);
Property current = new Property (
this, null, TypeManager.system_void_expr,
Modifiers.PUBLIC | Modifiers.DEBUGGER_HIDDEN,
new MemberName ("Reset", Location),
- Parameters.EmptyReadOnlyParameters, null);
+ ParametersCompiled.EmptyReadOnlyParameters, null);
AddMethod (reset);
- reset.Block = new ToplevelBlock (Location);
- reset.Block.AddStatement (Create_ThrowNotSupported ());
- }
-
- Statement Create_ThrowNotSupported ()
- {
- TypeExpr ex_type = new TypeLookupExpression ("System.NotSupportedException");
-
- return new Throw (new New (ex_type, null, Location), Location);
- }
-
- protected class CurrentBlock : Statement {
- IteratorStorey host;
- bool is_generic;
+ reset.Block = new ToplevelBlock (Compiler, Location);
- public CurrentBlock (IteratorStorey host, bool is_generic)
- {
- this.host = host;
- this.is_generic = is_generic;
- loc = host.Location;
- }
-
- protected override void CloneTo (CloneContext clonectx, Statement target)
- {
- throw new NotSupportedException ();
- }
-
- public override bool Resolve (EmitContext ec)
- {
- // We emit a 'ret', so prevent the enclosing TopLevelBlock from emitting one too
- ec.CurrentBranching.CurrentUsageVector.Goto ();
- return true;
- }
-
- protected override void DoEmit (EmitContext ec)
- {
- ILGenerator ig = ec.ig;
-
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, host.CurrentField.FieldBuilder);
- if (!is_generic)
- ig.Emit (OpCodes.Box, host.CurrentField.MemberType);
- ig.Emit (OpCodes.Ret);
- }
+ Type ex_type = TypeManager.CoreLookupType (Compiler, "System", "NotSupportedException", Kind.Class, true);
+ if (ex_type == null)
+ return;
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- throw new NotSupportedException ();
- }
+ reset.Block.AddStatement (new Throw (new New (new TypeExpression (ex_type, Location), null, Location), Location));
}
}
AnonymousMethodMethod method;
public readonly TypeContainer Host;
public readonly bool IsEnumerable;
+ List<ResumableStatement> resume_points;
//
// The state as we generate the iterator
Start = 0
}
- public override void AddStoreyReference (AnonymousMethodStorey storey)
- {
- // do nothing
- }
-
public void EmitYieldBreak (ILGenerator ig, bool unwind_protect)
{
ig.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, move_next_error);
ILGenerator ig = ec.ig;
ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec.MetaInfo);
ig.Emit (OpCodes.Ldarg_0);
IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.PC.Spec.MetaInfo);
// We only care if the PC is zero (start executing) or non-zero (don't do anything)
ig.Emit (OpCodes.Brtrue, move_next_error);
current_pc = ec.GetTemporaryLocal (TypeManager.uint32_type);
ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec.MetaInfo);
ig.Emit (OpCodes.Stloc, current_pc);
// We're actually in state 'running', but this is as good a PC value as any if there's an abnormal exit
ig.Emit (OpCodes.Ldarg_0);
IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.PC.Spec.MetaInfo);
Label [] labels = new Label [1 + resume_points.Count];
labels [0] = ig.DefineLabel ();
bool need_skip_finally = false;
for (int i = 0; i < resume_points.Count; ++i) {
- ResumableStatement s = (ResumableStatement) resume_points [i];
+ ResumableStatement s = resume_points [i];
need_skip_finally |= s is ExceptionStatement;
labels [i+1] = s.PrepareForEmit (ec);
}
ig.Emit (OpCodes.Ldarg_0);
IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.PC.Spec.MetaInfo);
ig.MarkLabel (move_next_error);
ig.Emit (OpCodes.Ldc_I4_0);
if (labels != null) {
current_pc = ec.GetTemporaryLocal (TypeManager.uint32_type);
ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec.MetaInfo);
ig.Emit (OpCodes.Stloc, current_pc);
}
ig.Emit (OpCodes.Ldarg_0);
IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.PC.Spec.MetaInfo);
if (labels != null) {
//SymbolWriter.StartIteratorDispatcher (ec.ig);
ig.MarkLabel (end);
}
-
- ArrayList resume_points;
public int AddResumePoint (ResumableStatement stmt)
{
if (resume_points == null)
- resume_points = new ArrayList ();
+ resume_points = new List<ResumableStatement> ();
+
resume_points.Add (stmt);
return resume_points.Count;
}
// Store the new current
ig.Emit (OpCodes.Ldarg_0);
expr.Emit (ec);
- ig.Emit (OpCodes.Stfld, IteratorHost.CurrentField.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.CurrentField.Spec.MetaInfo);
// store resume program-counter
ig.Emit (OpCodes.Ldarg_0);
IntConstant.EmitInt (ig, resume_pc);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ig.Emit (OpCodes.Stfld, IteratorHost.PC.Spec.MetaInfo);
// mark finally blocks as disabled
if (unwind_protect && skip_finally != null) {
//
// Our constructor
//
- private Iterator (IMethodData method, TypeContainer host, Type iterator_type, bool is_enumerable)
+ private Iterator (CompilerContext ctx, IMethodData method, TypeContainer host, Type iterator_type, bool is_enumerable)
: base (
- new ToplevelBlock (method.Block, Parameters.EmptyReadOnlyParameters, method.Block.StartLocation),
+ new ToplevelBlock (ctx, method.Block, ParametersCompiled.EmptyReadOnlyParameters, method.Block.StartLocation),
TypeManager.bool_type,
method.Location)
{
this.OriginalIteratorType = iterator_type;
this.IsEnumerable = is_enumerable;
this.Host = host;
+ this.type = method.ReturnType;
IteratorHost = Block.ChangeToIterator (this, method.Block);
}
return OriginalMethod.GetSignatureForError ();
}
- public override Expression DoResolve (EmitContext ec)
+ protected override Expression DoResolve (ResolveContext ec)
{
method = new AnonymousMethodMethod (Storey,
this, Storey, null, TypeManager.system_boolean_expr,
Modifiers.PUBLIC, OriginalMethod.GetSignatureForError (),
new MemberName ("MoveNext", Location),
- Parameters.EmptyReadOnlyParameters);
+ ParametersCompiled.EmptyReadOnlyParameters);
- if (!Compatible (ec))
+ if (Compatible (ec) == null)
return null;
IteratorHost.DefineIteratorMembers ();
eclass = ExprClass.Value;
- type = ec.ReturnType;
return this;
}
ig.Emit (OpCodes.Dup);
IntConstant.EmitInt (ig, (int)State.Uninitialized);
- FieldInfo field = IteratorHost.PC.FieldBuilder;
-#if GMCS_SOURCE
+ FieldInfo field = IteratorHost.PC.Spec.MetaInfo;
if (Storey.MemberName.IsGeneric)
field = TypeBuilder.GetField (Storey.Instance.Type, field);
-#endif
+
ig.Emit (OpCodes.Stfld, field);
}
}
- public override Expression CreateExpressionTree (EmitContext ec)
+ public override Expression CreateExpressionTree (ResolveContext ec)
{
throw new NotSupportedException ("ET");
}
- public static void CreateIterator (IMethodData method, TypeContainer parent, int modifiers)
+ public static void CreateIterator (IMethodData method, TypeContainer parent, Modifiers modifiers, CompilerContext ctx)
{
bool is_enumerable;
Type iterator_type;
return;
if (!CheckType (ret, out iterator_type, out is_enumerable)) {
- Report.Error (1624, method.Location,
+ ctx.Report.Error (1624, method.Location,
"The body of `{0}' cannot be an iterator block " +
"because `{1}' is not an iterator interface type",
method.GetSignatureForError (),
return;
}
- Parameters parameters = method.ParameterInfo;
+ ParametersCompiled parameters = method.ParameterInfo;
for (int i = 0; i < parameters.Count; i++) {
Parameter p = parameters [i];
Parameter.Modifier mod = p.ModFlags;
if ((mod & Parameter.Modifier.ISBYREF) != 0) {
- Report.Error (1623, p.Location,
+ ctx.Report.Error (1623, p.Location,
"Iterators cannot have ref or out parameters");
return;
}
- if ((mod & Parameter.Modifier.ARGLIST) != 0) {
- Report.Error (1636, method.Location,
+ if (p is ArglistParameter) {
+ ctx.Report.Error (1636, method.Location,
"__arglist is not allowed in parameter list of iterators");
return;
}
if (parameters.Types [i].IsPointer) {
- Report.Error (1637, p.Location,
+ ctx.Report.Error (1637, p.Location,
"Iterators cannot have unsafe parameters or " +
"yield types");
return;
}
if ((modifiers & Modifiers.UNSAFE) != 0) {
- Report.Error (1629, method.Location, "Unsafe code may not appear in iterators");
+ ctx.Report.Error (1629, method.Location, "Unsafe code may not appear in iterators");
return;
}
- Iterator iter = new Iterator (method, parent, iterator_type, is_enumerable);
+ Iterator iter = new Iterator (ctx, method, parent, iterator_type, is_enumerable);
iter.Storey.DefineType ();
}
Type gt = TypeManager.DropGenericTypeArguments (ret);
if (gt == TypeManager.generic_ienumerable_type) {
- original_iterator_type = args [0];
+ original_iterator_type = TypeManager.TypeToCoreType (args [0]);
is_enumerable = true;
return true;
}
if (gt == TypeManager.generic_ienumerator_type) {
- original_iterator_type = args [0];
+ original_iterator_type = TypeManager.TypeToCoreType (args [0]);
is_enumerable = false;
return true;
}
projects / mono.git / blobdiff