[svn] r6551: nemerle/trunk/ncc/typing/Typer.n

[VladD2]

Log:
Fix macro name (in completion).

Author: VladD2
Date: Fri Aug 18 04:28:34 2006
New Revision: 6551

Modified:
   nemerle/trunk/ncc/typing/Typer.n

Modified: nemerle/trunk/ncc/typing/Typer.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer.n	(original)
+++ nemerle/trunk/ncc/typing/Typer.n	Fri Aug 18 04:28:34 2006
@@ -49,6 +49,7 @@
     | Node       { Name : string; node : NamespaceTree.Node; }
     | Local { Value : LocalValue }
     | Overloads  { Values : list [OverloadPossibility]; }
+    | Overload   { Value : OverloadPossibility; }
   }
 
   [Record (Include = [Elems, NamePrefix])]
@@ -1450,9 +1451,17 @@
 
           def find_namespaces (ns)
           {
-            foreach ((name, node) in ns.Children.KeyValuePairs)
-              when (!(node.Value is NamespaceTree.TypeInfoCache.No) && name.StartsWith (prefix, optins))
-                elems.Add(Elem.Node (name, node));
+            foreach ((name, node) when name.StartsWith (prefix, optins) in ns.Children.KeyValuePairs)
+              match (node.Value)
+              {
+                | No => ()
+                | MacroCall(macr) => 
+                  elems.Add(Elem.Node (
+                    if (macr.Keywords.IsEmpty) node.GetDisplayName () else macr.Keywords.Head,
+                    node));
+                
+                | _ => elems.Add(Elem.Node (name, node));
+              }
           }
 
           find_namespaces (Manager.CoreEnv.CurrentNamespace);