[svn] r7761: nemerle/trunk/tools/ndp: AssemblyAnalyzer.n DataTree.n NemerleDoc.n

[marcinm]

Log:
The '-dir' command line switch changed to '-dest'.
Small improvements in displaying superclasses and implemented interfaces.


Author: marcinm
Date: Mon Aug 13 20:27:28 2007
New Revision: 7761

Modified:
   nemerle/trunk/tools/ndp/AssemblyAnalyzer.n
   nemerle/trunk/tools/ndp/DataTree.n
   nemerle/trunk/tools/ndp/NemerleDoc.n

Modified: nemerle/trunk/tools/ndp/AssemblyAnalyzer.n
==============================================================================
--- nemerle/trunk/tools/ndp/AssemblyAnalyzer.n	(original)
+++ nemerle/trunk/tools/ndp/AssemblyAnalyzer.n	Mon Aug 13 20:27:28 2007
@@ -13,10 +13,12 @@
     type_analyzer (t : System.Type, tree : DataTree) : void
     {
         /*
-        Console.WriteLine("--> Type analyzer: Name {0} Attrib {1}", t.FullName, t.Attributes);
-        Console.WriteLine("\n\n--> NameSp: {0}, name: {1}, FullName: {2}", t.Namespace,  t.Name, t.FullName,);
-        Console.WriteLine("--> BaseType: {0}, DeclaredType: {1}\n\n", t.BaseType, t.DeclaringType);
+        Console.WriteLine("\n\n--> Type analyzer: SystemType.ToString() {0}", t.ToString());
+        Console.WriteLine("--> FullName {0}\tAttributes {1}", t.FullName, t.Attributes);
+        Console.WriteLine("--> Namespace: {0}\tName: {1}", t.Namespace,  t.Name, t.FullName);
+        Console.WriteLine("--> BaseType: {0}\tDeclaredType: {1}\n\n", t.BaseType, t.DeclaringType);
         */
+        
         // analyze attributes      
         def attr = ReflAttribs(is_abstract=t.IsAbstract,
                                is_array=t.IsArray,

Modified: nemerle/trunk/tools/ndp/DataTree.n
==============================================================================
--- nemerle/trunk/tools/ndp/DataTree.n	(original)
+++ nemerle/trunk/tools/ndp/DataTree.n	Mon Aug 13 20:27:28 2007
@@ -653,13 +653,12 @@
         att += " class ";
         
       mutable superclass = "";
-      when (this.Superclass != null) superclass = " : " + this.Superclass.ToString();
+      when (this.Superclass != null) superclass = " : " + String.Format("<span class=\"ns-index\" title=\"{0}\">{1}</span>", this.Superclass.ToString(), this.Superclass.Name);
       
       mutable interfaces = " ";
       when (this.Interfaces != null)
       {
           foreach (interf in this.Interfaces) interfaces += interf.ToString() + " ";
-          when (interfaces.Trim().Length > 0) interfaces = "implements " + interfaces;
       }
     
       match (XMLattrib) {
@@ -676,7 +675,10 @@
         
         | Type =>
             res += "<div class=\"ns-index\"" + (" id=\"" + this.href() + "\"") + ">" + att;
-            res += "<span class=\"ns-index\" title=\"" + this.full_name + "\">" + this.Name + superclass + interfaces + "</span>\n";
+            res += "<span class=\"ns-index\" title=\"" + this.full_name + "\">" + 
+                   this.Name + "</span>" + superclass + "\n";
+            when (interfaces.Trim().Length > 0) 
+                res += " implements <span class=\"ns-index\">" + interfaces + "</span>\n";
             res += com;
           
             def mk_element = fun (e) { "<div class=\"element\" id=\"" + e.href() + "\">" + e.ToHtml() + "</div>\n"};

Modified: nemerle/trunk/tools/ndp/NemerleDoc.n
==============================================================================
--- nemerle/trunk/tools/ndp/NemerleDoc.n	(original)
+++ nemerle/trunk/tools/ndp/NemerleDoc.n	Mon Aug 13 20:27:28 2007
@@ -23,7 +23,7 @@
   /// <param name="arg1">This is arg1</param>
   /// <param name="arg2">This is arg2</param>
   /// <param name="arg3">This is arg3</param>
-  /// <example>This is example;
+  /// <example>This is an example;
   /// <code>
   ///    $ mono nemerledoc.exe
   /// </code>
@@ -40,6 +40,7 @@
     Console.WriteLine("     <options>:");
     Console.WriteLine("             -np show non public elements");
     Console.WriteLine("             -title:\"title\" title for index page");
+    Console.WriteLine("             -dest:\"directory\" directory where result files will be written");
     Console.WriteLine("             -s simplifies some monster type expressions, functions, tuples etc.");
     Console.WriteLine("             -d debug info");
     Console.WriteLine("     <files>: a list of *.dll and *.xml files");
@@ -74,7 +75,7 @@
           if (arg.Equals("-np")) publicOnly = false
           else if (arg.Equals("-s")) simplify = true
           else if (arg.Equals("-d")) debug = true
-          else if (arg.StartsWith("-dir")) destDir = arg.Substring(5)
+          else if (arg.StartsWith("-dest")) destDir = arg.Substring(6)
           else if (arg.StartsWith("-title")) title = arg.Substring(7)
           else 
               fileList = fileList + [ arg ];