1.0.29.38: better DESCRIBE
[sbcl.git] / src / cold / warm.lisp
index 1528544..fc6f1c4 100644 (file)
 \f
 ;;;; general warm init compilation policy
 
-
 (proclaim '(optimize (compilation-speed 1)
-                    (debug #+sb-show 2 #-sb-show 1)
-                    (inhibit-warnings 2)
-                    (safety 2)
-                    (space 1)
-                    (speed 2)))
+                     (debug #+sb-show 2 #-sb-show 1)
+                     (inhibit-warnings 2)
+                     (safety 2)
+                     (space 1)
+                     (speed 2)))
+
 \f
 ;;;; package hacking
 
   (dolist (package (list-all-packages))
     (let ((old-package-name (package-name package)))
       (when (and (>= (length old-package-name) (length boot-prefix))
-                (string= boot-prefix old-package-name
-                         :end2 (length boot-prefix)))
-       (let ((new-package-name (concatenate 'string
-                                            perm-prefix
-                                            (subseq old-package-name
-                                                    (length boot-prefix)))))
-         (rename-package package
-                         new-package-name
-                         (package-nicknames package)))))))
+                 (string= boot-prefix old-package-name
+                          :end2 (length boot-prefix)))
+        (let ((new-package-name (concatenate 'string
+                                             perm-prefix
+                                             (subseq old-package-name
+                                                     (length boot-prefix)))))
+          (rename-package package
+                          new-package-name
+                          (package-nicknames package)))))))
 
 ;;; FIXME: This nickname is a deprecated hack for backwards
 ;;; compatibility with code which assumed the CMU-CL-style
 ;;; in 0.7.0, so we should get rid of this nickname after a while.
 (let ((package (find-package "SB-ALIEN")))
   (rename-package package
-                 (package-name package)
-                 (cons "SB-C-CALL" (package-nicknames package))))
+                  (package-name package)
+                  (cons "SB-C-CALL" (package-nicknames package))))
+
+(let ((package (find-package "SB-SEQUENCE")))
+  (rename-package package (package-name package) (list "SEQUENCE")))
 \f
 ;;;; compiling and loading more of the system
 
 ;;;
 ;;; (with-compilation-unit
 ;;;     (:optimize '(optimize (debug #+(and (not high-security) small) .5
-;;;                              #-(or high-security small) 2
-;;;                              #+high-security 3)
-;;;                       (speed 2) (safety #+(and (not high-security) small) 0
-;;;                                         #-(or high-security small) 2
-;;;                                         #+high-security 3)
-;;;                       (inhibit-warnings 2))
+;;;                               #-(or high-security small) 2
+;;;                               #+high-security 3)
+;;;                        (speed 2) (safety #+(and (not high-security) small) 0
+;;;                                          #-(or high-security small) 2
+;;;                                          #+high-security 3)
+;;;                        (inhibit-warnings 2))
 ;;;      :optimize-interface '(optimize-interface #+(and (not high-security) small)
 ;;; (safety 1)
-;;;                                           #+high-security (safety 3))
+;;;                                            #+high-security (safety 3))
 ;;;      :context-declarations
 ;;;      '((:external (declare (optimize-interface (safety #-high-security 2 #+high-
 ;;; security 3)
-;;;                                            (debug #-high-security 1 #+high-s
+;;;                                             (debug #-high-security 1 #+high-s
 ;;; ecurity 3))))
-;;;    ((:or :macro (:match "$EARLY-") (:match "$BOOT-"))
-;;;    (declare (optimize (speed 0))))))
+;;;     ((:or :macro (:match "$EARLY-") (:match "$BOOT-"))
+;;;     (declare (optimize (speed 0))))))
 ;;;
 ;;; FIXME: This has mutated into a hack which crudely duplicates
 ;;; functionality from the existing mechanism to load files from
 ;;; parallel directory trees.) Maybe we could merge the filenames here
 ;;; into build-order.lisp-expr with some new flag (perhaps :WARM) to
 ;;; indicate that the files should be handled not in cold load but
-;;; afterwards. 
+;;; afterwards.
 (dolist (stem '(;; CLOS, derived from the PCL reference implementation
-               ;;
-               ;; This PCL build order is based on a particular
-               ;; (arbitrary) linearization of the declared build
-               ;; order dependencies from the old PCL defsys.lisp
-               ;; dependency database.
-               #+nil "src/pcl/walk" ; #+NIL = moved to build-order.lisp-expr
-               "src/pcl/early-low"
-               "src/pcl/macros"
-                "src/pcl/compiler-support"
-               "src/pcl/low"
-                "src/pcl/slot-name"
-               "src/pcl/defclass"
-               "src/pcl/defs"
-               "src/pcl/fngen"
-               "src/pcl/cache"
-               "src/pcl/dlisp"
-               "src/pcl/dlisp2"
-               "src/pcl/boot"
-               "src/pcl/vector"
-               "src/pcl/slots-boot"
-               "src/pcl/combin"
-               "src/pcl/dfun"
-               "src/pcl/ctor"
-               "src/pcl/braid"
-               "src/pcl/dlisp3"
-               "src/pcl/generic-functions"
-               "src/pcl/slots"
-               "src/pcl/init"
-               "src/pcl/std-class"
-               "src/pcl/cpl"
-               "src/pcl/fsc"
-               "src/pcl/methods"
-               "src/pcl/fixup"
-               "src/pcl/defcombin"
-               "src/pcl/ctypes"
-               "src/pcl/env"
-               "src/pcl/documentation"
-               "src/pcl/print-object"
-               "src/pcl/precom1"
-               "src/pcl/precom2"
+                ;;
+                ;; This PCL build order is based on a particular
+                ;; (arbitrary) linearization of the declared build
+                ;; order dependencies from the old PCL defsys.lisp
+                ;; dependency database.
+                #+nil "src/pcl/walk" ; #+NIL = moved to build-order.lisp-expr
+                "SRC;PCL;EARLY-LOW"
+                "SRC;PCL;MACROS"
+                "SRC;PCL;COMPILER-SUPPORT"
+                "SRC;PCL;LOW"
+                "SRC;PCL;SLOT-NAME"
+                "SRC;PCL;DEFCLASS"
+                "SRC;PCL;DEFS"
+                "SRC;PCL;FNGEN"
+                "SRC;PCL;WRAPPER"
+                "SRC;PCL;CACHE"
+                "SRC;PCL;DLISP"
+                "SRC;PCL;BOOT"
+                "SRC;PCL;VECTOR"
+                "SRC;PCL;SLOTS-BOOT"
+                "SRC;PCL;COMBIN"
+                "SRC;PCL;DFUN"
+                "SRC;PCL;CTOR"
+                "SRC;PCL;BRAID"
+                "SRC;PCL;DLISP3"
+                "SRC;PCL;GENERIC-FUNCTIONS"
+                "SRC;PCL;SLOTS"
+                "SRC;PCL;INIT"
+                "SRC;PCL;STD-CLASS"
+                "SRC;PCL;CPL"
+                "SRC;PCL;FSC"
+                "SRC;PCL;METHODS"
+                "SRC;PCL;FIXUP"
+                "SRC;PCL;DEFCOMBIN"
+                "SRC;PCL;CTYPES"
+                "SRC;PCL;ENV"
+                "SRC;PCL;DOCUMENTATION"
+                "SRC;PCL;PRINT-OBJECT"
+                "SRC;PCL;PRECOM1"
+                "SRC;PCL;PRECOM2"
 
-               ;; miscellaneous functionality which depends on CLOS
-               "src/code/force-delayed-defbangmethods"
+                ;; miscellaneous functionality which depends on CLOS
+                "SRC;CODE;FORCE-DELAYED-DEFBANGMETHODS"
+                "SRC;CODE;LATE-CONDITION"
 
-               ;; CLOS-level support for the Gray OO streams
-               ;; extension (which is also supported by various
-               ;; lower-level hooks elsewhere in the code)
-               "src/pcl/gray-streams-class"
-               "src/pcl/gray-streams"
+                ;; CLOS-level support for the Gray OO streams
+                ;; extension (which is also supported by various
+                ;; lower-level hooks elsewhere in the code)
+                "SRC;PCL;GRAY-STREAMS-CLASS"
+                "SRC;PCL;GRAY-STREAMS"
 
-               ;; other functionality not needed for cold init, moved
-               ;; to warm init to reduce peak memory requirement in
-               ;; cold init
-               "src/code/describe"
-                "src/code/describe-policy"
-               "src/code/inspect"
-               "src/code/profile"
-               "src/code/ntrace"
-               "src/code/foreign"
-               "src/code/run-program"
+                ;; CLOS-level support for User-extensible sequences.
+                "SRC;PCL;SEQUENCE"
 
-               ;; Code derived from PCL's pre-ANSI DESCRIBE-OBJECT
-               ;; facility is still used in our ANSI DESCRIBE
-               ;; facility, and should be compiled and loaded after
-               ;; our DESCRIBE facility is compiled and loaded.
-               "src/pcl/describe"))
+                ;; other functionality not needed for cold init, moved
+                ;; to warm init to reduce peak memory requirement in
+                ;; cold init
+                "SRC;CODE;DESCRIBE"
+                "SRC;CODE;DESCRIBE-POLICY"
+                "SRC;CODE;INSPECT"
+                "SRC;CODE;PROFILE"
+                "SRC;CODE;NTRACE"
+                "SRC;CODE;STEP"
+                "SRC;CODE;RUN-PROGRAM"))
 
-  (let ((fullname (concatenate 'string stem ".lisp")))
+  (let ((fullname (concatenate 'string "SYS:" stem ".LISP")))
     (sb-int:/show "about to compile" fullname)
     (flet ((report-recompile-restart (stream)
-             (format stream "Recompile file ~S" src))
+             (format stream "Recompile file ~S" fullname))
            (report-continue-restart (stream)
-             (format stream "Continue, using possibly bogus file ~S" obj)))
+             (format stream
+                     "Continue, using possibly bogus file ~S"
+                     (compile-file-pathname fullname))))
       (tagbody
        retry-compile-file
          (multiple-value-bind (output-truename warnings-p failure-p)
-             (compile-file fullname)
+             (if *compile-files-p*
+                 (compile-file fullname)
+                 (compile-file-pathname fullname))
            (declare (ignore warnings-p))
-          (sb-int:/show "done compiling" fullname)
+           (sb-int:/show "done compiling" fullname)
            (cond ((not output-truename)
-                  (error "COMPILE-FILE of ~S failed." src))
+                  (error "COMPILE-FILE of ~S failed." fullname))
                  (failure-p
-                 (unwind-protect
-                      (restart-case
-                          (error "FAILURE-P was set when creating ~S."
-                                 obj)
-                        (recompile ()
-                          :report report-recompile-restart
-                          (go retry-compile-file))
-                        (continue ()
-                          :report report-continue-restart
-                          (setf failure-p nil)))
-                   ;; Don't leave failed object files lying around.
-                   (when (and failure-p (probe-file output-truename))
+                  (unwind-protect
+                       (restart-case
+                           (error "FAILURE-P was set when creating ~S."
+                                  output-truename)
+                         (recompile ()
+                           :report report-recompile-restart
+                           (go retry-compile-file))
+                         (continue ()
+                           :report report-continue-restart
+                           (setf failure-p nil)))
+                    ;; Don't leave failed object files lying around.
+                    (when (and failure-p (probe-file output-truename))
                           (delete-file output-truename)
                           (format t "~&deleted ~S~%" output-truename))))
                  ;; Otherwise: success, just fall through.
                  (t nil))
-          (unless (load output-truename)
-            (error "LOAD of ~S failed." output-truename))
-          (sb-int:/show "done loading" output-truename))))))
+           (unless (load output-truename)
+             (error "LOAD of ~S failed." output-truename))
+           (sb-int:/show "done loading" output-truename))))))
 \f
 ;;;; setting package documentation
 
 #+sb-doc (setf (documentation (find-package "COMMON-LISP") t)
 "public: home of symbols defined by the ANSI language specification")
 #+sb-doc (setf (documentation (find-package "COMMON-LISP-USER") t)
-              "public: the default package for user code and data")
+               "public: the default package for user code and data")
 #+sb-doc (setf (documentation (find-package "KEYWORD") t)
-              "public: home of keywords")
-
-;;; KLUDGE: It'd be nicer to do this in the table with the other
-;;; non-standard packages. -- WHN 19991206
-#+sb-doc (setf (documentation (find-package "SB-SLOT-ACCESSOR-NAME") t)
-              "private: home of CLOS slot accessor internal names")
+               "public: home of keywords")
+\f
 
-;;; FIXME: There doesn't seem to be any easy way to get package doc strings
-;;; through the cold boot process. They need to be set somewhere. Maybe the
-;;; easiest thing to do is to read them out of package-data-list.lisp-expr
-;;; now?