2006-11-16 Martin Baulig <martin@ximian.com>

	* anonymous.cs: Rename `AnonymousMethodHost' -> `RootScopeInfo'.

svn path=/branches/martin/anonymous-methods2/mcs/; revision=68011

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index ef05eba46681bb54690b47c04e505efb05dc9e10..f3ba6eb259c65175919d34100bd660c3f2fdeaa0 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-16  Martin Baulig  <martin@ximian.com>
+
+       * anonymous.cs: Rename `AnonymousMethodHost' -> `RootScopeInfo'.
+
 2006-11-16  Martin Baulig  <martin@ximian.com>
 
        * anonymous.cs (IAnonymousMethodHost): New public interface; use

diff --git a/mcs/mcs/anonymous.cs b/mcs/mcs/anonymous.cs
index f3debc210cedc245423ce6956f669af2e3c0a43d..d6ea5f29fd941aa3a031f332cdfecdd8942745b1 100644 (file)
--- a/mcs/mcs/anonymous.cs
+++ b/mcs/mcs/anonymous.cs
@@ -160,16 +160,16 @@ namespace Mono.CSharp {
 
        public class ScopeInfo : CompilerGeneratedClass
        {
-               protected readonly AnonymousMethodHost RootScope;
+               protected readonly RootScopeInfo RootScope;
                public readonly int ID = ++next_id;
                public Block ScopeBlock;
 
                static int next_id;
 
                public ScopeInfo (IAnonymousMethodHost root, Block block)
-                       : base ((AnonymousMethodHost) root, null, 0, block.StartLocation)
+                       : base ((RootScopeInfo) root, null, 0, block.StartLocation)
                {
-                       this.RootScope = (AnonymousMethodHost) root;
+                       this.RootScope = (RootScopeInfo) root;
                        ScopeBlock = block;
 
                        Report.Debug (64, "NEW SCOPE", this, root, block);
@@ -181,7 +181,7 @@ namespace Mono.CSharp {
                                  GenericMethod generic, Location loc)
                        : base (parent, generic, 0, loc)
                {
-                       RootScope = (AnonymousMethodHost) this;
+                       RootScope = (RootScopeInfo) this;
                        ScopeBlock = toplevel;
 
                        Report.Debug (64, "NEW ROOT SCOPE", this);
@@ -251,7 +251,7 @@ namespace Mono.CSharp {
                public static void EmitScopeInstance (EmitContext ec, ScopeInfo scope,
                                                      ToplevelBlock toplevel)
                {
-                       AnonymousMethodHost root_scope = (AnonymousMethodHost) toplevel.AnonymousMethodHost;
+                       RootScopeInfo root_scope = (RootScopeInfo) toplevel.AnonymousMethodHost;
 
                        root_scope.EmitScopeInstance (ec);
                        while (root_scope != scope.RootScope) {
@@ -270,7 +270,7 @@ namespace Mono.CSharp {
 
                public static bool CompleteContexts (IAnonymousMethodHost amh, Block container)
                {
-                       AnonymousMethodHost host = (AnonymousMethodHost) amh;
+                       RootScopeInfo host = (RootScopeInfo) amh;
 
                        if (host != null)
                                host.LinkScopes ();
@@ -416,7 +416,7 @@ namespace Mono.CSharp {
                }
 
                protected class CapturedThis : CapturedVariable {
-                       public CapturedThis (AnonymousMethodHost host)
+                       public CapturedThis (RootScopeInfo host)
                                : base (host, "<>THIS", host.ParentType)
                        { }
                }
@@ -612,10 +612,10 @@ namespace Mono.CSharp {
                void EmitScopeInstance (EmitContext ec);
        }
 
-       public class AnonymousMethodHost : ScopeInfo, IAnonymousMethodHost
+       public class RootScopeInfo : ScopeInfo, IAnonymousMethodHost
        {
-               public AnonymousMethodHost (ToplevelBlock toplevel, TypeContainer parent,
-                                           GenericMethod generic, Location loc)
+               public RootScopeInfo (ToplevelBlock toplevel, TypeContainer parent,
+                                     GenericMethod generic, Location loc)
                        : base (toplevel, parent, generic, loc)
                {
                        scopes = new ArrayList ();
@@ -631,8 +631,8 @@ namespace Mono.CSharp {
                        get { return false; }
                }
 
-               public AnonymousMethodHost ParentHost {
-                       get { return Parent as AnonymousMethodHost; }
+               public RootScopeInfo ParentHost {
+                       get { return Parent as RootScopeInfo; }
                }
 
                public Type ParentType {
@@ -717,7 +717,7 @@ namespace Mono.CSharp {
 
                protected override ScopeInitializer CreateScopeInitializer ()
                {
-                       return new AnonymousMethodHostInitializer (this);
+                       return new RootScopeInitializer (this);
                }
 
                protected override bool DefineNestedTypes ()
@@ -808,9 +808,9 @@ namespace Mono.CSharp {
 
                protected class TheCtor : Statement
                {
-                       AnonymousMethodHost host;
+                       RootScopeInfo host;
 
-                       public TheCtor (AnonymousMethodHost host)
+                       public TheCtor (RootScopeInfo host)
                        {
                                this.host = host;
                        }
@@ -826,17 +826,17 @@ namespace Mono.CSharp {
                        }
                }
 
-               protected class AnonymousMethodHostInitializer : ScopeInitializer
+               protected class RootScopeInitializer : ScopeInitializer
                {
-                       AnonymousMethodHost host;
+                       RootScopeInfo host;
 
-                       public AnonymousMethodHostInitializer (AnonymousMethodHost host)
+                       public RootScopeInitializer (RootScopeInfo host)
                                : base (host)
                        {
                                this.host = host;
                        }
 
-                       public AnonymousMethodHost Host {
+                       public RootScopeInfo Host {
                                get { return host; }
                        }
 
@@ -910,7 +910,7 @@ namespace Mono.CSharp {
                        get;
                }
 
-               AnonymousMethodHost RootScope {
+               RootScopeInfo RootScope {
                        get;
                }
 
@@ -956,7 +956,7 @@ namespace Mono.CSharp {
                        get { return anonymous; }
                }
 
-               public AnonymousMethodHost RootScope {
+               public RootScopeInfo RootScope {
                        get { return root_scope; }
                }
 
@@ -980,7 +980,7 @@ namespace Mono.CSharp {
                }
 
                ArrayList children;
-               AnonymousMethodHost root_scope;
+               RootScopeInfo root_scope;
 
                static int next_index;
 
@@ -1253,7 +1253,7 @@ namespace Mono.CSharp {
                        get { return method; }
                }
 
-               public abstract AnonymousMethodHost RootScope {
+               public abstract RootScopeInfo RootScope {
                        get;
                }
 
@@ -1360,9 +1360,9 @@ namespace Mono.CSharp {
                // more than once, due to the way Convert.ImplicitConversion works
                //
                Expression anonymous_delegate;
-               AnonymousMethodHost root_scope;
+               RootScopeInfo root_scope;
 
-               public AnonymousMethod (AnonymousMethod parent, AnonymousMethodHost root_scope,
+               public AnonymousMethod (AnonymousMethod parent, RootScopeInfo root_scope,
                                        TypeContainer host, GenericMethod generic,
                                        Parameters parameters, Block container,
                                        ToplevelBlock block, Type return_type, Type delegate_type,
@@ -1374,7 +1374,7 @@ namespace Mono.CSharp {
                        this.root_scope = root_scope;
                }
 
-               public override AnonymousMethodHost RootScope {
+               public override RootScopeInfo RootScope {
                        get { return root_scope; }
                }
 

diff --git a/mcs/mcs/iterators.cs b/mcs/mcs/iterators.cs
index 6edf144054f2ca6585d8a936e0023fec8c777a2e..9529825c9ff0ef6d9ee0d86c3539a88cb666c64b 100644 (file)
--- a/mcs/mcs/iterators.cs
+++ b/mcs/mcs/iterators.cs
@@ -124,7 +124,7 @@ namespace Mono.CSharp {
                }
        }
 
-       public class IteratorHost : AnonymousMethodHost
+       public class IteratorHost : RootScopeInfo
        {
                public readonly Iterator Iterator;
 
@@ -320,7 +320,7 @@ namespace Mono.CSharp {
                        return new IteratorHostInitializer (this);
                }
 
-               protected class IteratorHostInitializer : AnonymousMethodHostInitializer
+               protected class IteratorHostInitializer : RootScopeInitializer
                {
                        new public readonly IteratorHost Host;
                        protected Iterator.State state;
@@ -781,7 +781,7 @@ namespace Mono.CSharp {
                        get { return true; }
                }
 
-               public override AnonymousMethodHost RootScope {
+               public override RootScopeInfo RootScope {
                        get { return IteratorHost; }
                }
 

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index 74f2194ff33c890d28e63140f11720a8728d2299..776b958c9b84ccb8d08c55b99be03f363c137a27 100644 (file)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -2280,7 +2280,7 @@ namespace Mono.CSharp {
                ToplevelBlock child;    
                GenericMethod generic;
                FlowBranchingToplevel top_level_branching;
-               AnonymousMethodHost anonymous_method_host;
+               RootScopeInfo anonymous_method_host;
 
                public bool HasVarargs {
                        get { return (flags & Flags.HasVarargs) != 0; }
@@ -2384,23 +2384,23 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               public AnonymousMethodHost CreateAnonymousMethodHost (TypeContainer host)
+               public RootScopeInfo CreateAnonymousMethodHost (TypeContainer host)
                {
                        if (anonymous_method_host != null)
                                return anonymous_method_host;
 
                        if (Container != null)
-                               anonymous_method_host = new AnonymousMethodHost (
+                               anonymous_method_host = new RootScopeInfo (
                                        this, Container.anonymous_method_host, null, StartLocation);
                        else
-                               anonymous_method_host = new AnonymousMethodHost (
+                               anonymous_method_host = new RootScopeInfo (
                                        this, host, generic, StartLocation);
 
                        ScopeInfo = anonymous_method_host;
                        return anonymous_method_host;
                }
 
-               public void CreateIteratorHost (AnonymousMethodHost root_scope)
+               public void CreateIteratorHost (RootScopeInfo root_scope)
                {
                        Report.Debug (64, "CREATE ITERATOR HOST", this, root_scope,
                                      container, anonymous_method_host);