X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcross-condition.lisp;h=c48798041067c7097d3c5d7011e2039ad80fa254;hb=6e60dc9f79037ab84f5bfd8568979c24291c9922;hp=6867cb4c48256e5dc36e235e45c0386846e92592;hpb=175c81b8044d7210e08ac66690c9392ec8d19b21;p=sbcl.git

diff --git a/src/code/cross-condition.lisp b/src/code/cross-condition.lisp
index 6867cb4..c487980 100644
--- a/src/code/cross-condition.lisp
+++ b/src/code/cross-condition.lisp
@@ -17,19 +17,51 @@
 ;;; compiler, it will only be a style-warning.
 (define-condition format-too-many-args-warning (simple-warning) ())
 
+;;; KLUDGE: 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)))
+
+;;; KLUDGE: another OAOOM problem, this time to allow conditions with
+;;; REFERENCE-CONDITION in their supercondition list on the host.
+;;; (This doesn't feel like the entirely right solution, it has to be
+;;; said.)  -- CSR, 2004-09-15
+(define-condition reference-condition ()
+  ((references :initarg :references :reader reference-condition-references)))
+
+;;; KLUDGE: yet another OAOOM.
+;;;
+;;; FIXME: This is clearly one OAOOM KLUDGE too many in a row. When tempted
+;;; to add another one invent DEF!CONDITION or whatever seems necessary,
+;;; and replace these.
+(define-condition type-warning (reference-condition simple-warning)
+  ()
+  (:default-initargs :references (list '(:sbcl :node "Handling of Types"))))
+(define-condition type-style-warning (reference-condition simple-style-warning)
+  ()
+  (:default-initargs :references (list '(:sbcl :node "Handling of Types"))))
+
 (define-condition bug (simple-error)
   ()
   (:report
    (lambda (condition stream)
      (format stream
-	     "~@<  ~? ~:@_~?~:>"
-	     (simple-condition-format-control condition)
-	     (simple-condition-format-arguments condition)
-	     "~@<If you see this and are an SBCL ~
+             "~@<  ~? ~:@_~?~:>"
+             (simple-condition-format-control condition)
+             (simple-condition-format-arguments condition)
+             "~@<If you see this and are an SBCL ~
 developer, then it is probable that you have made a change to the ~
 system that has broken the ability for SBCL to compile, usually by ~
 removing an assumed invariant of the system, but sometimes by making ~
 an averrance that is violated (check your code!). If you are a user, ~
 please submit a bug report to the developers' mailing list, details of ~
 which can be found at <http://sbcl.sourceforge.net/>.~:@>"
-	     ()))))
+             ()))))
+
+;;; These are should never be instantiated before the real definitions
+;;; come in.
+(deftype package-lock-violation () nil)
+(deftype package-locked-error () nil)
+(deftype symbol-package-locked-error () nil)