0.6.8.18:

[sbcl.git] / src / compiler / main.lisp

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 442b43a..e3a1b9b 100644 (file)
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -122,7 +122,6 @@
 ;;; Mumble conditional on *COMPILE-PROGRESS*.
 (defun maybe-mumble (&rest foo)
   (when *compile-progress*
-    ;; MNA: compiler message patch
     (compiler-mumble "~&")
     (pprint-logical-block (*error-output* nil :per-line-prefix "; ")
        (apply #'compiler-mumble foo))))
@@ -228,7 +227,6 @@
                   (zerop *compiler-warning-count*)
                   (zerop *compiler-style-warning-count*)
                   (zerop *compiler-note-count*)))
-    ;; MNA: compiler message patch
     (format *error-output* "~&")
     (pprint-logical-block (*error-output* nil :per-line-prefix "; ")
     (compiler-mumble
@@ -497,7 +495,6 @@
                 (return nil)))))))
 
     (when sb!xc:*compile-print*
-      ;; MNA: compiler message patch
       (compiler-mumble "~&; ~:[~;byte ~]compiling ~A: "
                       *byte-compiling*
                       (component-name component)))
@@ -662,8 +659,6 @@
   (untruename nil :type (or pathname null))
   ;; The file's write date (if relevant.)
   (write-date nil :type (or unsigned-byte null))
-  ;; This file's FILE-COMMENT, or NIL if none.
-  (comment nil :type (or simple-string null))
   ;; The source path root number of the first form in this file (i.e. the
   ;; total number of forms converted previously in this compilation.)
   (source-root 0 :type unsigned-byte)
@@ -934,26 +929,10 @@
           (*default-interface-cookie* (lexenv-interface-cookie *lexenv*)))
       (process-top-level-progn forms path))))
 
-;;; Stash file comment in the FILE-INFO structure.
-(defun process-file-comment (form)
-  (unless (and (proper-list-of-length-p form 2)
-              (stringp (second form)))
-    (compiler-error "bad FILE-COMMENT form: ~S" form))
-  (let ((file (first (source-info-current-file *source-info*))))
-    (cond ((file-info-comment file)
-            ;; MNA: compiler message patch
-            (pprint-logical-block (*error-output* nil :per-line-prefix "; ")
-              (compiler-warning "Ignoring extra file comment:~%  ~S." form)))
-         (t
-          (let ((comment (coerce (second form) 'simple-string)))
-            (setf (file-info-comment file) comment)
-            (when sb!xc:*compile-verbose*
-               ;; MNA: compiler message patch
-               (compiler-mumble "~&; FILE-COMMENT: ~A~2&" comment)))))))
-
-;;; Force any pending top-level forms to be compiled and dumped so that they
-;;; will be evaluated in the correct package environment. Dump the form to be
-;;; evaled at (cold) load time, and if EVAL is true, eval the form immediately.
+;;; Force any pending top-level forms to be compiled and dumped so
+;;; that they will be evaluated in the correct package environment.
+;;; Dump the form to be evaled at (cold) load time, and if EVAL is
+;;; true, eval the form immediately.
 (defun process-cold-load-form (form path eval)
   (let ((object *compile-object*))
     (etypecase object
@@ -1020,7 +999,6 @@
                  (process-top-level-progn (cddr form) path))))
            (locally (process-top-level-locally form path))
            (progn (process-top-level-progn (cdr form) path))
-           (file-comment (process-file-comment form))
            (t
             (let* ((uform (uncross form))
                    (exp (preprocessor-macroexpand uform)))
@@ -1372,8 +1350,8 @@
         #+nil (*compiler-style-warning-count* 0)
         #+nil (*compiler-note-count* 0)
         (*block-compile* *block-compile-argument*)
-        (*package* *package*)
-        (*initial-package* *package*)
+        (*package* (sane-package))
+        (*initial-package* (sane-package))
         (*initial-cookie* *default-cookie*)
         (*initial-interface-cookie* *default-interface-cookie*)
         (*default-cookie* (copy-cookie *initial-cookie*))
@@ -1387,11 +1365,9 @@
         (*top-level-lambdas* ())
         (*pending-top-level-lambdas* ())
         (*compiler-error-bailout*
-         #'(lambda ()
-             (compiler-mumble
-               ;; MNA: compiler message patch
-              "~2&; fatal error, aborting compilation~%")
-             (return-from sub-compile-file (values nil t t))))
+         (lambda ()
+           (compiler-mumble "~2&; fatal error, aborting compilation~%")
+           (return-from sub-compile-file (values nil t t))))
         (*current-path* nil)
         (*last-source-context* nil)
         (*last-original-source* nil)
@@ -1450,7 +1426,6 @@
 (defun start-error-output (source-info)
   (declare (type source-info source-info))
   (dolist (x (source-info-files source-info))
-    ;; MNA: compiler message patch
     (compiler-mumble "~&; compiling file ~S (written ~A):~%"
                     (namestring (file-info-name x))
                     (sb!int:format-universal-time nil
@@ -1462,7 +1437,6 @@
 
 (defun finish-error-output (source-info won)
   (declare (type source-info source-info))
-  ;; MNA: compiler message patch
   (compiler-mumble "~&; compilation ~:[aborted after~;finished in~] ~A~&"
                   won
                   (elapsed-time-to-string
@@ -1548,7 +1522,6 @@
        (close-fasl-file fasl-file (not compile-won))
        (setq output-file-name (pathname (fasl-file-stream fasl-file)))
        (when (and compile-won sb!xc:*compile-verbose*)
-          ;; MNA: compiler message patch
          (compiler-mumble "~2&; ~A written~%" (namestring output-file-name))))
 
       (when sb!xc:*compile-verbose*