//
using System;
-using System.Collections;
+using System.Collections.Generic;
using System.Reflection;
using System.Reflection.Emit;
public 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;
return true;
}
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- 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);
- }
-
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- // nothing to do
+ iterator.EmitYieldBreak (ec, unwind_protect);
}
}
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);
{
iterator.EmitMoveNext (ec, original_block);
}
-
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- original_block.MutateHoistedGenericType (storey);
- iterator.MutateHoistedGenericType (storey);
- }
}
public class IteratorStorey : AnonymousMethodStorey
{
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, ParametersCompiled.EmptyReadOnlyParameters, null)
{
this.host = host;
- Block = new ToplevelBlock (host.Iterator.Container.Toplevel, ParametersCompiled.EmptyReadOnlyParameters, 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;
throw new NotSupportedException ();
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
- TypeExpression storey_type_expr = new TypeExpression (host.TypeBuilder, loc);
- ArrayList init = null;
+ TypeExpression storey_type_expr = new TypeExpression (host.Definition, loc);
+ 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);
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);
+ TypeSpec t = TypeManager.CoreLookupType (ec.Compiler, "System.Threading", "Interlocked", MemberKind.Class, true);
if (t != null) {
- TypeManager.int_interlocked_compare_exchange = TypeManager.GetPredefinedMethod (
- t, "CompareExchange", loc, TypeManager.int32_type,
- TypeManager.int32_type, TypeManager.int32_type);
+ var p = ParametersCompiled.CreateFullyResolved (
+ new[] {
+ new ParameterData (null, Parameter.Modifier.REF),
+ new ParameterData (null, Parameter.Modifier.NONE),
+ new ParameterData (null, Parameter.Modifier.NONE)
+ },
+ new[] {
+ TypeManager.int32_type, TypeManager.int32_type, TypeManager.int32_type
+ }
+ );
+ var f = new MemberFilter ("CompareExchange", 0, MemberKind.Method, p, TypeManager.int32_type);
+ TypeManager.int_interlocked_compare_exchange = TypeManager.GetPredefinedMethod (t, f, loc);
}
}
protected override void DoEmit (EmitContext ec)
{
- ILGenerator ig = ec.ig;
- Label label_init = ig.DefineLabel ();
+ Label label_init = ec.DefineLabel ();
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldflda, host.PC.FieldBuilder);
- IntConstant.EmitInt (ig, (int) Iterator.State.Start);
- IntConstant.EmitInt (ig, (int) Iterator.State.Uninitialized);
- ig.Emit (OpCodes.Call, TypeManager.int_interlocked_compare_exchange);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ldflda, host.PC.Spec);
+ ec.EmitInt ((int) Iterator.State.Start);
+ ec.EmitInt ((int) Iterator.State.Uninitialized);
+ ec.Emit (OpCodes.Call, TypeManager.int_interlocked_compare_exchange);
- IntConstant.EmitInt (ig, (int) Iterator.State.Uninitialized);
- ig.Emit (OpCodes.Bne_Un_S, label_init);
+ ec.EmitInt ((int) Iterator.State.Uninitialized);
+ ec.Emit (OpCodes.Bne_Un_S, label_init);
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ret);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ret);
- ig.MarkLabel (label_init);
+ ec.MarkLabel (label_init);
new_storey.Emit (ec);
- ig.Emit (OpCodes.Ret);
- }
-
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- throw new NotSupportedException ();
+ ec.Emit (OpCodes.Ret);
}
}
throw new NotSupportedException ();
}
- public override bool Resolve (EmitContext ec)
+ public override bool Resolve (BlockContext ec)
{
return true;
}
{
iterator.EmitDispose (ec);
}
-
- public override void MutateHoistedGenericType (AnonymousMethodStorey storey)
- {
- throw new NotSupportedException ();
- }
}
public DisposeMethod (IteratorStorey host)
{
host.AddMethod (this);
- Block = new ToplevelBlock (host.Iterator.Container, ParametersCompiled.EmptyReadOnlyParameters, 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;
+ Methods = new List<MemberSpec> (1) { method.Spec };
+ type = method.Parent.Definition;
InstanceExpression = new CompilerGeneratedThis (type, Location);
return base.DoResolve (ec);
}
this.field = field;
}
- public override Expression DoResolve (EmitContext ec)
+ protected override Expression DoResolve (ResolveContext ec)
{
- FieldInfo = field.FieldBuilder;
- type = TypeManager.TypeToCoreType (FieldInfo.FieldType);
+ spec = field.Spec;
+ type = spec.MemberType;
InstanceExpression = new CompilerGeneratedThis (type, Location);
return base.DoResolve (ec);
}
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)
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);
+ var mtype = Iterator.OriginalIteratorType;
+ if (Mutator != null)
+ mtype = Mutator.Mutate (mtype);
-#if GMCS_SOURCE
+ iterator_type_expr = new TypeExpression (mtype, Location);
generic_args = new TypeArguments (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;
return "<" + local_info.Name + ">__" + local_name_idx++.ToString ();
}
- public void DefineIteratorMembers ()
+ protected override bool DoDefineMembers ()
+ {
+ DefineIteratorMembers ();
+ return base.DoDefineMembers ();
+ }
+
+ void DefineIteratorMembers ()
{
pc_field = AddCompilerGeneratedField ("$PC", TypeManager.system_int32_expr);
current_field = AddCompilerGeneratedField ("$current", iterator_type_expr);
//
// 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 ("System");
+ 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 GMCS_SOURCE
- Method get_enumerator = new IteratorMethod (this, enumerator_type, 0, name);
+ 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);
+ 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), new ArrayList (0)), Location));
+ //
+ // 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));
-#endif
+ 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 name;
TypeExpr type;
- name = new MemberName ("System");
+ MemberName name = new MemberName (QualifiedAliasMember.GlobalAlias, "System", null, Location);
name = new MemberName (name, "Collections", Location);
if (is_generic) {
name = new MemberName (name, "Current", Location);
- ToplevelBlock get_block = new ToplevelBlock (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);
ParametersCompiled.EmptyReadOnlyParameters, null);
AddMethod (reset);
- reset.Block = new ToplevelBlock (Location);
+ reset.Block = new ToplevelBlock (Compiler, Location);
- Type ex_type = TypeManager.CoreLookupType ("System", "NotSupportedException", Kind.Class, true);
+ TypeSpec ex_type = TypeManager.CoreLookupType (Compiler, "System", "NotSupportedException", MemberKind.Class, true);
if (ex_type == null)
return;
AnonymousMethodMethod method;
public readonly TypeContainer Host;
public readonly bool IsEnumerable;
+ List<ResumableStatement> resume_points;
//
// The state as we generate the iterator
get { return OriginalMethod.GenericMethod; }
}
- public readonly Type OriginalIteratorType;
+ public readonly TypeSpec OriginalIteratorType;
readonly IteratorStorey IteratorHost;
Start = 0
}
- public void EmitYieldBreak (ILGenerator ig, bool unwind_protect)
+ public void EmitYieldBreak (EmitContext ec, bool unwind_protect)
{
- ig.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, move_next_error);
+ ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, move_next_error);
}
void EmitMoveNext_NoResumePoints (EmitContext ec, Block original_block)
{
- ILGenerator ig = ec.ig;
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec);
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, IteratorHost.PC.FieldBuilder);
-
- ig.Emit (OpCodes.Ldarg_0);
- IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.EmitInt ((int) State.After);
+ ec.Emit (OpCodes.Stfld, IteratorHost.PC.Spec);
// We only care if the PC is zero (start executing) or non-zero (don't do anything)
- ig.Emit (OpCodes.Brtrue, move_next_error);
+ ec.Emit (OpCodes.Brtrue, move_next_error);
- SymbolWriter.StartIteratorBody (ec.ig);
+ SymbolWriter.StartIteratorBody (ec);
original_block.Emit (ec);
- SymbolWriter.EndIteratorBody (ec.ig);
+ SymbolWriter.EndIteratorBody (ec);
- ig.MarkLabel (move_next_error);
- ig.Emit (OpCodes.Ldc_I4_0);
- ig.Emit (OpCodes.Ret);
+ ec.MarkLabel (move_next_error);
+ ec.Emit (OpCodes.Ldc_I4_0);
+ ec.Emit (OpCodes.Ret);
}
internal void EmitMoveNext (EmitContext ec, Block original_block)
{
- ILGenerator ig = ec.ig;
-
- move_next_ok = ig.DefineLabel ();
- move_next_error = ig.DefineLabel ();
+ move_next_ok = ec.DefineLabel ();
+ move_next_error = ec.DefineLabel ();
if (resume_points == null) {
EmitMoveNext_NoResumePoints (ec, original_block);
}
current_pc = ec.GetTemporaryLocal (TypeManager.uint32_type);
- ig.Emit (OpCodes.Ldarg_0);
- ig.Emit (OpCodes.Ldfld, IteratorHost.PC.FieldBuilder);
- ig.Emit (OpCodes.Stloc, current_pc);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec);
+ ec.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);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.EmitInt ((int) State.After);
+ ec.Emit (OpCodes.Stfld, IteratorHost.PC.Spec);
Label [] labels = new Label [1 + resume_points.Count];
- labels [0] = ig.DefineLabel ();
+ labels [0] = ec.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);
}
if (need_skip_finally) {
skip_finally = ec.GetTemporaryLocal (TypeManager.bool_type);
- ig.Emit (OpCodes.Ldc_I4_0);
- ig.Emit (OpCodes.Stloc, skip_finally);
+ ec.Emit (OpCodes.Ldc_I4_0);
+ ec.Emit (OpCodes.Stloc, skip_finally);
}
- SymbolWriter.StartIteratorDispatcher (ec.ig);
- ig.Emit (OpCodes.Ldloc, current_pc);
- ig.Emit (OpCodes.Switch, labels);
+ SymbolWriter.StartIteratorDispatcher (ec);
+ ec.Emit (OpCodes.Ldloc, current_pc);
+ ec.Emit (OpCodes.Switch, labels);
- ig.Emit (OpCodes.Br, move_next_error);
- SymbolWriter.EndIteratorDispatcher (ec.ig);
+ ec.Emit (OpCodes.Br, move_next_error);
+ SymbolWriter.EndIteratorDispatcher (ec);
- ig.MarkLabel (labels [0]);
+ ec.MarkLabel (labels [0]);
- SymbolWriter.StartIteratorBody (ec.ig);
+ SymbolWriter.StartIteratorBody (ec);
original_block.Emit (ec);
- SymbolWriter.EndIteratorBody (ec.ig);
+ SymbolWriter.EndIteratorBody (ec);
- SymbolWriter.StartIteratorDispatcher (ec.ig);
+ SymbolWriter.StartIteratorDispatcher (ec);
- ig.Emit (OpCodes.Ldarg_0);
- IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.EmitInt ((int) State.After);
+ ec.Emit (OpCodes.Stfld, IteratorHost.PC.Spec);
- ig.MarkLabel (move_next_error);
- ig.Emit (OpCodes.Ldc_I4_0);
- ig.Emit (OpCodes.Ret);
+ ec.MarkLabel (move_next_error);
+ ec.EmitInt (0);
+ ec.Emit (OpCodes.Ret);
- ig.MarkLabel (move_next_ok);
- ig.Emit (OpCodes.Ldc_I4_1);
- ig.Emit (OpCodes.Ret);
+ ec.MarkLabel (move_next_ok);
+ ec.Emit (OpCodes.Ldc_I4_1);
+ ec.Emit (OpCodes.Ret);
- SymbolWriter.EndIteratorDispatcher (ec.ig);
+ SymbolWriter.EndIteratorDispatcher (ec);
}
public void EmitDispose (EmitContext ec)
{
- ILGenerator ig = ec.ig;
-
- Label end = ig.DefineLabel ();
+ Label end = ec.DefineLabel ();
Label [] labels = null;
int n_resume_points = resume_points == null ? 0 : resume_points.Count;
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.Stloc, current_pc);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ldfld, IteratorHost.PC.Spec);
+ ec.Emit (OpCodes.Stloc, current_pc);
}
- ig.Emit (OpCodes.Ldarg_0);
- IntConstant.EmitInt (ig, (int) State.After);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.EmitInt ((int) State.After);
+ ec.Emit (OpCodes.Stfld, IteratorHost.PC.Spec);
if (labels != null) {
//SymbolWriter.StartIteratorDispatcher (ec.ig);
- ig.Emit (OpCodes.Ldloc, current_pc);
- ig.Emit (OpCodes.Switch, labels);
+ ec.Emit (OpCodes.Ldloc, current_pc);
+ ec.Emit (OpCodes.Switch, labels);
//SymbolWriter.EndIteratorDispatcher (ec.ig);
foreach (ResumableStatement s in resume_points)
s.EmitForDispose (ec, this, end, true);
}
- ig.MarkLabel (end);
+ ec.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;
}
//
public void MarkYield (EmitContext ec, Expression expr, int resume_pc, bool unwind_protect, Label resume_point)
{
- ILGenerator ig = ec.ig;
-
// Store the new current
- ig.Emit (OpCodes.Ldarg_0);
+ ec.Emit (OpCodes.Ldarg_0);
expr.Emit (ec);
- ig.Emit (OpCodes.Stfld, IteratorHost.CurrentField.FieldBuilder);
+ ec.Emit (OpCodes.Stfld, IteratorHost.CurrentField.Spec);
// store resume program-counter
- ig.Emit (OpCodes.Ldarg_0);
- IntConstant.EmitInt (ig, resume_pc);
- ig.Emit (OpCodes.Stfld, IteratorHost.PC.FieldBuilder);
+ ec.Emit (OpCodes.Ldarg_0);
+ ec.EmitInt (resume_pc);
+ ec.Emit (OpCodes.Stfld, IteratorHost.PC.Spec);
// mark finally blocks as disabled
if (unwind_protect && skip_finally != null) {
- ig.Emit (OpCodes.Ldc_I4_1);
- ig.Emit (OpCodes.Stloc, skip_finally);
+ ec.EmitInt (1);
+ ec.Emit (OpCodes.Stloc, skip_finally);
}
// Return ok
- ig.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, move_next_ok);
+ ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, move_next_ok);
- ig.MarkLabel (resume_point);
+ ec.MarkLabel (resume_point);
}
public override string ContainerType {
//
// Our constructor
//
- private Iterator (IMethodData method, TypeContainer host, Type iterator_type, bool is_enumerable)
+ private Iterator (CompilerContext ctx, IMethodData method, TypeContainer host, TypeSpec iterator_type, bool is_enumerable)
: base (
- new ToplevelBlock (method.Block, ParametersCompiled.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,
new MemberName ("MoveNext", Location),
ParametersCompiled.EmptyReadOnlyParameters);
- if (!Compatible (ec))
+ if (Compatible (ec) == null)
return null;
- IteratorHost.DefineIteratorMembers ();
-
eclass = ExprClass.Value;
- type = ec.ReturnType;
return this;
}
// Initialize iterator PC when it's unitialized
//
if (IsEnumerable) {
- ILGenerator ig = ec.ig;
- ig.Emit (OpCodes.Dup);
- IntConstant.EmitInt (ig, (int)State.Uninitialized);
+ ec.Emit (OpCodes.Dup);
+ ec.EmitInt ((int)State.Uninitialized);
+
+ var field = IteratorHost.PC.Spec;
+ if (Storey.MemberName.IsGeneric) {
+ field = MemberCache.GetMember (Storey.Instance.Type, field);
+ }
- FieldInfo field = IteratorHost.PC.FieldBuilder;
-#if GMCS_SOURCE
- if (Storey.MemberName.IsGeneric)
- field = TypeBuilder.GetField (Storey.Instance.Type, field);
-#endif
- ig.Emit (OpCodes.Stfld, field);
+ ec.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;
+ TypeSpec iterator_type;
- Type ret = method.ReturnType;
+ TypeSpec ret = method.ReturnType;
if (ret == null)
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 (),
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);
- iter.Storey.DefineType ();
+ // TODO: Ugly leftover
+ new Iterator (ctx, method, parent, iterator_type, is_enumerable);
}
- static bool CheckType (Type ret, out Type original_iterator_type, out bool is_enumerable)
+ static bool CheckType (TypeSpec ret, out TypeSpec original_iterator_type, out bool is_enumerable)
{
original_iterator_type = null;
is_enumerable = false;
return true;
}
- if (!TypeManager.IsGenericType (ret))
- return false;
-
- Type[] args = TypeManager.GetTypeArguments (ret);
- if (args.Length != 1)
+ InflatedTypeSpec inflated = ret as InflatedTypeSpec;
+ if (inflated == null)
return false;
- Type gt = TypeManager.DropGenericTypeArguments (ret);
- if (gt == TypeManager.generic_ienumerable_type) {
- original_iterator_type = args [0];
+ ret = inflated.GetDefinition ();
+ if (ret == TypeManager.generic_ienumerable_type) {
+ original_iterator_type = inflated.TypeArguments[0];
is_enumerable = true;
return true;
}
- if (gt == TypeManager.generic_ienumerator_type) {
- original_iterator_type = args [0];
+ if (ret == TypeManager.generic_ienumerator_type) {
+ original_iterator_type = inflated.TypeArguments[0];
is_enumerable = false;
return true;
}
projects / mono.git / blobdiff