0.8.13.38: Conditionally clean

            * Delete unused MAKE-LOAD-FORM for ENCAPSULATED-CONDITION,
               which was accidentally left over from the first round of
               COMPILER-ERROR refactoring.
            * Indulge in a little OAOOM, getting the full
               ENCAPSULATED-CONDITION into the cross-compiler, so that
               we can have sensible error messages during build.

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index 5b471c0..7c26d48 100644 (file)
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -946,16 +946,10 @@ SB-EXT:PACKAGE-LOCKED-ERROR-SYMBOL."))
 ;;;; setup of CONDITION machinery, only because that makes it easier to
 ;;;; get cold init to work.
 
+;;; OAOOM warning: see cross-condition.lisp
 (define-condition encapsulated-condition (condition)
   ((condition :initarg :condition :reader encapsulated-condition)))
 
-;;; This comes to play if we have multiple levels of encapsulated
-;;; errors and we need to dump them with MAKE-CONDITION-LOAD-FORM.
-;;; Should not see much/any use, but better to have it.
-(def!method make-load-form ((condition encapsulated-condition) &optional env)
-  `(make-condition 'encapsulated-condition
-    :condition ,(make-condition-load-form (encapsulated-condition condition) env)))
-
 (define-condition values-type-error (type-error)
   ()
   (:report

diff --git a/src/code/cross-condition.lisp b/src/code/cross-condition.lisp
index 269241c..1f865bc 100644 (file)
--- a/src/code/cross-condition.lisp
+++ b/src/code/cross-condition.lisp
@@ -17,7 +17,12 @@
 ;;; compiler, it will only be a style-warning.
 (define-condition format-too-many-args-warning (simple-warning) ())
 
-(define-condition encapsulated-condition () ())
+;;; OAOOM warning: see condition.lisp -- we want a full definition in
+;;; the cross-compiler as well, in order to have nice error messages
+;;; instead of complaints of undefined-function
+;;; ENCAPSULATED-CONDITION.
+(define-condition encapsulated-condition (condition)
+  ((condition :initarg :condition :reader encapsulated-condition)))
 
 (define-condition bug (simple-error)
   ()

diff --git a/version.lisp-expr b/version.lisp-expr
index 913333d..df7042d 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.13.37"
+"0.8.13.38"