X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/fae90f24a2c96dc8531adeeaba190a17b1044650..b8eeeb378980ebf06cd5b57fe0e967c23955cf5f:/doc/list-exports.lisp

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index 65514d4..f58fb2b 100755
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -1,4 +1,5 @@
 #! /bin/sh
+":"; ### -*-lisp-*-
 ":"; CL_SOURCE_REGISTRY=$(pwd)/build/src/:; export CL_SOURCE_REGISTRY
 ":"; exec cl-launch -X -l "sbcl cmucl" -s asdf -i "(sod-exports::main)" -- "$0" "$@" || exit 1
 
@@ -36,8 +37,12 @@
     (and export
 	 (list* (symbolicate code '-inst)
 		(symbolicate 'make- code '-inst)
-		(mapcar (lambda (arg)
-			  (symbolicate 'inst- arg))
+		(mapcan (lambda (arg)
+			  (let ((sym (if (listp arg) (car arg) arg)))
+			    (cond ((char= (char (symbol-name sym) 0) #\&)
+				   nil)
+				  (t
+				   (list (symbolicate 'inst- sym))))))
 			args)))))
 
 (defmethod form-list-exports ((head (eql 'sod::define-tagged-type)) tail)
@@ -47,6 +52,20 @@
 	  (symbolicate 'c- kind '-type)
 	  (symbolicate 'make- kind '-type))))
 
+(defmethod form-list-exports ((head (eql 'sod:defctype)) tail)
+  (destructuring-bind (names value &key export) tail
+    (declare (ignore value))
+    (let ((names (if (listp names) names (list names))))
+      (and export
+	   (list* (symbolicate 'c-type- (car names)) names)))))
+
+(defmethod form-list-exports ((head (eql 'sod:define-simple-c-type)) tail)
+  (destructuring-bind (names type &key export) tail
+    (declare (ignore type))
+    (let ((names (if (listp names) names (list names))))
+      (and export
+	   (list* (symbolicate 'c-type- (car names)) names)))))
+
 (defmethod form-list-exports ((head (eql 'cl:macrolet)) tail)
   (mapcan #'form-exports (cdr tail)))
 
@@ -186,13 +205,17 @@
 		  (t (best-package-name pkg)))
 	    (or exportp (null pkg)) (symbol-name symbol))))
 
+(deftype interesting-class ()
+  '(or standard-class
+       structure-class
+       #.(class-name (class-of (find-class 'condition)))))
+
 (defun analyse-classes (package)
   (setf package (find-package package))
   (let ((classes (mapcan (lambda (symbol)
 			   (let ((class (find-class symbol nil)))
 			     (and class
-				  (typep class '(or standard-class
-						 structure-class))
+				  (typep class 'interesting-class)
 				  (list class))))
 			 (list-exported-symbols package)))
 	(subs (make-hash-table)))
@@ -341,7 +364,7 @@
 				#'order-specializers
 				:key #'method-specializers))
 	    (when (gethash method methods)
-	      (format t "~2T~{~A~^ ~}~%"
+	      (format t "~2T~{~A~^ ~}~@[ [~{~(~S~)~^ ~}]~]~%"
 		      (mapcar
 		       (lambda (spec)
 			 (etypecase spec
@@ -355,7 +378,8 @@
 				      (if (symbolp obj)
 					  (pretty-symbol-name obj package)
 					  obj))))))
-		       (method-specializers method))))))))))
+		       (method-specializers method))
+		      (method-qualifiers method)))))))))
 
 (defun check-slot-names (package)
   (setf package (find-package package))
@@ -372,9 +396,11 @@
 				       (class-direct-slots class)))
 			      (exported (remove-if
 					 (lambda (sym)
-					   (and (not (exported-symbol-p sym))
-						(eq (symbol-package sym)
-						    package)))
+					   (or (not (symbol-package sym))
+					       (and (not (exported-symbol-p
+							  sym))
+						    (eq (symbol-package sym)
+							package))))
 					 slot-names)))
 			 (and exported
 			      (list (cons (class-name class)
@@ -422,17 +448,16 @@
 (export 'report-project-symbols)
 (defun report-project-symbols ()
   (labels ((components (comp)
-	     (slot-value comp 'asdf::components))
+	     (asdf:component-children comp))
 	   (files (comp)
 	     (sort (remove-if-not (lambda (comp)
 				    (typep comp 'asdf:cl-source-file))
 				  (components comp))
 		   #'string< :key #'asdf:component-name))
 	   (by-name (comp name)
-	     (find name (components comp)
-		   :test #'string= :key #'asdf:component-name))
+	     (gethash name (asdf:component-children-by-name comp)))
 	   (file-name (file)
-	     (slot-value file 'asdf::absolute-pathname)))
+	     (slot-value file 'asdf/component:absolute-pathname)))
   (let* ((sod (asdf:find-system "sod"))
 	 (parser-files (files (by-name sod "parser")))
 	 (utilities (by-name sod "utilities"))