X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fdescribe.lisp;h=fc7bb94751636f5896f2a4ab8de350ec53364074;hb=31361af9eb64344f521abbb245ea784c76c746e5;hp=ad2b039e54bd9df6ecd13d350911b1709b93b4fe;hpb=39ca94ec421224c78cb01f7d2d7b49321c66a2d4;p=sbcl.git

diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index ad2b039..fc7bb94 100644
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -10,10 +10,9 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB-IMPL")
+(in-package "SB-IMPL") ;(SB-IMPL, not SB!IMPL, since we're built in warm load.)
 
-;; byte-compile this file
-(declaim (optimize (speed 0) (safety 1)))
+(declaim #.*optimize-byte-compilation*)
 
 
 (defvar *describe-indentation-step* 3
@@ -26,6 +25,7 @@
 (defun describe (x &optional (stream-designator *standard-output*))
   #+sb-doc
   "Print a description of the object X."
+  (declare #.*optimize-external-despite-byte-compilation*)
   (let ((stream (out-synonym-of stream-designator)))
     (pprint-logical-block (stream nil)
       (fresh-line stream)
@@ -135,6 +135,7 @@
 ;;; Interpreted function describing; handles both closure and
 ;;; non-closure functions. Instead of printing the compiled-from info,
 ;;; we print the definition.
+#+sb-interpreter
 (defun %describe-function-interpreted (x s kind name)
   (declare (type stream s))
   (multiple-value-bind (exp closure-p dname)
@@ -181,8 +182,8 @@
 	      (ecase (sb-c::debug-source-from source)
 		(:file
 		 (format s "~@:_~A~@:_  Created: " (namestring name))
-		 (sb-int:format-universal-time s (sb-c::debug-source-created
-						  source)))
+		 (format-universal-time s (sb-c::debug-source-created
+					   source)))
 		(:lisp (format s "~@:_~S" name))))))))))
 
 ;;; Describe a compiled function. The closure case calls us to print
@@ -256,6 +257,7 @@
 	  (let ((data (byte-closure-data x)))
 	    (dotimes (i (length data))
 	      (format s "~@:_~S: ~S" i (svref data i))))))
+       #+sb-interpreter
        (sb-eval:interpreted-function
 	(%describe-function-interpreted x s kind name))
        (standard-generic-function
@@ -325,8 +327,8 @@
 	((fboundp x)
 	 (%describe-function (fdefinition x) s :function x)))
 
-  ;; TO DO: Print out other stuff from the INFO database:
-  ;;   * Does it name a type or class?
+  ;; FIXME: Print out other stuff from the INFO database:
+  ;;   * Does it name a type?
   ;;   * Is it a structure accessor? (This is important since those are 
   ;;     magical in some ways, e.g. blasting the structure if you 
   ;;     redefine them.)
@@ -335,8 +337,15 @@
   (%describe-doc x s 'structure "Structure")
   (%describe-doc x s 'type "Type")
   (%describe-doc x s 'setf "Setf macro")
+
   (dolist (assoc (info :random-documentation :stuff x))
     (format s
 	    "~@:_Documentation on the ~(~A~):~@:_~A"
 	    (car assoc)
-	    (cdr assoc))))
+	    (cdr assoc)))
+  
+  ;; Describe the associated class, if any.
+  (let ((symbol-named-class (cl:find-class x nil)))
+    (when symbol-named-class
+      (format t "~&It names a class ~A." symbol-named-class)
+      (describe symbol-named-class))))