Handle compiler-error in LOAD when it's not run from inside EVAL.

[sbcl.git] / src / compiler / generic / interr.lisp

diff --git a/src/compiler/generic/interr.lisp b/src/compiler/generic/interr.lisp
index 43feea6..9ff81d3 100644 (file)
--- a/src/compiler/generic/interr.lisp
+++ b/src/compiler/generic/interr.lisp
@@ -24,14 +24,14 @@
 ;;; functions as closures instead of DEFUNs?
 (eval-when (:compile-toplevel :execute)
   (def!macro define-internal-errors (&rest errors)
-            (let ((info (mapcar (lambda (x)
-                                  (cons (symbolicate (first x) "-ERROR")
-                                        (second x)))
-                                errors)))
-              `(progn
-                 (setf sb!c:*backend-internal-errors*
-                       ',(coerce info 'vector))
-                 nil))))
+             (let ((info (mapcar (lambda (x)
+                                   (cons (symbolicate (first x) "-ERROR")
+                                         (second x)))
+                                 errors)))
+               `(progn
+                  (setf sb!c:*backend-internal-errors*
+                        ',(coerce info 'vector))
+                  nil))))
 
 (define-internal-errors
   (unknown
@@ -61,6 +61,11 @@
    "Object is not of type STRING.")
   (object-not-base-string
    "Object is not of type BASE-STRING.")
+  (object-not-vector-nil
+   "Object is not of type (VECTOR NIL).")
+  #!+sb-unicode
+  (object-not-character-string
+   "Object is not of type (VECTOR CHARACTER).")
   (object-not-bit-vector
    "Object is not of type BIT-VECTOR.")
   (object-not-array
@@ -126,12 +131,15 @@
   #!+long-float
   (object-not-complex-long-float
    "Object is not of type (COMPLEX LONG-FLOAT).")
+  #!+sb-simd-pack
+  (object-not-simd-pack
+   "Object is not of type SIMD-PACK.")
   (object-not-weak-pointer
    "Object is not a WEAK-POINTER.")
   (object-not-instance
    "Object is not a INSTANCE.")
-  (object-not-base-char
-   "Object is not of type BASE-CHAR.")
+  (object-not-character
+   "Object is not a CHARACTER.")
   (nil-fun-returned
    "A function with declared result type NIL returned.")
   (nil-array-accessed
@@ -140,13 +148,16 @@
    "Object layout is invalid. (indicates obsolete instance)")
   (object-not-complex-vector
    "Object is not a complex (non-SIMPLE-ARRAY) vector.")
+  (tls-exhausted
+   "Thread local storage exhausted.")
   .
   #.(map 'list
-        (lambda (saetp)
-          (list
-           (symbolicate "OBJECT-NOT-" (sb!vm:saetp-primitive-type-name saetp))
-           (format nil "Object is not of type ~A."
-                   (specifier-type
-                    `(simple-array ,(sb!vm:saetp-specifier saetp) (*))))))
-        sb!vm:*specialized-array-element-type-properties*))
+         (lambda (saetp)
+           (list
+            (symbolicate "OBJECT-NOT-" (sb!vm:saetp-primitive-type-name saetp))
+            (format nil "Object is not of type ~A."
+                    (type-specifier
+                     (specifier-type
+                      `(simple-array ,(sb!vm:saetp-specifier saetp) (*)))))))
+         sb!vm:*specialized-array-element-type-properties*))