* tree.cs (Tree.RecordDecl): Remove.

(RootTypes.AddToTypeContainer): Record the toplevel type in its
namespace here.
* class.cs, cs-parser.jay: Remove mention of RecordDecl.

svn path=/trunk/mcs/; revision=62990

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 91dca7898defadc84086865a8848b00758f2fcea..5e1bc8d0ff27a7b6b7d86335d4347606db46d85c 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-26  Raja R Harinath  <rharinath@novell.com>
+
+       * tree.cs (Tree.RecordDecl): Remove.
+       (RootTypes.AddToTypeContainer): Record the toplevel type in its
+       namespace here.
+       * class.cs, cs-parser.jay: Remove mention of RecordDecl.
+
 2006-07-23  Raja R Harinath  <harinath@gmail.com>
 
        * codegen.cs (EmitContext.Flags): Move InCatch, InFinally,

diff --git a/mcs/gmcs/class.cs b/mcs/gmcs/class.cs
index 651b8398e70efa294bd70f45df0554fc1c559c06..313f9129b56ed96391899325c88b9153f22798f8 100644 (file)
--- a/mcs/gmcs/class.cs
+++ b/mcs/gmcs/class.cs
@@ -530,7 +530,6 @@ namespace Mono.CSharp {
                        if (types == null)
                                types = new ArrayList (2);
 
-                       RootContext.Tree.RecordDecl (c.NamespaceEntry.NS, c.MemberName, c);
                        types.Add (c);
                        return true;
                }
@@ -600,7 +599,7 @@ namespace Mono.CSharp {
 
                        if (delegates == null)
                                delegates = new MemberCoreArrayList ();
-                       
+
                        delegates.Add (d);
                }
 
@@ -678,11 +677,9 @@ namespace Mono.CSharp {
                        if (!AddToTypeContainer (iface))
                                return false;
 
-                       if (interfaces == null) {
+                       if (interfaces == null)
                                interfaces = new MemberCoreArrayList ();
-                       }
 
-                       RootContext.Tree.RecordDecl (iface.NamespaceEntry.NS, iface.MemberName, iface);
                        interfaces.Add (iface);
                        return true;
                }

diff --git a/mcs/gmcs/cs-parser.jay b/mcs/gmcs/cs-parser.jay
index 9fb775e9587327fc60b1c671b2e5f6e503a8a234..2f8b3a40995e2c8226273d3717556cda16c21e9b 100644 (file)
--- a/mcs/gmcs/cs-parser.jay
+++ b/mcs/gmcs/cs-parser.jay
@@ -2553,7 +2553,6 @@ enum_declaration
                }
 
                current_container.AddEnum (e);
-               RootContext.Tree.RecordDecl (current_namespace.NS, name, e);
                $$ = e;
 
          }
@@ -2663,8 +2662,6 @@ delegate_declaration
                }
 
                current_container.AddDelegate (del);
-               RootContext.Tree.RecordDecl (current_namespace.NS, name, del);
-
                current_delegate = del;
          }
          opt_type_parameter_constraints_clauses

diff --git a/mcs/gmcs/tree.cs b/mcs/gmcs/tree.cs
index d6a822811d0607d92699309e3630985d8c3d9fe0..650d82b111ce937e8f92d3cdbb0f07e12940c904 100644 (file)
--- a/mcs/gmcs/tree.cs
+++ b/mcs/gmcs/tree.cs
@@ -37,12 +37,6 @@ namespace Mono.CSharp
                {
                        root_types = new RootTypes ();
                }
-
-               public void RecordDecl (Namespace ns, MemberName name, DeclSpace ds)
-               {
-                       if (ds.Parent == root_types)
-                               ns.AddDeclSpace (name.Basename, ds);
-               }
                
                //
                // FIXME: Why are we using Types?
@@ -77,7 +71,10 @@ namespace Mono.CSharp
 
                protected override bool AddToTypeContainer (DeclSpace ds)
                {
-                       return AddToContainer (ds, ds.Name);
+                       if (!AddToContainer (ds, ds.Name))
+                               return false;
+                       ds.NamespaceEntry.NS.AddDeclSpace (ds.Basename, ds);
+                       return true;
                }
 
                public override TypeContainer AddPartial (TypeContainer nextPart)

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index afa46c296d1a5410d92418ae4f25e3b8762aebcb..db1b6477d3f842ec691c344552a89654132cb397 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-26  Raja R Harinath  <rharinath@novell.com>
+
+       * tree.cs (Tree.RecordDecl): Remove.
+       (RootTypes.AddToTypeContainer): Record the toplevel type in its
+       namespace here.
+       * class.cs, cs-parser.jay: Remove mention of RecordDecl.
+
 2006-07-23  Raja R Harinath  <harinath@gmail.com>
 
        * codegen.cs (EmitContext.Flags): Move InCatch, InFinally,

diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index 1cd92b6df75f0163227d2187afc5a7b2da1219b4..eeb2353b13ba099188eb4c964ae90ef9f6a0817e 100644 (file)
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -532,7 +532,6 @@ namespace Mono.CSharp {
                        if (types == null)
                                types = new ArrayList (2);
 
-                       RootContext.Tree.RecordDecl (c.NamespaceEntry.NS, c.MemberName, c);
                        types.Add (c);
                        return true;
                }
@@ -602,7 +601,7 @@ namespace Mono.CSharp {
 
                        if (delegates == null)
                                delegates = new MemberCoreArrayList ();
-                       
+
                        delegates.Add (d);
                }
 
@@ -680,11 +679,9 @@ namespace Mono.CSharp {
                        if (!AddToTypeContainer (iface))
                                return false;
 
-                       if (interfaces == null) {
+                       if (interfaces == null)
                                interfaces = new MemberCoreArrayList ();
-                       }
 
-                       RootContext.Tree.RecordDecl (iface.NamespaceEntry.NS, iface.MemberName, iface);
                        interfaces.Add (iface);
                        return true;
                }

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 30beddad3bd1acbaf4b19df4ffce93c3ad5c914c..8b948ae19b18b4577579f15eb9779a914b8c100f 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -2407,7 +2407,6 @@ enum_declaration
                }
 
                current_container.AddEnum (e);
-               RootContext.Tree.RecordDecl (current_namespace.NS, name, e);
                $$ = e;
 
          }
@@ -2514,7 +2513,6 @@ delegate_declaration
                }
 
                current_container.AddDelegate (del);
-               RootContext.Tree.RecordDecl (current_namespace.NS, name, del);
                $$ = del;
          }     
        ;

diff --git a/mcs/mcs/tree.cs b/mcs/mcs/tree.cs
index d6a822811d0607d92699309e3630985d8c3d9fe0..650d82b111ce937e8f92d3cdbb0f07e12940c904 100644 (file)
--- a/mcs/mcs/tree.cs
+++ b/mcs/mcs/tree.cs
@@ -37,12 +37,6 @@ namespace Mono.CSharp
                {
                        root_types = new RootTypes ();
                }
-
-               public void RecordDecl (Namespace ns, MemberName name, DeclSpace ds)
-               {
-                       if (ds.Parent == root_types)
-                               ns.AddDeclSpace (name.Basename, ds);
-               }
                
                //
                // FIXME: Why are we using Types?
@@ -77,7 +71,10 @@ namespace Mono.CSharp
 
                protected override bool AddToTypeContainer (DeclSpace ds)
                {
-                       return AddToContainer (ds, ds.Name);
+                       if (!AddToContainer (ds, ds.Name))
+                               return false;
+                       ds.NamespaceEntry.NS.AddDeclSpace (ds.Basename, ds);
+                       return true;
                }
 
                public override TypeContainer AddPartial (TypeContainer nextPart)