[svn] r6549: nemerle/trunk/ncc: hierarchy/GlobalEnv.n hierarchy/NamespaceTree.n hierarchy/TypeBuilder.n te...

[nazgul]

Log:
Fix opening namespaces

Author: nazgul
Date: Thu Aug 17 23:45:44 2006
New Revision: 6549

Modified:
   nemerle/trunk/ncc/hierarchy/GlobalEnv.n
   nemerle/trunk/ncc/hierarchy/NamespaceTree.n
   nemerle/trunk/ncc/hierarchy/TypeBuilder.n
   nemerle/trunk/ncc/testsuite/positive/names-lookup.n

Modified: nemerle/trunk/ncc/hierarchy/GlobalEnv.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/GlobalEnv.n	(original)
+++ nemerle/trunk/ncc/hierarchy/GlobalEnv.n	Thu Aug 17 23:45:44 2006
@@ -348,7 +348,7 @@
         // composed of current namespace's parts suffixed with opened one
         def open_nested (curr : NamespaceTree.Node) {
           unless (curr.Parent == null) {
-            all_opened = curr.Path (ns.Name) :: all_opened;
+            all_opened = curr.Path (ns.FullName) :: all_opened;
             open_nested (curr.Parent)
           }
         }

Modified: nemerle/trunk/ncc/hierarchy/NamespaceTree.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/NamespaceTree.n	(original)
+++ nemerle/trunk/ncc/hierarchy/NamespaceTree.n	Thu Aug 17 23:45:44 2006
@@ -55,7 +55,7 @@
       public Parent : Node;
       
       [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-      [Accessor] name : string; // the same as edge from parent to this
+      [Accessor(PartName)] name : string; // the same as edge from parent to this
       
       public mutable Value : TypeInfoCache;
       
@@ -122,6 +122,12 @@
         }
       }
 
+      [Obsolete("please use FullName property")]
+      public Name : list [string]
+      {
+        get { FullName }
+      }
+      
       public GetNameWithSuffix (mutable suffix : list [string]) : list [string]
       {
         mutable node = this;
@@ -408,8 +414,9 @@
             if (_node.Children is null)
               array (0)
             else
-              _node.Children.Values.ToArray().SortInplace((x, y) =>
-                x.Name.CompareTo(y.Name))
+              _node.Children.Values.ToArray().SortInplace(
+                (x, y) => x.PartName.CompareTo(y.PartName)
+              )
           }
         }
       }

Modified: nemerle/trunk/ncc/hierarchy/TypeBuilder.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/TypeBuilder.n	(original)
+++ nemerle/trunk/ncc/hierarchy/TypeBuilder.n	Thu Aug 17 23:45:44 2006
@@ -109,7 +109,7 @@
     this.pt_name = td.ParsedName;
 
     when (this.GlobalEnv == null)
-      Util.ice ($ "env is null for $(ns_node.Name)");
+      Util.ice ($ "env is null for $(ns_node.GetDisplayName ())");
 
     this.enclosing_type = par;
     when (par != null)

Modified: nemerle/trunk/ncc/testsuite/positive/names-lookup.n
==============================================================================
--- nemerle/trunk/ncc/testsuite/positive/names-lookup.n	(original)
+++ nemerle/trunk/ncc/testsuite/positive/names-lookup.n	Thu Aug 17 23:45:44 2006
@@ -225,6 +225,13 @@
   }
 }
 
+namespace Some.Library
+{
+  using Nemerle.Text;
+  using System.Text;
+}
+
+
 
 /*
 REFERENCE: names-lookup-lib.dll