doc/list-exports.lisp: Better pretty formatting for keywords.

[sod] / doc / list-exports.lisp

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index 71a06d9..ef10b00 100644 (file)
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -19,10 +19,13 @@
 
 (defmethod form-list-exports ((head (eql 'definst)) tail)
   (destructuring-bind (code (streamvar &key export) args &body body) tail
-    (declare (ignore streamvar args body))
+    (declare (ignore streamvar body))
     (and export
-        (list (symbolicate code '-inst)
-              (symbolicate 'make- code '-inst)))))
+        (list* (symbolicate code '-inst)
+               (symbolicate 'make- code '-inst)
+               (mapcar (lambda (arg)
+                         (symbolicate 'inst- arg))
+                       args)))))
 
 (defmethod form-list-exports ((head (eql 'define-tagged-type)) tail)
   (destructuring-bind (kind what) tail
@@ -150,7 +153,8 @@
   (let* ((pkg (symbol-package symbol))
         (exportp (member symbol (list-exported-symbols pkg))))
     (format nil "~(~:[~A:~:[:~;~]~;~2*~]~A~)"
-           (and exportp (eq pkg package)) (best-package-name pkg)
+           (and exportp (eq pkg package))
+           (if (keywordp symbol) "" (best-package-name pkg))
            exportp (symbol-name symbol))))
 
 (defun analyse-classes (package)
@@ -181,7 +185,8 @@
                                                     package))
                               (remove super
                                       (sb-mop:class-direct-superclasses this))))
-              (dolist (sub (reverse (gethash this subs)))
+              (dolist (sub (sort (copy-list (gethash this subs))
+                                 #'string< :key #'class-name))
                 (walk-down sub this (1+ depth)))))
       (walk-down (find-class t) nil 0))))
 
@@ -199,6 +204,7 @@
                  (pretty-symbol-name sym package)
                  (cdr def))))
       (terpri)))
+  (format t "Classes:~%")
   (analyse-classes package)
   (terpri))
 
@@ -206,9 +212,10 @@
   (labels ((components (comp)
             (slot-value comp 'asdf::components))
           (files (comp)
-            (remove-if-not (lambda (comp)
+            (sort (remove-if-not (lambda (comp)
                              (typep comp 'asdf:cl-source-file))
-                           (components comp)))
+                                 (components comp))
+                  #'string< :key #'asdf:component-name))
           (by-name (comp name)
             (find name (components comp)
                   :test #'string= :key #'asdf:component-name))