2007-12-06 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / mcs / iterators.cs

diff --git a/mcs/mcs/iterators.cs b/mcs/mcs/iterators.cs
index 8720298fca897c6039fcf59d0f5efe8f9fc2ec46..678ca672fbbe781db1f3c822e1cba454006801b9 100644 (file)
--- a/mcs/mcs/iterators.cs
+++ b/mcs/mcs/iterators.cs
@@ -100,6 +100,13 @@ namespace Mono.CSharp {
                {
                        ec.CurrentIterator.MarkYield (ec, expr, finally_blocks);
                }
+
+               protected override void CloneTo (CloneContext clonectx, Statement t)
+               {
+                       Yield target = (Yield) t;
+
+                       target.expr = expr.Clone (clonectx);
+               }
        }
 
        public class YieldBreak : Statement {
@@ -137,8 +144,10 @@ namespace Mono.CSharp {
                TypeExpr enumerable_type;
                TypeArguments generic_args;
                TypeExpr generic_enumerator_type;
+#if GMCS_SOURCE                
                TypeExpr generic_enumerable_type;
-
+#endif
+               
                public IteratorHost (Iterator iterator)
                        : base (iterator.Container.Toplevel, iterator.Host, iterator.GenericMethod,
                                iterator.Location)
@@ -306,7 +315,7 @@ namespace Mono.CSharp {
                        Accessor getter = new Accessor (get_block, 0, null, Location);
 
                        Property current = new Property (
-                               this, type, 0, false, name, null, getter, null);
+                               this, type, 0, false, name, null, getter, null, false);
                        AddProperty (current);
                }
 
@@ -443,7 +452,7 @@ namespace Mono.CSharp {
 
                                        ce = TypeManager.int_interlocked_compare_exchange;
 
-                                       ec.CurrentBranching.CurrentUsageVector.Return ();
+                                       ec.CurrentBranching.CurrentUsageVector.Goto ();
                                        return true;
                                }
 
@@ -577,7 +586,7 @@ namespace Mono.CSharp {
 
                        public override bool Resolve (EmitContext ec)
                        {
-                               ec.CurrentBranching.CurrentUsageVector.Return ();
+                               ec.CurrentBranching.CurrentUsageVector.Goto ();
                                return true;
                        }
 
@@ -798,6 +807,10 @@ namespace Mono.CSharp {
                        point.Define (ig);
                }
 
+               public override string ContainerType {
+                       get { return "iterator"; }
+               }
+
                public override bool IsIterator {
                        get { return true; }
                }
@@ -815,7 +828,7 @@ namespace Mono.CSharp {
                //
                private Iterator (IMethodData m_container, DeclSpace host, GenericMethod generic,
                                 int modifiers, Type iterator_type, bool is_enumerable)
-                       : base (null, host, generic, m_container.ParameterInfo,
+                       : base (host, generic, m_container.ParameterInfo,
                                new ToplevelBlock (m_container.ParameterInfo, m_container.Location),
                                m_container.Block, TypeManager.bool_type, modifiers,
                                m_container.Location)
@@ -859,7 +872,7 @@ namespace Mono.CSharp {
                        return OriginalMethod.GetSignatureForError ();
                }
 
-               public override bool Resolve (EmitContext ec)
+               public override bool Define (EmitContext ec)
                {
                        Report.Debug (64, "RESOLVE ITERATOR", this, Container, Block);
 
@@ -892,7 +905,7 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       if (!base.Resolve (ec))
+                       if (!base.Define (ec))
                                return false;
 
                        Report.Debug (64, "RESOLVE ITERATOR #1", this, method, method.Parent,
@@ -925,6 +938,11 @@ namespace Mono.CSharp {
                                Parameters.EmptyReadOnlyParameters);
                }
 
+               public override Expression Resolve (EmitContext ec)
+               {
+                       throw new NotSupportedException ();
+               }
+
                protected class MoveNextStatement : Statement {
                        Iterator iterator;
 
@@ -968,7 +986,7 @@ namespace Mono.CSharp {
                                if (Expr == null)
                                        return false;
 
-                               ec.CurrentBranching.CurrentUsageVector.Return ();
+                               ec.CurrentBranching.CurrentUsageVector.Goto ();
 
                                return true;
                        }
@@ -986,12 +1004,16 @@ namespace Mono.CSharp {
                        bool is_enumerable;
                        Type iterator_type;
 
-                       if (!CheckType (method.ReturnType, out iterator_type, out is_enumerable)) {
+                       Type ret = method.ReturnType;
+                       if (ret == null)
+                               return null;
+
+                       if (!CheckType (ret, out iterator_type, out is_enumerable)) {
                                Report.Error (1624, method.Location,
                                              "The body of `{0}' cannot be an iterator block " +
                                              "because `{1}' is not an iterator interface type",
                                              method.GetSignatureForError (),
-                                             TypeManager.CSharpName (method.ReturnType));
+                                             TypeManager.CSharpName (ret));
                                return null;
                        }