doc/list-exports.lisp: Bind `*package*' while reading files.

Otherwise we can get confused by read-time evaluation and other such
wonders.  Unfortunately this means that some of the macros we have
magical support for now need package qualification here.  Oh, well.

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index 5cb860007fe206e73fb7209605f9cf33b12749e6..c67d0ab17e524b1549619c2c1751e542354d0007 100644 (file)
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -9,7 +9,7 @@ (defgeneric form-list-exports (head tail)
     (declare (ignore head tail))
     nil))
 
     (declare (ignore head tail))
     nil))
 

-(defmethod form-list-exports ((head (eql 'export)) tail)
+(defmethod form-list-exports ((head (eql 'cl:export)) tail)

   (let ((symbols (car tail)))
     (if (and (consp symbols)
             (eq (car symbols) 'quote))
   (let ((symbols (car tail)))
     (if (and (consp symbols)
             (eq (car symbols) 'quote))


@@ -17,7 +17,7 @@ (defmethod form-list-exports ((head (eql 'export)) tail)
          (if (atom thing) (list thing) thing))
        (incomprehensible-form head tail))))
 
          (if (atom thing) (list thing) thing))
        (incomprehensible-form head tail))))
 

-(defmethod form-list-exports ((head (eql 'definst)) tail)
+(defmethod form-list-exports ((head (eql 'sod:definst)) tail)

   (destructuring-bind (code (streamvar &key export) args &body body) tail
     (declare (ignore streamvar body))
     (and export
   (destructuring-bind (code (streamvar &key export) args &body body) tail
     (declare (ignore streamvar body))
     (and export


@@ -27,20 +27,20 @@ (defmethod form-list-exports ((head (eql 'definst)) tail)
                          (symbolicate 'inst- arg))
                        args)))))
 
                          (symbolicate 'inst- arg))
                        args)))))
 

-(defmethod form-list-exports ((head (eql 'define-tagged-type)) tail)
+(defmethod form-list-exports ((head (eql 'sod::define-tagged-type)) tail)

   (destructuring-bind (kind what) tail
     (declare (ignore what))
     (list kind
          (symbolicate 'c- kind '-type)
          (symbolicate 'make- kind '-type))))
 
   (destructuring-bind (kind what) tail
     (declare (ignore what))
     (list kind
          (symbolicate 'c- kind '-type)
          (symbolicate 'make- kind '-type))))
 

-(defmethod form-list-exports ((head (eql 'macrolet)) tail)
+(defmethod form-list-exports ((head (eql 'cl:macrolet)) tail)

   (mapcan #'form-exports (cdr tail)))
 
   (mapcan #'form-exports (cdr tail)))
 

-(defmethod form-list-exports ((head (eql 'eval-when)) tail)
+(defmethod form-list-exports ((head (eql 'cl:eval-when)) tail)

   (mapcan #'form-exports (cdr tail)))
 
   (mapcan #'form-exports (cdr tail)))
 

-(defmethod form-list-exports ((head (eql 'progn)) tail)
+(defmethod form-list-exports ((head (eql 'cl:progn)) tail)

   (mapcan #'form-exports tail))
 
 (defgeneric form-exports (form)
   (mapcan #'form-exports tail))
 
 (defgeneric form-exports (form)


@@ -69,7 +69,8 @@ (defun list-exported-symbols (package)
 
 (defun find-symbol-homes (paths package)
   (let* ((symbols (list-exported-symbols package))
 
 (defun find-symbol-homes (paths package)
   (let* ((symbols (list-exported-symbols package))

-        (exports-alist (mapcan #'list-exports paths))
+        (exports-alist (let ((*package* package))
+                         (mapcan #'list-exports paths)))

         (homes (make-hash-table :test #'equal)))
     (dolist (assoc exports-alist)
       (let ((home (car assoc)))
         (homes (make-hash-table :test #'equal)))
     (dolist (assoc exports-alist)
       (let ((home (car assoc)))