X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=3a96c2bbdd024a97c09288615189b74641b68394;hb=6ab9c60f1c53cc7cc912d644658bc23453a82ac4;hp=ff1bcce79cb3ee8c64c5fa6773acbb1fc4885534;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index ff1bcce..3a96c2b 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -661,7 +661,7 @@
 
 ;;; A FILE-INFO structure holds all the source information for a
 ;;; given file.
-(defstruct (file-info (:copier nil))
+(def!struct (file-info (:copier nil))
   ;; If a file, the truename of the corresponding source file. If from
   ;; a Lisp form, :LISP. If from a stream, :STREAM.
   (name (missing-arg) :type (or pathname (member :lisp :stream)))
@@ -684,11 +684,11 @@
 
 ;;; The SOURCE-INFO structure provides a handle on all the source
 ;;; information for an entire compilation.
-(defstruct (source-info
-	    #-no-ansi-print-object
-	    (:print-object (lambda (s stream)
-			     (print-unreadable-object (s stream :type t))))
-	    (:copier nil))
+(def!struct (source-info
+	     #-no-ansi-print-object
+	     (:print-object (lambda (s stream)
+			      (print-unreadable-object (s stream :type t))))
+	     (:copier nil))
   ;; the UT that compilation started at
   (start-time (get-universal-time) :type unsigned-byte)
   ;; the FILE-INFO structure for this compilation
@@ -1061,11 +1061,9 @@
   (catch 'process-toplevel-form-error-abort
     (let* ((path (or (gethash form *source-paths*) (cons form path)))
 	   (*compiler-error-bailout*
-	    (lambda ()
+	    (lambda (&optional condition)
 	      (convert-and-maybe-compile
-	       `(error 'simple-program-error
-		 :format-control "execution of a form compiled with errors:~% ~S"
-		 :format-arguments (list ',form))
+	       (make-compiler-error-form condition form)
 	       path)
 	      (throw 'process-toplevel-form-error-abort nil))))
 
@@ -1695,11 +1693,9 @@
 	(throw 'pending-init circular-ref)))
     (multiple-value-bind (creation-form init-form)
 	(handler-case
-	    (sb!xc:make-load-form constant (make-null-lexenv))
+            (sb!xc:make-load-form constant (make-null-lexenv))
 	  (error (condition)
-		 (compiler-error "(while making load form for ~S)~%~A"
-				 constant
-				 condition)))
+	    (compiler-error condition)))
       (case creation-form
 	(:sb-just-dump-it-normally
 	 (fasl-validate-structure constant *compile-object*)