0.pre7.38:

[sbcl.git] / src / pcl / describe.lisp

diff --git a/src/pcl/describe.lisp b/src/pcl/describe.lisp
index df5f5b9..d9a4e2b 100644 (file)
--- a/src/pcl/describe.lisp
+++ b/src/pcl/describe.lisp
@@ -26,8 +26,7 @@
 
 (in-package "SB-PCL")
 
-(sb-int:file-comment
-  "$Header$")
+(declaim #.*optimize-byte-compilation*)
 
 (defmethod slots-to-inspect ((class slot-class) (object slot-object))
   (class-slots class))
@@ -62,25 +61,25 @@
          (:class  (push slotd class-slotds))
          (otherwise (push slotd other-slotds))))
       (setq max-slot-name-length  (min (+ max-slot-name-length 3) 30))
-      (format stream "~%~S is an instance of class ~S." object class)
+      (format stream "~%~@<~S ~_is an instance of class ~S.~:>" object class)
 
       ;; Now that we know the width, we can print.
       (when instance-slotds
-       (format stream "~% The following slots have :INSTANCE allocation:")
+       (format stream "~%The following slots have :INSTANCE allocation:")
        (dolist (slotd (nreverse instance-slotds))
          (describe-slot
           (slot-definition-name slotd)
           (slot-value-or-default object
                                  (slot-definition-name slotd)))))
       (when class-slotds
-       (format stream "~% The following slots have :CLASS allocation:")
+       (format stream "~%The following slots have :CLASS allocation:")
        (dolist (slotd (nreverse class-slotds))
          (describe-slot
           (slot-definition-name slotd)
           (slot-value-or-default object
                                  (slot-definition-name slotd)))))
       (when other-slotds
-       (format stream "~% The following slots have allocation as shown:")
+       (format stream "~%The following slots have allocation as shown:")
        (dolist (slotd (nreverse other-slotds))
          (describe-slot
           (slot-definition-name slotd)
@@ -132,12 +131,12 @@
     (format stream
            "~@[~&It has nicknames ~{~:_~S~^ ~}~]"
            (package-nicknames package))
-    (let* ((internal (sb-impl::package-internal-symbols package))
-          (internal-count (- (sb-impl::package-hashtable-size internal)
-                             (sb-impl::package-hashtable-free internal)))
-          (external (sb-impl::package-external-symbols package))
-          (external-count (- (sb-impl::package-hashtable-size external)
-                             (sb-impl::package-hashtable-free external))))
+    (let* ((internal (package-internal-symbols package))
+          (internal-count (- (package-hashtable-size internal)
+                             (package-hashtable-free internal)))
+          (external (package-external-symbols package))
+          (external-count (- (package-hashtable-size external)
+                             (package-hashtable-free external))))
       (format stream
              "~&It has ~S internal and ~S external symbols."
              internal-count external-count))