X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcondition.lisp;h=317d8bc33cc67acc2f834e3dc99aa12cec9004d7;hb=024389e7e3db268f535e36d883b4efc9d7ea0f65;hp=a4fbb9739033f66f37445ffe58869c8d8c4a33ef;hpb=ee3f2e0351674dde7229afdcccfcfaf8ce5b112e;p=sbcl.git

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index a4fbb97..317d8bc 100644
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -954,12 +954,6 @@
                    '(:ansi-cl :function make-array)
                    '(:ansi-cl :function sb!xc:upgraded-array-element-type))))
 
-(define-condition displaced-to-array-too-small-error
-    (reference-condition simple-error)
-  ()
-  (:default-initargs
-      :references (list '(:ansi-cl :function adjust-array))))
-
 (define-condition type-warning (reference-condition simple-warning)
   ()
   (:default-initargs :references (list '(:sbcl :node "Handling of Types"))))
@@ -1116,6 +1110,21 @@ SB-EXT:PACKAGE-LOCKED-ERROR-SYMBOL."))
                ;; Extract the bound from (INTEGER 0 (BOUND))
                (caaddr (type-error-expected-type condition)))))))
 
+(define-condition invalid-array-error (reference-condition type-error) ()
+  (:report
+   (lambda (condition stream)
+     (let ((*print-array* nil))
+       (format stream
+               "~@<Displaced array originally of type ~S has been invalidated ~
+                due its displaced-to array ~S having become too small to hold ~
+                it: the displaced array's dimensions have all been set to zero ~
+                to trap accesses to it.~:@>"
+               (type-error-expected-type condition)
+               (array-displacement (type-error-datum condition))))))
+  (:default-initargs
+      :references
+      (list '(:ansi-cl :function adjust-array))))
+
 (define-condition index-too-large-error (type-error)
   ()
   (:report