X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdescribe.lisp;h=998d45c79dd469dc6b145e90c9093d8f3f6dcdf9;hb=d147d512602d761a2dcdfded506dd1a8f9a140dc;hp=ee403fa05be9bdd2edac6e70141bc27dbe03eb33;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/pcl/describe.lisp b/src/pcl/describe.lisp index ee403fa..998d45c 100644 --- a/src/pcl/describe.lisp +++ b/src/pcl/describe.lisp @@ -59,25 +59,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) @@ -129,12 +129,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))