0.6.10.13:

[sbcl.git] / src / code / interr.lisp

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 9f9d67d..5b9c9a4 100644 (file)
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -11,9 +11,6 @@
 ;;;; files for more information.
 
 (in-package "SB!KERNEL")
-
-(file-comment
-  "$Header$")
 \f
 ;;;; internal errors
 
@@ -228,9 +225,12 @@
         :format-arguments (list nargs)))
 
 (deferr bogus-argument-to-values-list-error (list)
-  (error 'type-error
+  (error 'simple-type-error
         :function-name name
-        :format-control "attempt to use VALUES-LIST on a dotted-list:~%  ~S"
+        :datum list
+        :expected-type 'list
+        :format-control
+        "~@<attempt to use VALUES-LIST on a dotted list: ~2I~_~S~:>"
         :format-arguments (list list)))
 
 (deferr unbound-symbol-error (symbol)
@@ -274,9 +274,6 @@
         :operands (list this that)))
 
 (deferr object-not-type-error (object type)
-  (/show0 "entering body of DEFERR OBJECT-NOT-TYPE-ERROR, OBJECT,TYPE=..")
-  #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr object))
-  #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr type))
   (error (if (and (typep object 'instance)
                  (layout-invalid (%instance-layout object)))
             'layout-invalid
@@ -306,7 +303,7 @@
   (error 'simple-error
         :function-name name
         :format-control
-        "invalid array index, ~D for ~S (should have been less than ~D)"
+        "invalid array index ~D for ~S (should be nonnegative and <~D)"
         :format-arguments (list index array bound)))
 
 (deferr object-not-simple-array-error (object)
@@ -454,6 +451,12 @@
         :function-name name
         :datum object
         :expected-type 'instance))
+
+(deferr object-not-complex-vector-error (object)
+  (error 'type-error
+        :function-name name
+        :datum object
+        :expected-type '(and vector (not simple-array))))
 \f
 ;;;; fetching errorful function name